diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
index 6ab1c9efb63c..7d9c4286fb18 100644
--- a/app-admin/hddtemp/files/hddgentoo.db
+++ b/app-admin/hddtemp/files/hddgentoo.db
@@ -23,6 +23,7 @@
 "ST3750630AS"							194 C "Seagate Barracuda 7200.11 SATA 750GB 16MB"
 "ST31000340AS"							194 C "Seagate Barracuda 7200.11 SATA 1000GB 32MB"
 "SAMSUNG HD403LJ"						194 C "Samsung HD403LJ"
+"SAMSUNG HD250HJ"						194 C "Samsung SpinPoint SpinPoint S250"
 "ST3320620NS"							194 C "Seagate 320GB 7200rpm 16MB SATAII"
 "FUJITSU MHZ2250BJ FFS G2"					194 C "FUJITSU MHZ2250BJ FFS G2"
 "ST3500630A"							194 C "Seagate Barracuda 7200.10 PATA 500GB 16MB"
@@ -61,7 +62,9 @@
 "WDC WD3202ABYS-02B7A0"						194 C "Western Digital Caviar WD3202ABYS"
 "FUJITSU MHY2200BH"						194 C "FUJITSU MHY2200BH"
 "ST3320418AS"							194 C "Seagate Barracuda 7200.12 SATA 320GB"
-"TOSHIBA MK7559GSXP"						194 C  "Toshiba MK7559GSXP"
+"TOSHIBA MK7559GSXP"						194 C "Toshiba MK7559GSXP"
+"TOSHIBA MK1637GSX"						194 C "Toshiba MK1637GSX 160GB SATA2 5200RPM"
+"TOSHIBA MG03ACA300"						194 C "Toshiba MG03ACA300 3TB SATA3 7200RPM"
 "OCZ-VERTEX2"							194 C "OCZ Vertex 2"
 "SAMSUNG HD204UI"						194 C "Samsung Spinpoint F4EG 2TB SATA2 5400RPM 32MB"
 "SAMSUNG HD154UI"						194 C "Samsung Spinpoint F2EG 1.5TB SATA2 5400RPM 32MB"
@@ -197,6 +200,7 @@
 "SAMSUNG HM160HC"						194 C "Samsung HM160HC"
 "WDC WD1003FBYX-01Y7B1"						194 C "Western Digital RE4 1TB SATA2 7200RPM 64MB"
 "WDC WD3003FZEX-00Z4SA0"					194 C "Western Digital Caviar Black 3TB SATA3 7200RPM 64MB"
+"WDC WD3000FYYZ-01UL1B2"					194 C "Western Digital WD3000FYYZ 3TB SATA3 7200RPM"
 "TOSHIBA DT01ACA050"						194 C "Toshiba 500GB SATA3 7200RPM 32MB"
 "WDC WD10JFCX-68N6GN0"						194 C "Western Digital Red 1TB SATA3 IntelliPower 64MB"
 "WDC WD40EFRX"			 				194 C "Western Digital Red 4TB SATA3 IntelliPower 64MB"
diff --git a/app-admin/hddtemp/metadata.xml b/app-admin/hddtemp/metadata.xml
index 4339a37c3540..fa25feea165c 100644
--- a/app-admin/hddtemp/metadata.xml
+++ b/app-admin/hddtemp/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>aidecoe@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="network-cron">
 		Monthly cronjob to update hddtemp.db.
diff --git a/app-backup/buttersink/Manifest b/app-backup/buttersink/Manifest
new file mode 100644
index 000000000000..509257d54b94
--- /dev/null
+++ b/app-backup/buttersink/Manifest
@@ -0,0 +1 @@
+DIST buttersink-0.6.8.tar.gz 51784 SHA256 12dc5683256bc6aab5ce6db5ae40c8f565b9ad7c3da944bdba46182ae89f21d3 SHA512 52898140d983bcc6776497504191f0c1c727b24fa9543f5a5997a54ced26301ca492518094ca8770fce8064bc99dc6d3f6760e986eb66f08a758985a7a85ffff WHIRLPOOL 48e487b498cc8d827a3a5b54c5fdf019ffa5719dd925830a5f3c331344fd72e75a665a48c3cea0dc755add973f162c77916af65036ae8eef67af613eeab319ff
diff --git a/app-backup/buttersink/buttersink-0.6.8.ebuild b/app-backup/buttersink/buttersink-0.6.8.ebuild
new file mode 100644
index 000000000000..44802d17a6e9
--- /dev/null
+++ b/app-backup/buttersink/buttersink-0.6.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="rsync-like utility for btrfs snapshots"
+HOMEPAGE="https://github.com/AmesCornish/buttersink"
+
+LICENSE="GPL-3"
+SLOT=0
+
+# local tests would require root and cause sandbox issues with btrfs subvolume
+# operations, and network tests would require an SSH server with root login to
+# test the SSH backend, or remote S3 for that backend
+RESTRICT="test"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/AmesCornish/buttersink"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/AmesCornish/buttersink/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/crcmod[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	sys-fs/btrfs-progs"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	if [[ ${PV} == 9999 ]] ; then
+		emake makestamps buttersink/version.py
+	else
+		mkdir makestamps || die
+		echo "version = \"${PV}\"" > buttersink/version.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/buttersink/buttersink-9999.ebuild b/app-backup/buttersink/buttersink-9999.ebuild
new file mode 100644
index 000000000000..44802d17a6e9
--- /dev/null
+++ b/app-backup/buttersink/buttersink-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="rsync-like utility for btrfs snapshots"
+HOMEPAGE="https://github.com/AmesCornish/buttersink"
+
+LICENSE="GPL-3"
+SLOT=0
+
+# local tests would require root and cause sandbox issues with btrfs subvolume
+# operations, and network tests would require an SSH server with root login to
+# test the SSH backend, or remote S3 for that backend
+RESTRICT="test"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/AmesCornish/buttersink"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/AmesCornish/buttersink/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/crcmod[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	sys-fs/btrfs-progs"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	if [[ ${PV} == 9999 ]] ; then
+		emake makestamps buttersink/version.py
+	else
+		mkdir makestamps || die
+		echo "version = \"${PV}\"" > buttersink/version.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/buttersink/metadata.xml b/app-backup/buttersink/metadata.xml
new file mode 100644
index 000000000000..d80abca98b5f
--- /dev/null
+++ b/app-backup/buttersink/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>adebeus@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+  </maintainer>
+  <longdescription>rsync-like utility for btrfs snapshots</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 66607da59d2d..eba9dc20362e 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1 +1,2 @@
 DIST ccid-1.4.26.tar.bz2 628038 SHA256 3267bf708ab780c02f01f6241b7c7277cb892d30fd1179a9926a8cc0ca40be2f SHA512 4a2e5e9412f2aa4870e14114e54da96fd8b3418ea6d3a236b83e19d6349adb20a94ef7f48628c108f8459f008c10b0606bbf4d797ae4be9183e1acde032c618c WHIRLPOOL 7118e57ca9a394de3b37166bb2c4f4d398fdf744caa0803ef9f1470db7020d999f795ca816a5a70db2b59b64db7225df2dd9366fd329ca34d52b5e4611fd5d21
+DIST ccid-1.4.27.tar.bz2 632817 SHA256 a660e269606986cb94840ad5ba802ffb0cd23dd12b98f69a35035e0deb9dd137 SHA512 14fb5d9878ed36de912d860d8537758170781f225957a99d5fed447dcfba0cba3133f78d2cc4bc7db60d3527399f70e4a7d1d1f8348fb50d1bcfc75820a23522 WHIRLPOOL 062ebe1be40ad09865db642c763cf32cc471b860df66072fe5e98c4b3b5a5efced7b2aeba1001a635231adaf9569e3e4fc2746ad9ebaa921b62302a0ebcf2273
diff --git a/app-crypt/ccid/ccid-1.4.27.ebuild b/app-crypt/ccid/ccid-1.4.27.ebuild
new file mode 100644
index 000000000000..5ff08306450c
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.27.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+STUPID_NUM="4218"
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
+SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="twinserial kobil-midentity +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+	usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+	kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README AUTHORS )
+
+src_configure() {
+	econf \
+		LEX=: \
+		$(use_enable twinserial) \
+		$(use_enable usb libusb)
+}
+
+src_compile() {
+	default
+	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
+}
+
+src_install() {
+	default
+
+	if use kobil-midentity; then
+		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
+	fi
+
+	if use kernel_linux; then
+		# note: for eudev support, rules probably will always need to be
+		# installed to /usr
+
+		# ccid >=1.4.11 version changed the rules drastically in a minor
+		# release to no longer use the pcscd group. Using the old ones in
+		# the mean time.
+		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
+
+		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
+		if ! use kobil-midentity; then
+			sed \
+				-e '/Kobil_mIDentity_switch/s/^/#/' \
+				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
+		fi
+
+	fi
+}
diff --git a/app-crypt/stoken/Manifest b/app-crypt/stoken/Manifest
index 322dddaa761c..b8495edfbecd 100644
--- a/app-crypt/stoken/Manifest
+++ b/app-crypt/stoken/Manifest
@@ -1 +1,2 @@
-DIST v0.90.tar.gz 116642 SHA256 45912c200e2bcf0d605ba4b1177fbc9191cfd0ca509dd33075fd7ba17ebd6dda SHA512 7c75a04ea6542a13d639bbb74523443e030559dcf65d181d07fc64277442500a8a18daf2351248a552e42daf815fe5d0079b5b559402522d45ac10ed7762c818 WHIRLPOOL cfeb2bf9ac173a5416a08c99405bdc2ea0feff10cb040ffe5e89fc95c570da369d85fc5679fdedcdb017fdfcc89374dfd8544f519b6df587cad7b4e7bc113f8e
+DIST stoken-0.90.tar.gz 116642 SHA256 45912c200e2bcf0d605ba4b1177fbc9191cfd0ca509dd33075fd7ba17ebd6dda SHA512 7c75a04ea6542a13d639bbb74523443e030559dcf65d181d07fc64277442500a8a18daf2351248a552e42daf815fe5d0079b5b559402522d45ac10ed7762c818 WHIRLPOOL cfeb2bf9ac173a5416a08c99405bdc2ea0feff10cb040ffe5e89fc95c570da369d85fc5679fdedcdb017fdfcc89374dfd8544f519b6df587cad7b4e7bc113f8e
+DIST stoken-0.91.tar.gz 116846 SHA256 5e5cce38e958de07b2d447d24e9564edaf566571b6fe04ce9099b5dc2dd3c0ac SHA512 7d34c3ec3022aabd909fcb89fabd03003fdc4d635a064401407ce78068c0965012b9b61b53ce2d6e018973fe2e23a7e4d35913fca564e0af65fd0f0fb7fb30b4 WHIRLPOOL 89cdea90c95f4ad3d5c1572fb42fac6630654ad6d92511e107d41540880920cb27402fbc7c9af2b8347200264dd79ff15c96d43aea0be148ed94bb056cc0d312
diff --git a/app-crypt/stoken/stoken-0.90.ebuild b/app-crypt/stoken/stoken-0.90.ebuild
index 966740b1398d..cfbe027df35b 100644
--- a/app-crypt/stoken/stoken-0.90.ebuild
+++ b/app-crypt/stoken/stoken-0.90.ebuild
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="Software Token for Linux/UNIX"
 HOMEPAGE="https://github.com/cernekee/stoken"
-SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/app-crypt/stoken/stoken-0.91.ebuild b/app-crypt/stoken/stoken-0.91.ebuild
new file mode 100644
index 000000000000..886714165d0d
--- /dev/null
+++ b/app-crypt/stoken/stoken-0.91.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="Software Token for Linux/UNIX"
+HOMEPAGE="https://github.com/cernekee/stoken"
+SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	|| ( dev-libs/nettle dev-libs/libtomcrypt )
+	gtk? ( >=x11-libs/gtk+-3.12:3 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_with gtk)
+}
diff --git a/app-editors/emacs/emacs-25.2.ebuild b/app-editors/emacs/emacs-25.2.ebuild
index aeb274c2c8d8..36d3c6626a59 100644
--- a/app-editors/emacs/emacs-25.2.ebuild
+++ b/app-editors/emacs/emacs-25.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/gvim/gvim-8.0.0386-r1.ebuild b/app-editors/gvim/gvim-8.0.0386-r1.ebuild
new file mode 100644
index 000000000000..b56a0e667570
--- /dev/null
+++ b/app-editors/gvim/gvim-8.0.0386-r1.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-single-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk3? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk3? (
+			gtk? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+				gnome? ( >=gnome-base/libgnomeui-2.6 )
+			)
+			!gtk? (
+				motif? ( >=x11-libs/motif-2.3:0 )
+				!motif? (
+					neXt? ( x11-libs/neXtaw )
+					!neXt? ( x11-libs/libXaw )
+				)
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--enable-multibyte
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python pythoninterp)
+		$(use_enable python python3interp)
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope ; then
+		sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+			die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk3                    GTK3
+	# -aqua -gtk3 gnome             GNOME2
+	# -aqua -gtk3 -gnome gtk        GTK2
+	# -aqua -gtk -gtk3 motif        MOTIF
+	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
+	# -aqua -gtk -gtk3 -motif -neXt ATHENA
+	echo ; echo
+	if use aqua ; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk3 ; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk ; then
+		myconf+=( --enable-gtk2-check )
+		if use gnome ; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=( --enable-gui=gnome2 )
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=( --enable-gui=gtk2 )
+		fi
+	elif use motif ; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt ; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index ba7529e5ea08..b56a0e667570 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 VIM_VERSION="8.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-r1
+inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-single-r1
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -25,11 +25,7 @@ LICENSE="vim"
 IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
 REQUIRED_USE="
 	luajit? ( lua )
-	python? (
-		|| ( $(python_gen_useflags '*') )
-		?? ( $(python_gen_useflags 'python2*') )
-		?? ( $(python_gen_useflags 'python3*') )
-	)
+	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
 RDEPEND="
@@ -92,6 +88,8 @@ pkg_setup() {
 	# Gnome sandbox silliness. bug #114475.
 	mkdir -p "${T}"/home
 	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -188,6 +186,8 @@ src_configure() {
 		$(use_enable netbeans)
 		$(use_enable nls)
 		$(use_enable perl perlinterp)
+		$(use_enable python pythoninterp)
+		$(use_enable python python3interp)
 		$(use_enable racket mzschemeinterp)
 		$(use_enable ruby rubyinterp)
 		$(use_enable selinux)
@@ -195,25 +195,6 @@ src_configure() {
 		$(use_enable tcl tclinterp)
 	)
 
-	if use python ; then
-		py_add_interp() {
-			local v
-
-			[[ ${EPYTHON} == python3* ]] && v=3
-			myconf+=(
-				--enable-python${v}interp
-				vi_cv_path_python${v}="${PYTHON}"
-			)
-		}
-
-		python_foreach_impl py_add_interp
-	else
-		myconf+=(
-			--disable-pythoninterp
-			--disable-python3interp
-		)
-	fi
-
 	# --with-features=huge forces on cscope even if we --disable it. We need
 	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
 	if ! use cscope ; then
diff --git a/app-editors/vim/vim-8.0.0386-r1.ebuild b/app-editors/vim/vim-8.0.0386-r1.ebuild
new file mode 100644
index 000000000000..dcd889465378
--- /dev/null
+++ b/app-editors/vim/vim-8.0.0386-r1.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	!minimal? (
+		~app-editors/vim-core-${PV}
+		dev-util/ctags
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager ; then
+		cat <<-END > "${S}"/runtime/macros/manpager.sh
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			END
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	if use minimal ; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-multibyte
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			--enable-multibyte
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python pythoninterp)
+			$(use_enable python python3interp)
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope ; then
+			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+				die "couldn't disable cscope"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 7bbc4a62c5c1..f1b87f0b3ab8 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 VIM_VERSION="8.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -24,11 +24,7 @@ LICENSE="vim"
 IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
 REQUIRED_USE="
 	luajit? ( lua )
-	python? (
-		|| ( $(python_gen_useflags '*') )
-		?? ( $(python_gen_useflags 'python2*') )
-		?? ( $(python_gen_useflags 'python3*') )
-	)
+	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
 RDEPEND="
@@ -67,6 +63,8 @@ pkg_setup() {
 	# Gnome sandbox silliness. bug #114475.
 	mkdir -p "${T}"/home
 	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -195,31 +193,14 @@ src_configure() {
 			$(use_with luajit)
 			$(use_enable nls)
 			$(use_enable perl perlinterp)
+			$(use_enable python pythoninterp)
+			$(use_enable python python3interp)
 			$(use_enable racket mzschemeinterp)
 			$(use_enable ruby rubyinterp)
 			$(use_enable selinux)
 			$(use_enable tcl tclinterp)
 		)
 
-		if use python ; then
-			py_add_interp() {
-				local v
-
-				[[ ${EPYTHON} == python3* ]] && v=3
-				myconf+=(
-					--enable-python${v}interp
-					vi_cv_path_python${v}="${PYTHON}"
-				)
-			}
-
-			python_foreach_impl py_add_interp
-		else
-			myconf+=(
-				--disable-pythoninterp
-				--disable-python3interp
-			)
-		fi
-
 		# --with-features=huge forces on cscope even if we --disable it. We need
 		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
 		if ! use cscope ; then
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index 6c9b019e22c4..a586feab16c6 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -1,2 +1,2 @@
 DIST aide-0.14.2.tar.gz 418098 SHA256 bf4cd417b0f4778b4f9a618d23e0b0b7db10349ba6a0129394dc82fbc2fa8b9b SHA512 4ef96078fde057a54dda467fb55711e30d947969873715a02052362c57112f5bfd3155460ef353f70ce69fea3a3c491b7925bebbdb7034dbf618c63c360347df WHIRLPOOL fa91e4493bcac4cf11a8fedfd5e3c490752936f9ea04871d812b831f33089b694892e32ed19cef273926d3a8c091fb15a7b98a5e5303f08609f164773475d142
-DIST aide-0.15.1.tar.gz 424970 SHA256 303e5c186257df8c86e418193199f4ea2183fc37d3d4a9098a614f61346059ef SHA512 6afe327474858c697ba017b02bd40717c33874e69b801c171c2496ff9042b557e840bef4a151bda0e4d835ddb0d972b88790237a72f250525dc1fc6b8fa673e7 WHIRLPOOL 4c21221cfbaeff3aa00a3f22c4e31c1fffd3f00d112828540ab6ab94dd019086244de71e5d19d1120078acc7b81b9efa5a36d55937292f523bcb4e064830ba6a
+DIST aide-0.16.tar.gz 391009 SHA256 a81c53a131c4fd130b169b3a26ac35386a2f6e1e014f12807524cc273ed97345 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7 WHIRLPOOL d9ecba06d8367ed2ef622ee6b3ccf6a0ed37bad52548063c5c153bd31b856ed8a3379e6057cc1d4aebd29473ded71e9190c8c17dbeaa65eec3365be1d43d5f46
diff --git a/app-forensics/aide/aide-0.15.1.ebuild b/app-forensics/aide/aide-0.15.1.ebuild
deleted file mode 100644
index 7a345f057d7b..000000000000
--- a/app-forensics/aide/aide-0.15.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit autotools confutils eutils
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl audit curl mhash nls postgres prelink selinux static xattr zlib"
-
-CDEPEND="acl? ( virtual/acl )
-	audit? ( sys-process/audit )
-	curl? ( net-misc/curl )
-	mhash? ( >=app-crypt/mhash-0.9.2 )
-	!mhash? ( dev-libs/libgcrypt:0 )
-	nls? ( virtual/libintl )
-	postgres? ( dev-db/postgresql )
-	prelink? ( sys-devel/prelink )
-	selinux? (
-		sys-libs/libselinux
-	)
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="!static? ( ${CDEPEND} )
-	selinux? ( sec-policy/selinux-aide )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	confutils_use_conflict mhash postgres
-	confutils_use_conflict static curl postgres
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.15.1-gentoo.patch"
-
-	# fix as-need issue, bug #271326
-	epatch "${FILESDIR}/${PN}-0.14-as-needed.patch"
-
-	# fix configure issue, bug #323187
-	epatch "${FILESDIR}/${PN}-0.14-configure.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with acl posix-acl) \
-		$(use_with audit) \
-		$(use_with curl) \
-		$(use_with !mhash gcrypt) \
-		$(use_with mhash mhash) \
-		$(use_with nls locale) \
-		$(use_with postgres psql) \
-		$(use_with prelink) \
-		$(use_with selinux) \
-		$(use_enable static) \
-		$(use_with xattr) \
-		$(use_with zlib) \
-		--sysconfdir="${EPREFIX}/etc/aide" || die "econf failed"
-#		$(use_with e2fsattrs) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man || die "emake install failed"
-
-	keepdir /var/lib/aide || die
-	fowners root:0 /var/lib/aide || die
-	fperms 0755 /var/lib/aide || die
-
-	keepdir /var/log/aide || die
-
-	insinto /etc/aide
-	doins "${FILESDIR}"/aide.conf || die
-
-	dosbin "${FILESDIR}"/aideinit || die
-
-	dodoc AUTHORS ChangeLog NEWS README Todo "${FILESDIR}"/aide.cron || die
-	dohtml doc/manual.html || die
-}
-
-pkg_postinst() {
-	elog
-	elog "A sample configuration file has been installed as"
-	elog "/etc/aide/aide.conf.  Please edit to meet your needs."
-	elog "Read the aide.conf(5) manual page for more information."
-	elog "A helper script, aideinit, has been installed and can"
-	elog "be used to make AIDE management easier. Please run"
-	elog "aideinit --help for more information"
-	elog
-
-	if use postgres; then
-		elog "Due to a bad assumption by aide, you must issue the following"
-		elog "command after the database initialization (aide --init ...):"
-		elog
-		elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
-		elog "  where pg_class.relname='TABLE_pkey' and \ "
-		elog '  pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
-		elog
-		elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
-		elog "your aide.conf."
-		elog
-	fi
-}
diff --git a/app-forensics/aide/aide-0.16.ebuild b/app-forensics/aide/aide-0.16.ebuild
new file mode 100644
index 000000000000..be5144222bd9
--- /dev/null
+++ b/app-forensics/aide/aide-0.16.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools readme.gentoo-r1
+
+DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a file integrity checker"
+HOMEPAGE="http://aide.sourceforge.net/"
+SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl audit curl e2fs mhash postgres prelink selinux static xattr zlib"
+
+COMMON_DEPEND="
+	!mhash? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	mhash? ( app-crypt/mhash )
+	dev-libs/libpcre
+	acl? ( virtual/acl )
+	audit? ( sys-process/audit )
+	curl? ( net-misc/curl )
+	e2fs? ( sys-fs/e2fsprogs )
+	postgres? ( dev-db/postgresql:= )
+	prelink? ( dev-libs/elfutils )
+	selinux? ( sys-libs/libselinux )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="
+	!static? ( ${COMMON_DEPEND} )
+	prelink? ( sys-devel/prelink )
+	selinux? ( sec-policy/selinux-aide )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	static? (
+		!mhash? (
+			dev-libs/libgcrypt:0[static-libs]
+			dev-libs/libgpg-error[static-libs]
+		)
+		mhash? ( app-crypt/mhash[static-libs] )
+		dev-libs/libpcre[static-libs]
+		acl? ( virtual/acl[static-libs] )
+		e2fs? ( sys-fs/e2fsprogs[static-libs] )
+		prelink? ( dev-libs/elfutils[static-libs] )
+		selinux? ( sys-libs/libselinux[static-libs] )
+		xattr? ( sys-apps/attr[static-libs] )
+		zlib? ( sys-libs/zlib[static-libs] )
+	)
+"
+
+REQUIRED_USE="
+	postgres? ( !mhash )
+	static? ( !audit !curl !postgres )
+"
+
+HTML_DOCS=( doc/manual.html )
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+Example configuration file was installed at '${EPREFIX}/etc/aide/aide.conf'.
+Please edit it to meet your needs. Refer to aide.conf(5) manual page
+for more information.
+
+A helper script, aideinit, was installed and can be used to make AIDE
+management easier. Please run 'aideinit --help' for more information.
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-add-missing-include.patch"
+	"${FILESDIR}/${P}-fix-LIBS-LDFLAGS-mixing.patch"
+	"${FILESDIR}/${P}-fix-acl-configure-option.patch"
+)
+
+src_prepare() {
+	default_src_prepare
+	sed -i -e 's| -Werror||g' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+		--with-confighmactype="sha512"		# Override default weak MD5 hash.
+		--with-dbhmackey="sha512"			# Override default weak MD5 hash.
+		# Disable broken l10n support: https://sourceforge.net/p/aide/bugs/98/
+		# This doesn't affect anything because there are no localizations yet.
+		--without-locale
+		$(use_enable static)
+		$(use_with zlib)
+		$(use_with curl)
+		$(use_with acl posix-acl)
+		$(use_with selinux)
+		$(use_with prelink prelink "${EPREFIX}/usr/sbin/prelink")
+		$(use_with xattr)
+		$(use_with e2fs e2fsattrs)
+		$(use_with mhash mhash)
+		$(use_with !mhash gcrypt)
+		$(use_with postgres psql)
+		$(use_with audit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default_src_install
+	readme.gentoo_create_doc
+
+	insinto /etc/${PN}
+	doins "${FILESDIR}"/aide.conf
+
+	dosbin "${FILESDIR}"/aideinit
+	dodoc "${FILESDIR}"/aide.cron
+
+	keepdir /var/{lib,log}/${PN}
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if use postgres; then
+		elog
+		elog "Due to a bad assumption by aide, you must issue the following"
+		elog "command after the database initialization (aide --init ...):"
+		elog
+		elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
+		elog "  where pg_class.relname='TABLE_pkey' and \ "
+		elog '  pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
+		elog
+		elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
+		elog "in your aide.conf."
+		elog
+	fi
+}
diff --git a/app-forensics/aide/files/aide-0.15.1-gentoo.patch b/app-forensics/aide/files/aide-0.15.1-gentoo.patch
deleted file mode 100644
index 01c06f72387e..000000000000
--- a/app-forensics/aide/files/aide-0.15.1-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur aide-0.15.1.orig//src/Makefile.am aide-0.15.1//src/Makefile.am
---- aide-0.15.1.orig//src/Makefile.am	2010-08-02 03:23:44.000000000 +0900
-+++ aide-0.15.1//src/Makefile.am	2010-10-28 01:22:49.897871135 +0900
-@@ -26,7 +26,7 @@
- LEX_OUTPUT_ROOT = lex.yy
- 
- LDADD = -lm @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@ @E2FSATTRSLIB@ @ELFLIB@
--AM_CFLAGS = @AIDE_DEFS@ -W -Wall -g
-+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" @AIDE_DEFS@ -W -Wall -g
- 
- CLEANFILES = conf_yacc.h conf_yacc.c conf_lex.c db_lex.c *~
- 
-diff -Naur aide-0.15.1.orig//src/db.c aide-0.15.1//src/db.c
---- aide-0.15.1.orig//src/db.c	2010-08-09 02:39:31.000000000 +0900
-+++ aide-0.15.1//src/db.c	2010-10-28 01:22:12.930091842 +0900
-@@ -27,6 +27,10 @@
- #include "db_file.h"
- #include "db_disk.h"
- 
-+#ifdef WITH_CURL
-+#include "fopen.h"
-+#endif
-+
- #ifdef WITH_PSQL
- #include "db_sql.h"
- #endif
diff --git a/app-forensics/aide/files/aide-0.16-add-missing-include.patch b/app-forensics/aide/files/aide-0.16-add-missing-include.patch
new file mode 100644
index 000000000000..75f0403c968e
--- /dev/null
+++ b/app-forensics/aide/files/aide-0.16-add-missing-include.patch
@@ -0,0 +1,24 @@
+commit 1cbb888d55388d6bb88141c946bd6993b3e9872f
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date:   Tue May 23 17:24:29 2017 +0300
+
+db: add missing include
+
+url_fclose() function used in this file is defined in fopen.h.
+See https://sourceforge.net/p/aide/bugs/99/
+
+diff --git a/src/db.c b/src/db.c
+index dd133d4..858240d 100644
+--- a/src/db.c
++++ b/src/db.c
+@@ -28,6 +28,10 @@
+ #include "db_disk.h"
+ #include "md.h"
+
++#ifdef WITH_CURL
++#include "fopen.h"
++#endif
++
+ #ifdef WITH_PSQL
+ #include "db_sql.h"
+ #endif
diff --git a/app-forensics/aide/files/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch b/app-forensics/aide/files/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch
new file mode 100644
index 000000000000..453abe5f1eae
--- /dev/null
+++ b/app-forensics/aide/files/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch
@@ -0,0 +1,23 @@
+commit 6da37687ba7cf259ac19cae2e1c16115b6848143
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date:   Thu May 25 13:34:55 2017 +0300
+
+build: fix incorrect LIBS/LDFLAGS mixing
+
+Otherwise build with LDFLAGS='-Wl,--as-needed' and curl support fails.
+See https://bugs.gentoo.org/show_bug.cgi?id=271326
+and https://sourceforge.net/p/aide/bugs/96/
+
+diff --git a/configure.ac b/configure.ac
+index 3598ebe..0c5cb0c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -713,7 +713,7 @@ if test x$with_curl = xyes; then
+   AC_CHECK_HEADERS(curl/curl.h,,
+  	[AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])])
+   CFLAGS="$CFLAGS $CURL_CFLAGS"
+-  LDFLAGS="$LDFLAGS $CURL_LIBS"
++  LIBS="$LIBS $CURL_LIBS"
+   AC_CHECK_LIB(curl,curl_easy_init,havecurl=yes,
+  	[AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])]
+ )
diff --git a/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch b/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch
new file mode 100644
index 000000000000..a989e379039c
--- /dev/null
+++ b/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch
@@ -0,0 +1,23 @@
+commit 3d9746bccbb50809e4c3de90ab5145a17af39aeb
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date:   Thu May 25 14:38:02 2017 +0300
+
+build: respect user choice for posix-acl configure option
+
+Otherwise acl support is enabled automagically, which is bad.
+See https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Automagic_dependencies
+and https://sourceforge.net/p/aide/bugs/97/
+
+diff --git a/configure.ac b/configure.ac
+index 3598ebe..c45bbee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -450,7 +450,7 @@ AC_MSG_CHECKING(for posix-acl-support)
+ AC_ARG_WITH([posix-acl],
+ 	[AC_HELP_STRING([--with-posix-acl],
+ 		[use POSIX ACLs (no checking)])],
+-	[],
++	[with_posix_acl_support="$withval"],
+ 	[with_posix_acl_support=no]
+ )
+
diff --git a/app-forensics/aide/metadata.xml b/app-forensics/aide/metadata.xml
index cfb8d84da807..b00447facfc8 100644
--- a/app-forensics/aide/metadata.xml
+++ b/app-forensics/aide/metadata.xml
@@ -5,8 +5,17 @@
 		<email>forensics@gentoo.org</email>
 		<name>Gentoo Forensics Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
-		<flag name="prelink">Enable support for <pkg>sys-devel/prelink</pkg></flag>
+		<flag name="e2fs">Enable support for checking file attributes on ext2/ext3/ext4 filesystems</flag>
+		<flag name="prelink">Bypass prelinking when calculating checksums</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">aide</remote-id>
diff --git a/app-forensics/foremost/foremost-1.5.7-r1.ebuild b/app-forensics/foremost/foremost-1.5.7-r3.ebuild
similarity index 78%
rename from app-forensics/foremost/foremost-1.5.7-r1.ebuild
rename to app-forensics/foremost/foremost-1.5.7-r3.ebuild
index a96a90521a0c..69d67a469d2d 100644
--- a/app-forensics/foremost/foremost-1.5.7-r1.ebuild
+++ b/app-forensics/foremost/foremost-1.5.7-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 inherit eutils toolchain-funcs
 
@@ -11,13 +11,15 @@ HOMEPAGE="http://foremost.sourceforge.net/"
 # starting to hate sf.net ...
 SRC_URI="http://foremost.sourceforge.net/pkg/${P}.tar.gz"
 
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 LICENSE="public-domain"
 SLOT="0"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.4-config-location.patch"
+	epatch "${FILESDIR}/${PN}-1.5.7-format-security.patch"
+	default_src_prepare
 }
 
 src_compile() {
@@ -27,7 +29,8 @@ src_compile() {
 
 src_install() {
 	dobin foremost
-	doman foremost.8.gz
+	gunzip foremost.8.gz
+	doman foremost.8
 	insinto /etc
 	doins foremost.conf
 	dodoc README CHANGES
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index d404db1ef511..97732b6a437e 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1 +1,2 @@
 DIST mosquitto-1.4.10.tar.gz 359569 SHA256 437648d68a4a781dd8d913814cd5451f59ab4a5fcf84cccaf7c36e6a07459770 SHA512 fe5d6d7196a137a496ba6881c77d852396baefb4f0b83ccd9a22175fc05b09e48a09ea249e30ec7db966e11de134ebcc4e2e9b1fd40b31dc59fb0fa2f60b75a1 WHIRLPOOL 9510060701259e78c39bf88989ce8142d11e0b53348a20c1a71ffc69b98d7c1725c9315026d392d8d86d131bc55c86492a91ddde94eca0d353f1d3ab6ef6900f
+DIST mosquitto-1.4.11.tar.gz 361468 SHA256 ca47533bbc1b7c5e15d6e5d96d3efc59677f2515b6692263c34b7c48f33280c5 SHA512 c05ca8679b9a6f540868f4ccf701257fcabc114d5450ac0bbbe80b91bb7cd4fc52668773e945506760c7a5bd8a494e0a56100714112e5d2713d57bfab8951587 WHIRLPOOL d4418b951ff55eaba1fc67b324f1ecdd0d55c0eea066be9793de30e8561d0fe0e36537adb688fc98764758998086eb64b827041e76160ddc858c6066f83e8f21
diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index da548ae04a82..53e88eadda1c 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -13,5 +13,6 @@
 		<flag name="bridge">Enable bridge support in the MQTT broker.</flag>
 		<flag name="persistence">Store messages and subscriptions to a file.</flag>
 		<flag name="srv">Include SRV lookup support.</flag>
+		<flag name="websockets">Support the WebSocket protocol.</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-misc/mosquitto/mosquitto-1.4.11.ebuild b/app-misc/mosquitto/mosquitto-1.4.11.ebuild
new file mode 100644
index 000000000000..3f4677c38d1f
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.11.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd user toolchain-funcs python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="http://mosquitto.org/"
+SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm"
+IUSE="bridge examples +persistence +srv ssl tcpd websockets"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	srv? ( net-dns/c-ares )
+	websockets? ( net-libs/libwebsockets )"
+
+pkg_setup() {
+	enewgroup mosquitto
+	enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.4.10-conditional-tests.patch"
+	if use persistence; then
+		sed -i -e "s:^#autosave_interval:autosave_interval:" \
+			-e "s:^#persistence false$:persistence true:" \
+			-e "s:^#persistence_file:persistence_file:" \
+			-e "s:^#persistence_location$:persistence_location /var/lib/mosquitto/:" \
+			mosquitto.conf || die
+	fi
+
+	# Remove prestripping
+	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
+
+	python_setup
+	python_fix_shebang test
+}
+
+src_configure() {
+	LIBDIR=$(get_libdir)
+	makeopts=(
+		"CC=$(tc-getCC)"
+		"LIB_SUFFIX=${LIBDIR:3}"
+		"WITH_BRIDGE=$(usex bridge)"
+		"WITH_PERSISTENCE=$(usex persistence)"
+		"WITH_SRV=$(usex srv)"
+		"WITH_TLS=$(usex ssl)"
+		"WITH_WEBSOCKETS=$(usex websockets)"
+		"WITH_WRAP=$(usex tcpd)"
+	)
+}
+
+src_compile() {
+	emake "${makeopts[@]}"
+}
+
+src_test() {
+	emake "${makeopts[@]}" test
+}
+
+src_install() {
+	emake "${makeopts[@]}" DESTDIR="${D}" prefix=/usr install
+	keepdir /var/lib/mosquitto
+	fowners mosquitto:mosquitto /var/lib/mosquitto
+	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+	doinitd "${FILESDIR}"/mosquitto
+	insinto /etc/mosquitto
+	doins mosquitto.conf
+	systemd_dounit "${FILESDIR}/mosquitto.service"
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r examples/*
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	elog "The Python module has been moved out of mosquitto."
+	elog "See http://mosquitto.org/documentation/python/"
+	elog ""
+	elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+	elog ""
+	elog "    rc-update add mosquitto default"
+	elog "    or"
+	elog "    systemctl enable mosquitto"
+}
diff --git a/app-misc/xmind/Manifest b/app-misc/xmind/Manifest
index 84020317792e..c58b19104ae3 100644
--- a/app-misc/xmind/Manifest
+++ b/app-misc/xmind/Manifest
@@ -1,7 +1,4 @@
-DIST xmind-7-update1-portable.zip 263875799 SHA256 2823c93178e55ff21d3a75ff2a9d2aa694f50a94a7220207a1ad757660cdf030 SHA512 c60cda54af5aefefde480627e7191ebdaf32df27e2873ac738ee7814ad0acda7066ef1ff62ffdc16148d190438d60991ca036fe0903cda44edbab91e2237b4bb WHIRLPOOL 4f177c52faef598143eb479b5cd9f7a55ddd7c82e7610852f01074227f6d8a29cf00c4ddd3d3d35d30ae6e859670791734594cf2c1f6d2ab2ec406207b612350
-DIST xmind-8-linux.zip 142262044 SHA256 3b57e41953672379e3b7ab7a2fe1c577164be36f025895c792d76ca63b5d0439 SHA512 8f7f386eac1341e4e8e5cb86a701596e0cc2efcf0a20f6cc53af2fc5dd6b9859dfaf54ab104316c60a52a1083fa55fa8ab0c58498151d29cd463012c9474b5e7 WHIRLPOOL 825757d60a9c82cd964c642ac73320ceb33e460580cecd1899a0c7158c611f394b7f2b262461b2c5ea523970560c700e43c274adb8ddc856d40d69ef241dee16
 DIST xmind-8-update1-linux.zip 142395100 SHA256 59dc865856d8b560ebc5a9d220a26e6694cb004b67cd1e7c76e177637f432e35 SHA512 725268287dfa9dc9a5d9fd429277eecd43ef2e09158b3bb8ef51e06355620741b2aa709c227debd0069f4401623b7274082f6b81b3ace153289ef7ffac25fca4 WHIRLPOOL 2b23a85c56d44ac3d4fa8480e6995386a2595f8947932a0e8179238f78c088c1b7af9b8ffc532121175ad7c0ab02fdecaae9008c53d99e1a5724225d0c689df5
+DIST xmind-8-update2-linux.zip 120800791 SHA256 e4b1a4f6b98b4d8801f09b12def790bbc4516d8ea1cc4463df7f0cc9485bfe23 SHA512 e658714a5944e8de62577302c22763e9c55d1f82ce6cbda187ec39801ac7cbd5c34de6e4d7d9735546bcef26795c21c194ff026cebf39b2c9af2663cec98ce58 WHIRLPOOL 0749a7611d06479e1fe2bba338d2437cc3731989eb07fb87ac1d36067f1ce315ad738adee867faa67394b387a3ee6aa25d1d35015f37b4b955ea877b2419aad9
 DIST xmind-icons.tar.xz 5024 SHA256 6a5e087c5c66aa6f36b7822268b486922157e3b75a091b6fbdeec905607b8aa5 SHA512 3ee6b8e42b75305bec8f97f733575f10ca3d08e1c5a76a10700776cb7740ae6f8a0f3dfbc4112d60ab2499915ca4ea0e3d56fd49e55bec00fccdc8710d9f9f0d WHIRLPOOL 590571a8b950ff6200d92417ab7eede2a8856263bc07c00fb129d751d9a00ae9bab69d916aab2f04d8270eadb0466723e99570032eacabd7350afd3cca4b8f23
-DIST xmind-portable-3.4.1.201401221918.zip 138440913 SHA256 f70b8317ec0fe512e507bc26cc7fed70348af3c1d8c17603a78359175fc01261 SHA512 06d6473b26a0eef97d6651d14c13d7fd28fda19b33b2aea4f924d2e0f0d3131f19d5b64e081ba0d537c44eb09e27a83596aca91156bd32c5377903fbb7da9804 WHIRLPOOL 2601e8f293ef97d12576a461bb3b7a8e68bf6a4f807f780b9e6b7a12c20030bc979f61cf1f76f6deb617c57aa2c16e8d35621e66c5df825f8800ca38304d8ee0
-DIST xmind-portable-3.5.1.201411201906.zip 160601004 SHA256 920321dc254604d51d4b3b4718ba04271de0e47b63a836fc597467c4062a89e4 SHA512 24da7bf3bfbc0beddbf6f4bb4b9d465e28c652b6e80ba9e0bc2a52cc2ff8c175a83ea8cc0d5b3dc87961c5b6666b6294ca836e29795631db41455ef1b8b2b3f0 WHIRLPOOL 9dab13d6578fe7e817cfa43ce171e33ae5f6d0f939f307b8cf15d651a70800763776bf9ed318a7116716dc7aa20793455a771d46f38ca13780dc9272024f73fe
 DIST xmind-portable-3.5.3.201506180105.zip 159265180 SHA256 38a20e7c4a19c13eb26f5f27ff1898fa4ca463d234e72c616b2305c7a3b31efc SHA512 d41deebec769d06276d051c57e546c44e4283feabd5f6c45ce97efdbf755d75e9b99d39b6fd10baf2f4735f25a695d2902ca9888d94ad414318f38c55e3f4af5 WHIRLPOOL 8aae5af4a2ad14afc2883b56a8b57b9906a7a1cd8e7959175d3a3e780b48725d5e7af83325e0c10e4f5cfee921637656171d21f8190f47810d7b40095a0da489
diff --git a/app-misc/xmind/xmind-3.4.1.201401221918.ebuild b/app-misc/xmind/xmind-3.4.1.201401221918.ebuild
deleted file mode 100644
index ffae9517c9e0..000000000000
--- a/app-misc/xmind/xmind-3.4.1.201401221918.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib gnome2-utils
-
-MY_PN="${PN}-portable"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A brainstorming and mind mapping software tool"
-HOMEPAGE="http://www.xmind.net"
-SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
-	https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5
-	x11-libs/gtk+:2
-"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
-QA_FLAGS_IGNORED="
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.200.v20120522-1813/eclipse_1502.so
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20120522-1813/eclipse_1502.so
-	opt/xmind/XMind/libcairo-swt.so
-	opt/xmind/XMind/XMind
-"
-
-src_configure() {
-	if use amd64; then
-		XDIR="XMind_Linux_64bit"
-	else
-		XDIR="XMind_Linux"
-	fi
-	mv "$XDIR" XMind || die
-	mv XMind/.eclipseproduct Commons || die
-	cp "${FILESDIR}"/${PN}-3.4.0-config.ini Commons/configuration || die #Combined common+linux config.ini
-	# force data instance & config area to be at home/.xmind directory
-	sed \
-		-e '/-configuration/d' \
-		-e '/\.\/configuration/d' \
-		-e '/-data/d' \
-		-e '/\.\.\/Commons\/data\/workspace-cathy/d' \
-		-e 's/\.\.\/Commons/\/opt\/xmind\/Commons/g' \
-		-i XMind/XMind.ini || die
-	echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
-	echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /opt/xmind
-	doins -r Commons XMind
-	fperms a+rx  "/opt/xmind/XMind/XMind"
-
-	exeinto /opt/bin
-	newexe "${FILESDIR}/xmind-wrapper" xmind
-
-	# install icons
-	local res
-	for res in 16 32 48; do
-		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
-	done
-
-	# make desktop entry
-	make_desktop_entry "xmind %F" XMind xmind Office "MimeType=application/x-xmind;"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "For audio notes support, install media-sound/lame"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/xmind/xmind-3.5.1.201411201906.ebuild b/app-misc/xmind/xmind-3.5.1.201411201906.ebuild
deleted file mode 100644
index 56c2d75dfa8c..000000000000
--- a/app-misc/xmind/xmind-3.5.1.201411201906.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib gnome2-utils
-
-MY_PN="${PN}-portable"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A brainstorming and mind mapping software tool"
-HOMEPAGE="http://www.xmind.net"
-SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
-	https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5
-	x11-libs/gtk+:2
-"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
-QA_FLAGS_IGNORED="
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.200.v20120522-1813/eclipse_1502.so
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20120522-1813/eclipse_1502.so
-	opt/xmind/XMind/libcairo-swt.so
-	opt/xmind/XMind/XMind
-"
-
-src_configure() {
-	if use amd64; then
-		XDIR="XMind_Linux_64bit"
-	else
-		XDIR="XMind_Linux"
-	fi
-	mv "$XDIR" XMind || die
-	mv XMind/.eclipseproduct Commons || die
-	cp "${FILESDIR}"/${PN}-3.4.0-config.ini Commons/configuration || die #Combined common+linux config.ini
-	# force data instance & config area to be at home/.xmind directory
-	sed \
-		-e '/-configuration/d' \
-		-e '/\.\/configuration/d' \
-		-e '/-data/d' \
-		-e '/\.\.\/Commons\/data\/workspace-cathy/d' \
-		-e 's/\.\.\/Commons/\/opt\/xmind\/Commons/g' \
-		-i XMind/XMind.ini || die
-	echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
-	echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /opt/xmind
-	doins -r Commons XMind
-	fperms a+rx  "/opt/xmind/XMind/XMind"
-
-	exeinto /opt/bin
-	newexe "${FILESDIR}/xmind-wrapper" xmind
-
-	# install icons
-	local res
-	for res in 16 32 48; do
-		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
-	done
-
-	# make desktop entry
-	make_desktop_entry "xmind %F" XMind xmind Office "MimeType=application/x-xmind;"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "For audio notes support, install media-sound/lame"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/xmind/xmind-3.6.1-r1.ebuild b/app-misc/xmind/xmind-3.6.1-r1.ebuild
deleted file mode 100644
index 4c185fa3c6f9..000000000000
--- a/app-misc/xmind/xmind-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib gnome2-utils
-
-MY_PV="7-update1"
-MY_P="${PN}-${MY_PV}-portable"
-
-DESCRIPTION="A brainstorming and mind mapping software tool"
-HOMEPAGE="http://www.xmind.net"
-SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
-	https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5
-	x11-libs/gtk+:2
-"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
-QA_FLAGS_IGNORED="
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.300.v20150602-1417/eclipse_1612.so
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.300.v20150602-1417/eclipse_1612.so
-	opt/xmind/XMind/libcairo-swt.so
-	opt/xmind/XMind/XMind
-"
-
-src_configure() {
-	if use amd64; then
-		XDIR="XMind_Linux_64bit"
-	else
-		XDIR="XMind_Linux"
-	fi
-	mv "$XDIR" XMind || die
-	cp "${FILESDIR}"/${PN}-3.4.0-config.ini Commons/configuration || die #Combined common+linux config.ini
-	# force data instance & config area to be at home/.xmind directory
-	sed \
-		-e '/-configuration/d' \
-		-e '/\.\/configuration/d' \
-		-e '/-data/d' \
-		-e '/\.\.\/Commons\/data\/workspace-cathy/d' \
-		-e 's/\.\.\/Commons/\/opt\/xmind\/Commons/g' \
-		-i XMind/XMind.ini || die
-	echo '-vmargs' >> XMind/XMind.ini || die
-	echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
-	echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /opt/xmind
-	doins -r Commons XMind
-	fperms a+rx  "/opt/xmind/XMind/XMind"
-
-	exeinto /opt/bin
-	newexe "${FILESDIR}/xmind-wrapper-3.5.3" xmind
-
-	# install icons
-	local res
-	for res in 16 32 48; do
-		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
-	done
-
-	make_desktop_entry ${PN} "XMind" ${PN} "Office" "MimeType=application/x-xmind;"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "For audio notes support, install media-sound/lame"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/xmind/xmind-3.7.0.ebuild b/app-misc/xmind/xmind-3.7.2.ebuild
similarity index 97%
rename from app-misc/xmind/xmind-3.7.0.ebuild
rename to app-misc/xmind/xmind-3.7.2.ebuild
index cfa6711992c0..e8a9a4ed312c 100644
--- a/app-misc/xmind/xmind-3.7.0.ebuild
+++ b/app-misc/xmind/xmind-3.7.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit eutils multilib gnome2-utils font
 
-MY_PV="8"
+MY_PV="8-update2"
 MY_P="${PN}-${MY_PV}-linux"
 
 DESCRIPTION="A brainstorming and mind mapping software tool"
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index f5d8b1502c8a..1b24445e3dc8 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,2 +1 @@
-DIST kmymoney-4.7.2.tar.xz 20391472 SHA256 bfb2c29ff30988f46324c2dae197a06b58d07336a1947adc22bcfed3e554393d SHA512 43db5b3e52d21dee517c8fadccf120aed5854dc16cbd7e265c327149c3a0c900ec02de06a56a9f5b8ad4d04c15730916c79238a3cf2778911e9d8cc4a65afbb1 WHIRLPOOL 461ce894aedb653e696572068ec7a006c3c3fcc2c7493caf634052393bc5874d19e3a6e87e73fd6100316d9bfbfe65eba4d6c87ea2f3b11ea4b354fc91422db7
 DIST kmymoney-4.8.0.tar.xz 20785888 SHA256 c2a635710aafa6925a49803c480e043e0bf4bc5b62430689aa5eb95619f48ac2 SHA512 883635a94333341cbe3d6c835fe1dbc1cc5ed5cc834f76c945030ec680aee4fc6ceb367fdde811672a392eb5cd7b735c858e0be5a7f7964a4ccf5f9ba8865381 WHIRLPOOL acbada22e3e9c83e88e571b397c37da79eb36ce05a55786c352af306d3f863dc2db7140c9f1e1757393ea7f6dc9a1728debe077c71ce28b655c65e707f1130cd
diff --git a/app-office/kmymoney/kmymoney-4.7.2.ebuild b/app-office/kmymoney/kmymoney-4.7.2.ebuild
deleted file mode 100644
index 465931ab485a..000000000000
--- a/app-office/kmymoney/kmymoney-4.7.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr gl
-hu it kk nds nl pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-base
-
-DESCRIPTION="Personal finance manager for KDE"
-HOMEPAGE="http://kmymoney2.sourceforge.net/"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug calendar doc hbci ofx quotes"
-
-COMMON_DEPEND="
-	app-crypt/gpgme
-	>=app-office/libalkimia-4.3.2
-	dev-libs/gmp:0
-	dev-libs/libgpg-error
-	$(add_kdeapps_dep kdepimlibs)
-	x11-misc/shared-mime-info
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.0.1
-		>=sys-libs/gwenhywfar-4.0.1[qt4]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!~kde-apps/kdepimlibs-4.14.10_p20160611
-	!>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
-	quotes? ( dev-perl/Finance-Quote )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		$(cmake-utils_use_enable calendar LIBICAL)
-		$(cmake-utils_use_use doc DEVELOPER_DOC)
-		$(cmake-utils_use_enable hbci KBANKING)
-		$(cmake-utils_use_enable ofx LIBOFX)
-	)
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-
-	use doc && kde4-base_src_compile apidoc
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${BUILD_DIR}/apidocs/html/")
-	kde4-base_src_install
-}
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index b94eb25f0a38..1ebfdc6969d7 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,12 +1,24 @@
+DIST amd64-debug-libreoffice-5.2.7.2-r1.tar.xz 1032127800 SHA256 d50ae862de24ddf3595859513f33e7886f2bf135e1535268b30a5cc0a4e9ba81 SHA512 02dff85ad817514a0fc00a52c2ffd9ebacf2eb82d619578ffaee18844981b5310064fb8fb5ca589fd53894f11c3bfa7386f7e8b4387db36365629f5b7ebe2141 WHIRLPOOL 365432423ee620146aad894f4ed6e3d69091e07a82867785092ea8273ef7c4aca9d7df3bb9fdb19f3924eb72e25d953eae7213680695a48b3711dd9596e1bd8b
 DIST amd64-debug-libreoffice-5.2.7.2.tar.xz 1032133252 SHA256 fdcab0d583599926f0633951eab674f35966374ecaf8258eb21917dbd844e7b9 SHA512 e417f32186796c77f6154611341ca00e54cf0d2501bc3fdc788279c2aecc41b0a03af1f17dd390f205383e42a2c249c8b02c9e6b2499cf8d62364806732f91ce WHIRLPOOL 1692cc5e9efab94d7e7757e8e876acdc4fbb114324f30ace83938d7d34a627c86745b9fac23e39b8f7adc0015f092ba737bcdcdd2e58737a64c32b35ec6b8840
+DIST amd64-debug-libreoffice-gnome-5.2.7.2-r1.xd3 291363125 SHA256 8d7346a149f2e734c444564fd128ea53f7dbd0507b190f2ec92d25a2ccfa9b55 SHA512 c9661c8ae9e2b522c09e9cd8712b6074cbd4dd4da5a5089ecdc17c4e20d6ff64d31eba0d1252c7ae0933b116490c85961cc38f841260085164659c37eeb61929 WHIRLPOOL f3aa7eec25aa117b21f363bd121ba738124d2745bea3ebc152b16477d935320565aa7d0b078bc6f512171037c9d639fa13183cf5d35dc8a9f8c8085acef56bde
 DIST amd64-debug-libreoffice-gnome-5.2.7.2.xd3 291363224 SHA256 b11c0850790cb9291e2e84e8a8697b07c42e5b01ba7625c16d3db1bc2d6ce6dc SHA512 62444032f4a56db59f58f69f329ddc3dc73cb5a3233353bd8478c5445ea4b3dafd6c5733ff6f7d9ffb79442bc129f9b476918f28d53f42958973093343a8bf1e WHIRLPOOL e758d4f47fbd0be6e4897b4273b4c6a2c665a744496ac25d4b099649442c172197ad4bfa70fe2610a32c4054f35bc89f0cfb732966ea299facfbaf47493dec10
+DIST amd64-debug-libreoffice-gnome-java-5.2.7.2-r1.xd3 487998797 SHA256 62de5a3cebc2f3e8f4df7e8446b0f1a26eb82f2ecd5b42cbda2de8288cd9815d SHA512 1321f92228e9ae9fd6d2f6edf1b037960ac8535f392c0cc6a64e6c4c44c40f5e0173bd161e2bd7363b5f4a33bc642d6eda6d28976789ad1a06af56ba93183f61 WHIRLPOOL 92cc3a98569cb50efaed8ba00e8208a06b3b940a71b3542b9a550a008280cc0e1d7dc5810621b2a961c4bcd307e663b2a0bb3f359f577fc3fd938a9a07d64d2c
 DIST amd64-debug-libreoffice-gnome-java-5.2.7.2.xd3 487998478 SHA256 1a761c41957d0a56ea6b540e24cc7c8a651e2155782a11f910d05e97bf6bb698 SHA512 7acac19c2ebc972b858475421ccede7fe60481d5ad638c3bca31ab570ad0d69a386442e5d3f7042d0fa89c63d2a376f94c3e509f8ec2a43cb7eef9c10bea0ef9 WHIRLPOOL 96d52a7bf3a1989224b49d150d1cf5b5f25985722acbd244ca7b00163a5ad2c0cb37d78baa96358605bd89b41d6b65f592fab67cff69640b1b49d06874733f77
+DIST amd64-debug-libreoffice-java-5.2.7.2-r1.xd3 480762438 SHA256 a3fecc06af07440d93133f911fa92c4d355ff199a45350bc77b18a10a861e5c5 SHA512 fb8deb4fb267ca9281264fc1638c76b923bbf1a369fc7cca90a15b15bb6866a408494212d4bdf8cece15909c1363e6b9dc5372bd7cd842a424af46889ccc59ff WHIRLPOOL 64ca5e31738944b8720aa3963077bce7fb24d56308280b6c2ada416c2ace779c8d00411e213c2cb3fe93ede3cc788719b96586a40a922d350c971eb6e3cab4a8
 DIST amd64-debug-libreoffice-java-5.2.7.2.xd3 480762826 SHA256 29bac7555423cccf27c76e80754bba04bab348aeb8804000891123901a62cd08 SHA512 57841ce7817dc3b7ba2621b17a954f97cfa68769fd8427613426cc65a2084924c4bd6b0fcef71a925ff0a3517fdbbdac3deac03492c907728b4836d13e7b6a00 WHIRLPOOL 9ee9510d0fdf4edde18a5a85054fca68b461aa8185b90e6506210f48189ed21e78d5713147f0106cdc5185309fa955a87371745ff11de600e418e47102dc177a
+DIST amd64-debug-libreoffice-kde-5.2.7.2-r1.xd3 295540274 SHA256 f81dc6f206f32d991c1fc2efdafb0cb1a6d6f2d4ee3f8e3e6dd6c5f44bba0308 SHA512 0983427c8036ba91938f9d4b5c1914b1c8f821fde857691df49c971d535d663d4e010f7f725e40648b522a8af51f3a2f794ee1e4124db02221e32764a07e5663 WHIRLPOOL 07edfc5c1f70b08cdedb885016a4b9e08a205566abe4157b3d13b11b30974df93768ec3d9716dc5af0a00909878aff771aee43158675a3c154523b4736140110
 DIST amd64-debug-libreoffice-kde-5.2.7.2.xd3 295540634 SHA256 8101a93cd55a4bba213f24746c7f0c50b5fd78e8ebbf89ea52135f1efebf6b84 SHA512 8cced3b64cadbd6bbfcf71a4bf19596faaf603494f4e78889fc8180397eb2c477e0e28734a54b5a980d9620ae856721c607c4865ae30fcc81ffe56a003ab19dd WHIRLPOOL 64db581802ccc1d561311ea9f65e3b3aef97eb77c72a9644d749ac5cb2fc323c59bbd25cc45499113591a8d7183a06d8f4f4218bcc2609b8c4a1b47f39af5df6
+DIST amd64-debug-libreoffice-kde-java-5.2.7.2-r1.xd3 482383437 SHA256 fb162f0d44632db45aec4f1e5ffbb5559daaa0391dbb1c06a041f4c158043a9b SHA512 66348068366aa1ef7e1854feb48bd326fb4abf292a41ede40cb90c479d5890c0eef7154c2e5f993f93ff618948a8bcfbd3da327ea0a71d5896b7da7d9d0127ab WHIRLPOOL fcbafc032f6f32b930d4307c64f467b12ec44bca5964bae9f4c606e7ffb876857a550984618043f02dda148676fa76adc7ac9f64def064f377039793b5790046
 DIST amd64-debug-libreoffice-kde-java-5.2.7.2.xd3 482388926 SHA256 a0e39941e4b71a1cb9133d322fbc5a767e4400cc1539f93f6cbe0461ce03165f SHA512 73d76ccdbda7f36d2dd5428163417122c6a9385df35c6be40b41c57274e871855126164d9a42137c8af11b1b02d7bbc83576a43b95a33b39d9832b4c2444f6dd WHIRLPOOL 1ed46dd02b89c0d9077e278f67febf5fcc993afc0041c3d91944aab4a6fd0b1724324b015b8b957351b495efd92fb371195358c4b82783dac8e600cdd7cb6ebe
+DIST x86-debug-libreoffice-5.2.7.2-r1.tar.xz 1000877664 SHA256 c324c8b822aff542b39cf9ea812e8c6cae65e765f857987c5d62be8dcf2e65aa SHA512 70aaf733bb0ed03920bc10f6455ad2dc70f6ab3736ba9171e558ce75b185eeee7f26a65c57bca69a28ac9c7a1560e8d2d73f65b117abea3ce1196eb5c684a474 WHIRLPOOL 25346f601206240b08e4fd8254eb75ca2d59f82fdb02723ad84a086481e0b405123362e6466789217a2d36a35f26d56a8c4f6af3a1148d9451b407b41f0b816f
 DIST x86-debug-libreoffice-5.2.7.2.tar.xz 1000899080 SHA256 303cb2fad5813fe86cdaf4a2956dbbb0fa74b467c40ebb3d5f238b07f59dd7d3 SHA512 13e14be53319288ab9a97c27888c68ffd4e8e07b2d0b503e878690629162bb99bb2c675146327dba72833978c7799a0d1978f4cee22b503399b8be9472e673cf WHIRLPOOL 866c931fe86c60dc487d024be1485feb25e5c33405d9e149225b87792f81fe1b45c54ad507b0b22874dcaecea854a52eaee73e14677bce42a9149730023bec47
+DIST x86-debug-libreoffice-gnome-5.2.7.2-r1.xd3 280536647 SHA256 9a023f54203cf6395745fa6c13edf8700aefd1a55b8570fcb0fe389c33bd12cc SHA512 d7fc1db2a067d5fb0f986b394d34fe22f4c5c4e49d8ad6bd216e67d4610fd89ff7e3ec590cca6dbce03af9f6c4678d6b46023cd5ca8238fade33cb3509974394 WHIRLPOOL 07e14b095c48cbce7f9bf5fdd3952e9fc90b2fc5e5638b1d9018b5cbada413d327dc787ddafe546f8cdc530f06a8e08ea70dfb6c38d98d16eed55c79b291347e
 DIST x86-debug-libreoffice-gnome-5.2.7.2.xd3 280536686 SHA256 6f878c167f2ab627be1f78eaeac38d6af44b07c6593b979af06718ba7224bb81 SHA512 c8e082e9a223bc37f577091beae1e19731285cc9fcbc666dd75a5bdb9e8973d26629fccd2cb73183cdaf4963f7086ab4701aa2cc7deb19650f5ac4a80bd4be15 WHIRLPOOL b0e24858f555e0c1dce86828329299dfe1d2d43da0e65c55754d614d471e9c6f41cd7c7d327fcc3fb9825bcc403959c67cf82c2b9e23645020967231965c9219
+DIST x86-debug-libreoffice-gnome-java-5.2.7.2-r1.xd3 459997423 SHA256 e90fb0d871f7a767e85c35e50bd4f78b3dbe0c46e3a19372d3002298ac89b4fd SHA512 41374f2bcc3b57372d4527ff898dc63a2eab387ae3346b07c6f0a77bb157e348921df5817d0fc0e45d670d639cddc004cfce4f53fa1ead97e5487235c7323ec7 WHIRLPOOL 8fc487e5b018a55bc102199e46e92101479020b9d2fc371cdf9e5b6a51dbb3550836855a4d434f03aceaf5a90e54d5df4ff5629654618e3cef51f63a08d095d1
 DIST x86-debug-libreoffice-gnome-java-5.2.7.2.xd3 459997668 SHA256 2538550ca034d5c69165c11d06c93bc20cb676d41f6a74502547b1b9a661b0a1 SHA512 89a11be8d9c2da12289180bf3f3b3bc922aa70eac26eedf78f093c2e12881178ea07f7c7b3599fd7550fb3095c649cbddb5bf9a329b0a7db6fbcf6fc7efed7ad WHIRLPOOL ea1c208f220d26bd0ca5c43f6f398f6c8f4362a5cf63b34ef91a5b8db4f08064421b7c08015b7287cd483c985514bc8202443aad5b81bc72fcd17224b7494d30
+DIST x86-debug-libreoffice-java-5.2.7.2-r1.xd3 452936680 SHA256 6cdc9d0018d131b71e42572b599fb5e0f9029e2ab8e77b197ea3233b00f19de3 SHA512 be59bb820ec63f34baa3543994e202d4aecb92b735804334fa12c8a41acf27ee0adaaa79b2bce782da7dd1783e074b2ca0c8017c736996149643c15c0df7e5eb WHIRLPOOL b3fcd68af22bb52ebc5bd291a72a1574bc3a7ea65518a9fabca6f4ed0da8b84f13c36feb258bea7c616f51bb150728cdd3c37ae7201601cac9c85089d653c103
 DIST x86-debug-libreoffice-java-5.2.7.2.xd3 452939226 SHA256 2ba89b81ab6bde324989c06bd2ffc855519dabffa1eee6f03b7280d21e7da708 SHA512 61f5646037712f889725d89e87b60adc1ca81b73357f30cb83292b37e90138c49b6dad29c942c739f2ea12988f714b5d88ded52a2e61e89719bfd972e02729d5 WHIRLPOOL ff8da4148afa4145fbfe7a4b38cc97fee3b7348adf3b0e52722b6e7ea1531ec939d72ac361303415b1c74b9eae422cc6cb46f8915386a0bfd39a688a5c8f3bbc
+DIST x86-debug-libreoffice-kde-5.2.7.2-r1.xd3 282348044 SHA256 e3554674d05f1279df5fbbc4ea1cba39068f4d4a672f6e743d240fd14aaedcf0 SHA512 3d2ee05ac470a64fed2b1580c6e3e16a6f4eebc3b94c7109eb3ec9bdd04b29e3cfbf853ff779d972c76792080c649a8a654665d9a7fac3b464539da091426b58 WHIRLPOOL e41898877953d578d6a46679e70fc81f05284e24cceb34eab7f1cafe077e952945ccfcfcaba55cc8e515cb595afcf9fe01fb87c892f47471aba9ae35f02e7e8a
 DIST x86-debug-libreoffice-kde-5.2.7.2.xd3 282348165 SHA256 fef6838ee0f69a65e757cd11420d22adb07be2980616faaa8ec16831f96fac41 SHA512 6528c4a4c5f19251dfb1590c2084fe2a5b61a0ef61b14c9bdb86119698bacbce49e3a5ccc46a3c63d42ecf648e82ba364d10cc481abd00af4193155463734f0b WHIRLPOOL f3938a12873cbc27d72b6ab216f21a79a7ce0d534ac3e480659955b69636d49badd2e3c57698c31989227e29ca1e4d37d2c33971133c6ba0848d2c3883df8869
+DIST x86-debug-libreoffice-kde-java-5.2.7.2-r1.xd3 454545397 SHA256 fcfaa9998ddda817a14434b425775b77c73ae86821667fe647a56f8ef521de7f SHA512 89cd052ea6b71cdcc426479e658b285ccd95a7b78126fc15d76ce8b09c45a24837d9c9d165648f56ec53fed95d34575a7b93e48a24fe83d8fe67e97be9028a81 WHIRLPOOL 07317658d890fa43ece5da3614e22e254ad2a75e4c9852ac0cef2728b5926de2588f582bf24e6cfcb7a3cec5b82ba461972a3b13579cdcac0410ebd333901783
 DIST x86-debug-libreoffice-kde-java-5.2.7.2.xd3 454545143 SHA256 7400e795c6a8c38884c33807004abe2bba780f482d48a459054490acbe5942c7 SHA512 4f963c6aae5f0c4f3607285395f6f322f73be35cb3e7b171410bbcdeb46e53970b876076c7a0aad640b5bd83646cce6e14e7673aa95fd1448f62141e0a686ccf WHIRLPOOL b3ce625c30f7b76a21c1f37d19c047787bd51c4768ccf321cf1532cf525364e10c3abb57485f106054e1e05c5f873a66a535e942f82d8785f284ef486840df16
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.2.7.2-r1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.2.7.2-r1.ebuild
new file mode 100644
index 000000000000..1665a9827b14
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.2.7.2-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [ -n "${patchname}" ]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index e4dcc946ad57..84cd1c651c6e 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,12 +1,24 @@
+DIST amd64-bin-libreoffice-5.2.7.2-r1.tar.xz 74001496 SHA256 65dd7e60d790c0d094faccec43e5686a464ce2b378b24b04a88b02b2f7b8b13d SHA512 49f1086b9b617a0f4b52e6405e92ee64d7ae1556f046a855544d8f1e3ca42c62c0b9f24de5241841b3a6ee8a1003194a25b51e9c802f7b3de0a4ea9120c4a6cd WHIRLPOOL 7877350af51a560a7376ba75be2ecd23a03ab4b45d4ac6166e5d59eed9916deb06cc8f33267aa2cd8de52d0e6a69db237a09fb1a2798bfffae6d5180df86a62b
 DIST amd64-bin-libreoffice-5.2.7.2.tar.xz 74008020 SHA256 ea3f998142dc8c72012d80701773b2ccb41057586364b946766d031e7d44d00d SHA512 ee1fb0eaff8b7c5ea2311d6b1adae6cfe7ca5e43db66bb65326acc778792c7de1ab82cc67fc20662d48739e92655481b23e7b51011819a4927ce0118f6c7c4df WHIRLPOOL 5c07e7344fee20e2c696f5d11b6c02c58a034dbdbfa089272afb79839ef46290bb4aa1e29b51232e315d40260c44693ce883199e6034a8e6cfe3513824682837
+DIST amd64-bin-libreoffice-gnome-5.2.7.2-r1.xd3 15383510 SHA256 4e19080462c146712b2984f559ce2023d2b3b4f972f653b65090796b8eff6b39 SHA512 633da1350049275d0bbd1aac5ceba28f07d8ef5b11a250a014cb1cc48d7ad8167b0c07d0c536a14973e4215d4f2765e3aca2c5109e08161c3dd964f1ffdf6bec WHIRLPOOL 9a569de92eec269271b752203653f24f2eef5fd45ed96fef907fc6ed4aaaaef20db04fed57cf6d653375aab628fd7bae917c04924f7a872fb78f80ba42bddca8
 DIST amd64-bin-libreoffice-gnome-5.2.7.2.xd3 15383875 SHA256 9ddee3834cef610ce54d0b60280e16b5457223c96eccc58f4177be328f2aa1fa SHA512 d2c274440e45b3ad96d329b39aa5aec2b282aa38f9e7e6f5c7a648073fbafb8c48463647f5f7ab92fe80bd8fb45046c4dfc059bd4d63b9910430bb989efdbd75 WHIRLPOOL 6aaa1818ac852f2c77ae1f0107b23616cc9f477ec0de5f79990dc63c43138a0fce11290db804cf590827417dd26cf3711523f38b5b3586d093cb178feea1885e
+DIST amd64-bin-libreoffice-gnome-java-5.2.7.2-r1.xd3 24391729 SHA256 da7e5f79ea8bfff90ee6ceb2b79da0a0124a29777e012ebf2bd3349abf0edf91 SHA512 f153c41b4f6de78399978177722127fd5a1dee22186c8632d6762d9a9ed55c79ba613afe08b240c48bd012df1dd42cd43fcc6b4a399092a020ef632667e10745 WHIRLPOOL fc2b43027cf663d94a041f4a545b06945d1d99f0e4aa2b37a106f0258d07fc52030c4c70561e8b2d6d4fb86c77198dfbe7a60337d4a0995aea92441e33d5cb7d
 DIST amd64-bin-libreoffice-gnome-java-5.2.7.2.xd3 24392555 SHA256 5cca2c63392bcf479caf1a244af79bf2b81a4ba8248d8101df1c8af55be8e749 SHA512 deb591c242e5d175824d3cdee896e95d5f82424be4e1108b224e09b950126a0e25ad6f87be82622482fe63638304ad058bb42e2c5b6bd4af56cfcca945cf950e WHIRLPOOL bf9760d0cbcd0763cd159f0f04dbddcffdddbe270f33a4186a8c0e020a0ea0ae263a002a74cd51478553e3acb0131a3f19bfb344e1cc6fbc110ee094f22785c2
+DIST amd64-bin-libreoffice-java-5.2.7.2-r1.xd3 23495434 SHA256 d1fa03b61e8524b2c4fca6c9eef99b935cdc950cd935dc93592fe6647fc87550 SHA512 4b2b70d636cfec0cbd9f3ec54bb477892a6541ca46d9fbee205c4f9aea95c51b7f2eee06f115933a96ebf786e3281535aefcfb52ffefd9a47e446ede6905a4a2 WHIRLPOOL 5c9b4c1a4a2420110ecfa854b4d467b175188960eab495cbbfc908bf74bb8bc09a1deb74af12557b358b612d994038ef8119dfc9f1dfe522031ebc8d1625c107
 DIST amd64-bin-libreoffice-java-5.2.7.2.xd3 23497383 SHA256 fbbfda1d198ebb57882df84ff3413bb78321cb4c4115fa77a61b492c9245a692 SHA512 5eb05dd5a6fc01b807e6b7efa23a78fa9a67644de202b6a055d738994118c36777a988ca32e51780e9f876d579b3f2f764ac00114242febee33ee1359e8c12b5 WHIRLPOOL 237ce03f2bb4c01fe073773eb5f85f5a2eff2591b951bcba30e47c6b317933ebe33ee48c10fca5bac86f4392e5386dbf4c0755d6a656ab5218c9d50c22521e51
+DIST amd64-bin-libreoffice-kde-5.2.7.2-r1.xd3 7844257 SHA256 7becc126a59c0096e7ff1a3b347dec76cec7abb3fded7e328128640ed47720d4 SHA512 23792b9defc514f82dcf1b3d23ebb75e4f4697ff6d9f48e4e827147aa3e92d3bf6bf5bb7e94fe3639ac4cfecf2e237e5669b11256b1cc30c3d07c31783efef0a WHIRLPOOL e5bb14b094aa5b6fc86ba7f52e5ed7d72cd6f01555d0ce687331dffb9b0610d5035895bfc70f1a81af0ccda466003408e0fd360853f8ae11d46aa169044f6856
 DIST amd64-bin-libreoffice-kde-5.2.7.2.xd3 7844820 SHA256 1dd1dc1d8e3be789ed23c3146a46eaf6a2f55dc7e59932ff5aa892fd4c026495 SHA512 43fc71e58819e62620abd327991ac0de01c2e3de38e487aa83b127aa0eea03e437bab2490fb2dfbfc43c4e72d3631b4dc8b42f4fea41551a1767b4d22ed3a144 WHIRLPOOL af47d4b0fc4fbb829f98ac5cb57ac5115ad92e67e5dbf49337f29b1d396992448ae1e0d50b89fa823dab46687f342ded6d465d8ce9c3672bde5c9928bf8f840c
+DIST amd64-bin-libreoffice-kde-java-5.2.7.2-r1.xd3 23683325 SHA256 c62088937538bd2882261c0ba5e0c16543e09978950043946bfe504d542d4fb7 SHA512 8b9971ca43069dd316b8321e8b3b45199fef2ebc08c007d2245304683d6682eb1a5a803b8536ab10f555c4bba1d24683aa1906fb92acf41a8ede4688820cf9c5 WHIRLPOOL 1a215bed96c98a9b95eb87283343332df69f82570b501605f467806c1a91c88b475b41b65872a13ccb69b35ba66dd5074f235f78870cbcd2b22374e6129799ea
 DIST amd64-bin-libreoffice-kde-java-5.2.7.2.xd3 23683089 SHA256 a428206a6890e063ab60dd42031d54cce5153f6e29b95798006b16a0efd0f08f SHA512 a7ede56c4757d4fcdc4019344c4b8859dd157e1e06486087fd04545b136d53b7809102219baf73d3d038643b7ca24edc89e3264904b0a6ec0c28a9d0c7bcabb8 WHIRLPOOL 1eff7d08eee884a15f31273bfb4351337b486dcb7a4496683a8d9ab50e2676f9306c6396f4cf4db47040e9e3a5f0db75e73f9af03fc534dbf349e28eabfa4c95
+DIST x86-bin-libreoffice-5.2.7.2-r1.tar.xz 74279800 SHA256 97866e4bc1a26e16d051525f860632d6997f3c8523dc40ed11375f2cfe3485f1 SHA512 985cb9d2afdcb8e974b3e15aa0534c4faf015a0439d2e157c8e09927c5139d8d8cde3266b6de99c97122e43c01d82db6428310f2833f86444936e2898499aef7 WHIRLPOOL 1bb440ef61e3d98b0ef6c9f600f3f06c5a98ef1f352e2d77b7774a8328f1102fdc0767f079f71e2118890de17e9471103c6bda6a3892b493e48d15e6edb79766
 DIST x86-bin-libreoffice-5.2.7.2.tar.xz 74278384 SHA256 c78957f87ba89fd646fcb7974a709f60094dc253c5824c32598987216bb152af SHA512 9ab468714826f8be3c6a8a8dd9f90cec8a9a88bc60430792dc4921637903d3bae07828bbc01df282480ea3012299fc31e3ca3c50dd20adf77cd54bd6ae6f3277 WHIRLPOOL 51b9073ef0c22fab137c68a89eff265de995b8486c5402390ab74f7c2b3cd659ca67c3320c1ca77fc0966733142c4ef7af891af631fcf5ae4ec876b1d2d6f4f0
+DIST x86-bin-libreoffice-gnome-5.2.7.2-r1.xd3 15516282 SHA256 b11d4ee6524cf2774fa04ce4896d50964b1a16ce14abe89d088b34461a4ff912 SHA512 2755549cd3d387e86590f249f37916e52ba3b99c5e1d7f81fba168ac4a70f4645d1134fc4fd848a8bb0b3a2ac997941192089938e86c727f06f797ac7d1e34f6 WHIRLPOOL 9a6298d6c7ea1be3ee27cb2999b812a315dfefb834c5ea1bd2358982ed0911eb59f1dc607467f8b06ec93fd73821df9b44d2bb514b24a3b21eeec1a004445ff8
 DIST x86-bin-libreoffice-gnome-5.2.7.2.xd3 15520438 SHA256 54cd92b8936b0dee84efaa952bd9634a74ca74dc0f9697e30ef5ddd9959b573d SHA512 988f36b1efdf466598d2a1545bf8f03dbc3d37947649804c54b8a8031e1ed579fab6afba2954133e05c76a0a2093d9f1f30e36f2d27e5461290d70b9de01ee61 WHIRLPOOL c6fffa59b8fcc44710cad1d4e89715332fbd8788d1db51bbf4b88641c60069115fd03ba898639c97530fcb23aa38dbfce41e854403e94ea1a580920c27fa2d15
+DIST x86-bin-libreoffice-gnome-java-5.2.7.2-r1.xd3 22133672 SHA256 84f619067fdae2ae6972c2a17ccab018d82eaadf62e505b53120f0693f04694c SHA512 3b19b0935b609241bb7b6a827aef9a1cec5c2fcc2443a54d1b33a70dafb110f975ccaf3ee9f2a26b9dc7f86d728c028e3b83d539240dae1909246be5c8e89a87 WHIRLPOOL 6ae42688e303b176f33244c0fa1d9d0b7f18d194db8721812d888f8bb74090851da0e5344e9a317088d48621a356420c1142580924a449ecc44a75862290e500
 DIST x86-bin-libreoffice-gnome-java-5.2.7.2.xd3 22136298 SHA256 669c5bc5225d02c4a878c818cf819041952d9f4264a5826a363c46c834cf05d7 SHA512 44f2fdc8b781b62c6c1c7afd35c11f46698d1271090e6542d20c69ba8e54e220b9586344c5eec4fca0b2ee6e8623d79000e5c9b95d95913ee17f5980057be22c WHIRLPOOL 3e89193fcb00beeb92f709e2cbc1b1b82c36b7b69d209173d024190327eebda840cfbfefb71bedfee3f8ae0dc8d4995622d22168fda7b2ccf430e46a9ccf376f
+DIST x86-bin-libreoffice-java-5.2.7.2-r1.xd3 21832419 SHA256 40ac64242f731c9c02575cb159ee780e43cfd5317fe92e38141442a47133c652 SHA512 31875260c096374004bf27ab01862eeebc7a08c111cfaba3c7f4553c8d33dbf0780b4f9ea3c88e97a7de868f870c44588895cefb028955eb7749b0f07dff02c8 WHIRLPOOL c24b1479083849658eefc70a54e9e884799a386abb87a3727f35a05aadb404933709a53dc0f223bee628eccd7c5009629db9f17a4601b6a54193832773301b6d
 DIST x86-bin-libreoffice-java-5.2.7.2.xd3 21833970 SHA256 963d52886c78f8148dd48a8bc65fecb5bb61d6f812d79e26287b1b617b64251e SHA512 45ac43b1f331d07f5e266b6de144aa466b08c4539c91943477813f2b0ee8b1951fb5e99765cb49abebd750e379d077d667958c87f9bdefe1ca0e8b507efc1dd8 WHIRLPOOL dfd9858891b4de81e4741fc90adae253a9fdd8a029e14183d7a545bab102a4d35ce38ba9485147c8aa7897338f8b541cb0bc0b2be7e85ca215ce5151cf74fdfb
+DIST x86-bin-libreoffice-kde-5.2.7.2-r1.xd3 5112408 SHA256 1b2764fadd7a7aad6be2b6177c73e8678172561e0f1f800119665b832c7aa568 SHA512 36051a7a918d29607d851ecf7b3f016fa6cbe53563673797e2985aab3a4b45ac37e5a1e2db51bf992617ff416bc086fa137f30a83e71296832fe9d3d912d4201 WHIRLPOOL 15f56c6b02bde10f5d965c68a513e40e7e81716cda0088328b59f91c1b575f9af81a31d30bdc06adcd30e495ee9522bec49b0c3d6596824b1fb88cd1e897ddff
 DIST x86-bin-libreoffice-kde-5.2.7.2.xd3 5113579 SHA256 9056a38d9f136f68a9e21d496581a343fbbbdde20bb8de46b8d34afa926ca2e4 SHA512 4610c58851bc605ebba223e8956a86e7317119db3077eb9caaebc20db2e3c5da6b498289a77aa7406c2655b3a0ca252f16b3ce25eccbb716e89a4f8f4ea2b3b4 WHIRLPOOL fdd7dcacd520eab3f18070a56c55209979832567030a8f89b428233c52a8450bff0af8007e5e04d4df99b9497bac02a9dd356068c26ce763ed973e5183fa88f3
+DIST x86-bin-libreoffice-kde-java-5.2.7.2-r1.xd3 21898456 SHA256 bb8a4840e77428490620ce531c539fd88612795ffcec56e6a96274d0e3affa15 SHA512 e2e42b19127ecd1c9efdfcce3afffb99e42b307e437d283ca720ee5d0186cdbf0bc80806ff9d17c661e9acf5f7b4f6963ff1bfd66bad08abe8cfe87765d4605a WHIRLPOOL 1f90c03ce7011d7f2190b890250a2bafa95178c1d19a57e521f7e4d439919c899d8ee0c183e05b8a70e1dfc45ae8a33115efd1fb0d19570a437d586283f846e5
 DIST x86-bin-libreoffice-kde-java-5.2.7.2.xd3 21900376 SHA256 49001c8f6aef7049b0856750cd41ece0bc77f86a1ee8483fb0700af7d4199c24 SHA512 9b78114fb61cc7a70d006bf3914366c44ef2398a29d55f3ebcbf10c8b6935441077637f40d04bd9bb59ecdc84c5e687f3f4dd6cab54ef71994fffdc86374b464 WHIRLPOOL 517cfc41eddeb3f3ca5fb4d8b7df58ab34a6019815f74a5c2f2b7eb3754d2a6095aaefe74731e1ba661db526eb0d73c23dec5f7bd426db322172434ca17efe25
diff --git a/app-office/libreoffice-bin/libreoffice-bin-5.2.7.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-5.2.7.2-r1.ebuild
new file mode 100644
index 000000000000..fc83e204e497
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-5.2.7.2-r1.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+CMAKE_REQUIRED="never"
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+inherit kde4-base java-pkg-opt-2 python-single-r1 pax-utils prefix versionator
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+	app-text/hunspell:0/1.6
+	=app-text/libexttextcat-3.4*
+	=app-text/libmwaw-0.3*
+	dev-libs/boost:0/1.62.0
+	dev-libs/icu:0/58.2
+	>=media-gfx/graphite2-1.2.0
+	media-libs/glew:0/1.13
+	media-libs/harfbuzz:0/0.9.18[icu]
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-5.4.0-r3
+	>=sys-libs/glibc-2.23
+	virtual/jpeg:62
+	kde? ( >=kde-frameworks/kdelibs-4.14.32:4 >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtgui-4.8.7:4 )
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+	${BIN_COMMON_DEPEND}
+	${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-text/hunspell
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libodfgen-0.1.0
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	dev-lang/perl
+	>=dev-libs/boost-1.55:=
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	=dev-libs/liborcus-0.11*
+	dev-libs/librevenge
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.0d:0
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/glew-1.10:=
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	net-libs/neon
+	net-misc/curl
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	x11-libs/cairo[X,-xlib-xcb(-)]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/glu
+	virtual/opengl
+	net-print/cups
+	dev-libs/dbus-glib
+	gnome? (
+		dev-libs/glib:2
+		gnome-extra/evolution-data-server
+	)
+	gnome? ( gnome-base/dconf )
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.24:2
+	gnome? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		>=x11-libs/gtk+-3.8:3
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	media-fonts/libertine
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	kde? ( $(add_kdeapps_dep kioclient) )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-${PV}*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_pretend() {
+	[[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
+		&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
+}
+
+pkg_setup() {
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [ -n "${patchname}" ]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/50-${PN} "${T}"
+	eprefixify "${T}"/50-${PN}
+	default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+
+	use java || \
+		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
index 93c73208b024..a5a60b0ee04b 100644
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
 	S="${WORKDIR}/${P}/repoman"
@@ -30,24 +30,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if [[ -n "${EPREFIX}" ]] ; then
-		einfo "Prefixing shebangs ..."
-
-		local file
-		while read -r -d $'\0' file; do
-			local shebang=$(head -n1 "${file}")
-
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
 python_test() {
 	esetup.py test
 }
diff --git a/app-vim/colorv/colorv-3.0.2-r1.ebuild b/app-vim/colorv/colorv-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..05ba503efb19
--- /dev/null
+++ b/app-vim/colorv/colorv-3.0.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# TODO: supposedly supports python3... but that conflicts with pygtk
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: a color tool for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		( app-editors/gvim[python,${PYTHON_USEDEP}] dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	)"
+
+src_prepare() {
+	eapply_user
+
+	# fix shebangs in Python files (note: one of them is python3...)
+	sed -i -e "1s:python[23]:${EPYTHON}:" autoload/colorv/*.py || die 
+	# use python colorpicker instead of C-based picker
+	rm autoload/colorv/{colorpicker.c,Makefile} || die
+}
diff --git a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
index 44e5e9b68b3c..af1907546c70 100644
--- a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
+++ b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
@@ -4,8 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=(python2_7 python3_4 python3_5 python3_6)
-
-inherit python-r1 vim-plugin
+inherit python-single-r1 vim-plugin
 
 DESCRIPTION="vim plugin: Support EditorConfig files "
 HOMEPAGE="http://editorconfig.org/"
diff --git a/app-vim/gundo/Manifest b/app-vim/gundo/Manifest
index f3a89cab99dd..f31332c3969a 100644
--- a/app-vim/gundo/Manifest
+++ b/app-vim/gundo/Manifest
@@ -1 +1,2 @@
 DIST gundo-2.6.1.tar.gz 153125 SHA256 6cacba104238169af6e9e2863cf500922a59cb6cb49885b36381a7f5d108be77 SHA512 c8b9b20ff8ef24bd94b0adc18b2cf912cbd0a07c5a70df11be39fbe69d81306027b73d9a60c9127c658c913602a819774c7b1202a8db704677da59cb9916532b WHIRLPOOL a29477209922ec6e0602f26cab96dac4c76d4f0fa4cd86df3f8f01af8d3022a57eced609423dbda73f82e01718cdd6e7bf8b2bc8c5ef2cbe465edf5401ed2152
+DIST gundo-2.6.2.tar.bz2 144107 SHA256 d03d9d96b4f65cee184438679a5d686bc0cc628b292ace02d29132af146b0982 SHA512 e03450a1bfb0a7f5013c1493f1b25b963c2bbb37fc8fa24c1b85237bd12847c3edd7b9465caae7bdadf8923dbdcdb24930b160d7824f835417bf30725fa910b4 WHIRLPOOL 3bdb7555e37374efcf684c163b937ac71f98d8c73b5f8c3f05f540dd372c937d62e94676b3b260d422277ec5d75a91aae522a88cfc88bb76d83e92309558ad19
diff --git a/app-vim/gundo/gundo-2.6.1.ebuild b/app-vim/gundo/gundo-2.6.1.ebuild
index 5079a861249b..86515acdeb8d 100644
--- a/app-vim/gundo/gundo-2.6.1.ebuild
+++ b/app-vim/gundo/gundo-2.6.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit vim-plugin python-single-r1
 
 DESCRIPTION="vim plugin: visualize your vim undo tree"
-HOMEPAGE="https://sjl.bitbucket.org/gundo.vim/"
+HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
 SRC_URI="https://github.com/sjl/gundo.vim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	|| (
-		app-editors/vim[${PYTHON_USEDEP}]
-		app-editors/gvim[${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
 	)
 	${PYTHON_DEPS}"
 
diff --git a/app-vim/gundo/gundo-2.6.2.ebuild b/app-vim/gundo/gundo-2.6.2.ebuild
new file mode 100644
index 000000000000..28f68459e8e2
--- /dev/null
+++ b/app-vim/gundo/gundo-2.6.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit vim-plugin python-single-r1 vcs-snapshot
+
+DESCRIPTION="vim plugin: visualize your vim undo tree"
+HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
+SRC_URI="https://bitbucket.org/sjl/gundo.vim/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)
+	${PYTHON_DEPS}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	rm -r .gitignore .hg* package.sh README* site tests || die
+	default
+}
diff --git a/app-vim/pyclewn/pyclewn-2.1.ebuild b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
similarity index 87%
rename from app-vim/pyclewn/pyclewn-2.1.ebuild
rename to app-vim/pyclewn/pyclewn-2.1-r1.ebuild
index a9cb82ef91da..f21226086046 100644
--- a/app-vim/pyclewn/pyclewn-2.1.ebuild
+++ b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,8 +14,8 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 
 CDEPEND="|| (
-	>=app-editors/vim-7.3[${PYTHON_USEDEP}]
-	>=app-editors/gvim-7.3[netbeans,${PYTHON_USEDEP}]
+	>=app-editors/vim-7.3
+	>=app-editors/gvim-7.3[netbeans]
 )"
 DEPEND="${CDEPEND}
 	app-arch/vimball
diff --git a/app-vim/python-mode/python-mode-0.6.18-r4.ebuild b/app-vim/python-mode/python-mode-0.6.18-r4.ebuild
new file mode 100644
index 000000000000..e8f195d59fa6
--- /dev/null
+++ b/app-vim/python-mode/python-mode-0.6.18-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_PLUGIN_MESSAGES="filetype"
+VIM_PLUGIN_HELPFILES="PythonModeCommands"
+VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
+SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)
+	dev-python/astng[${PYTHON_USEDEP}]
+	dev-python/autopep8[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	dev-python/rope[${PYTHON_USEDEP}]
+	dev-python/ropemode[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-dont-add-cwd-to-syspath.patch
+	eapply_user
+
+	# debundling fun
+	rm -rf pylibs/pylama/{pep8.py,pyflakes} pylibs/{autopep8.py}
+	#rm -rf pylibs/{rope,ropemode}  #475686
+	sed -e 's/from .pep8/from pep8/g' \
+		-e 's/from .pyflakes/from pyflakes/g' \
+		-i pylibs/pylama/utils.py || die
+	# there's still pylint left, I failed to debundle it :/
+
+	mv pylint.ini "${T}" || die
+	sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
+		-i autoload/pymode.vim || die # use custom path
+}
+
+src_install() {
+	vim-plugin_src_install
+	insinto usr/share/${PN}
+	doins "${T}"/pylint.ini
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+	einfo "If you use custom pylintrc make sure you append the contents of"
+	einfo " ${EPREFIX}/usr/share/${PN}/pylint.ini"
+	einfo "to it. Otherwise PyLint command will not work properly."
+}
diff --git a/app-vim/splice/splice-1.1.0.ebuild b/app-vim/splice/splice-1.1.0.ebuild
index 236c096c3a2f..f74cf9af1d36 100644
--- a/app-vim/splice/splice-1.1.0.ebuild
+++ b/app-vim/splice/splice-1.1.0.ebuild
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		app-editors/vim[python]
-		app-editors/gvim[python]
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
 	)"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/vim-latex/vim-latex-1.8.23.20141116.ebuild b/app-vim/vim-latex/vim-latex-1.8.23.20141116.ebuild
index e78f5dd54dfc..cd63293ec9fd 100644
--- a/app-vim/vim-latex/vim-latex-1.8.23.20141116.ebuild
+++ b/app-vim/vim-latex/vim-latex-1.8.23.20141116.ebuild
@@ -15,14 +15,14 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="vim"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="html python"
+IUSE="html"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		app-editors/vim[python?]
-		app-editors/gvim[python?]
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
 	)
 	virtual/latex-base
 	!app-vim/vimtex"
diff --git a/app-vim/vimpress/vimpress-3.2.0.ebuild b/app-vim/vimpress/vimpress-3.2.0.ebuild
index 61234276f05a..800fe671ea65 100644
--- a/app-vim/vimpress/vimpress-3.2.0.ebuild
+++ b/app-vim/vimpress/vimpress-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ IUSE=""
 
 RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}
-	dev-python/markdown"
+	dev-python/markdown[${PYTHON_USEDEP}]"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/voom/voom-5.1-r1.ebuild b/app-vim/voom/voom-5.1-r1.ebuild
new file mode 100644
index 000000000000..b09489346009
--- /dev/null
+++ b/app-vim/voom/voom-5.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: emulates a two-pane text outliner"
+HOMEPAGE="https://vim-voom.github.com/ http://www.vim.org/scripts/script.php?script_id=2657"
+
+LICENSE="CC0-1.0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ada/xmlada/files/xmlada-2016-gentoo.patch b/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
index def06255cf5a..7c28a02289f8 100644
--- a/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
+++ b/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
@@ -5,25 +5,15 @@
  
  static:
 -	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr
-+	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
++	${GPRBUILD} -p -v -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
  
  shared relocatable:
 -	${GPRBUILD} -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr
-+	${GPRBUILD} -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
++	${GPRBUILD} -p -v -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
  
  static-pic:
 -	${GPRBUILD} -p -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr
-+	${GPRBUILD} -p -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
++	${GPRBUILD} -p -v -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
  
  # Rebuild the tests (and not the XML/Ada code itself)
  test: force
---- xmlada-gpl-2016-src/shared.gpr.in.old	2017-03-26 21:48:46.613541125 +0200
-+++ xmlada-gpl-2016-src/shared.gpr.in	2017-03-26 21:49:32.713754025 +0200
-@@ -76,6 +76,7 @@
-          when "profile" =>
-             for Switches ("Ada") use warnings & ("-g", "-pg");
-       end case;
-+      for Driver ("Ada") use External ("ADA", "gcc");
-    end compiler;
- 
-    package binder is
diff --git a/dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
similarity index 98%
rename from dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild
rename to dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
index d28f77e1050d..0ffc66ca5917 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
@@ -162,8 +162,8 @@ src_install() {
 	insopts -m0660 -o firebird -g firebird
 	doins help/help.fdb
 
-	into /usr/$(get_libdir)/${PN}/intl
-	dolib.so intl/libfbintl.so
+	exeinto /usr/$(get_libdir)/${PN}/intl
+	doexe intl/libfbintl.so
 	dosym libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl.so
 
 	insinto /usr/$(get_libdir)/${PN}/intl
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 94025dc46bc5..1d3b557c13c5 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
@@ -39,7 +39,7 @@ CDEPEND="${PYTHON_DEPS}
 		>=dev-libs/libxml2-2.6.2:2
 		dev-libs/libzip
 		>=virtual/mysql-5.1
-		dev-libs/libpcre
+		dev-libs/libpcre[cxx]
 		>=sci-libs/gdal-1.11.1-r1[-mdb]
 		virtual/opengl
 		>=dev-lang/lua-5.1:0[deprecated]
@@ -75,7 +75,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
 		"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \
 		"${FILESDIR}/${PN}-6.3.3-mysql_options4.patch" \
-		"${FILESDIR}/${PN}-6.3.4-cxx11.patch"
+		"${FILESDIR}/${PN}-6.3.4-cxx11.patch" \
+		"${FILESDIR}/${PN}-6.3.4-gtk.patch"
 
 	sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \
 		modules/db.mysql.sqlparser/CMakeLists.txt
diff --git a/dev-db/pgbadger/Manifest b/dev-db/pgbadger/Manifest
index e2740dc99d08..b61a2144e9e4 100644
--- a/dev-db/pgbadger/Manifest
+++ b/dev-db/pgbadger/Manifest
@@ -1 +1 @@
-DIST v9.1.tar.gz 742409 SHA256 2fd7166d74692cc7d87f00b37cc5c7c1c6eddf156372376d382a40f67d694011 SHA512 e3841516dd56ea0aeae397c8264302881df3b07a86063f7813f593ba817a4f3417559b88e2b9e23fec811d3dfd716589f56092be106960e88d1800a94d3d83c3 WHIRLPOOL 0a29eabf49c9d7f6ea9e5b7d2fd8b2a53dc63dbcfe582d123a528481836f802f6985f48013b5396d9785d06c5ad67c7bd5d4000663f45d3bf5515451b07e1b4c
+DIST pgbadger-9.1.tar.gz 742409 SHA256 2fd7166d74692cc7d87f00b37cc5c7c1c6eddf156372376d382a40f67d694011 SHA512 e3841516dd56ea0aeae397c8264302881df3b07a86063f7813f593ba817a4f3417559b88e2b9e23fec811d3dfd716589f56092be106960e88d1800a94d3d83c3 WHIRLPOOL 0a29eabf49c9d7f6ea9e5b7d2fd8b2a53dc63dbcfe582d123a528481836f802f6985f48013b5396d9785d06c5ad67c7bd5d4000663f45d3bf5515451b07e1b4c
diff --git a/dev-db/pgbadger/pgbadger-9.1.ebuild b/dev-db/pgbadger/pgbadger-9.1-r1.ebuild
similarity index 81%
rename from dev-db/pgbadger/pgbadger-9.1.ebuild
rename to dev-db/pgbadger/pgbadger-9.1-r1.ebuild
index 46d5f819b516..9e674e7b549b 100644
--- a/dev-db/pgbadger/pgbadger-9.1.ebuild
+++ b/dev-db/pgbadger/pgbadger-9.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit perl-module
 
 DESCRIPTION="pgBadger is a PostgreSQL log analyzer."
 HOMEPAGE="http://dalibo.github.io/pgbadger/"
-SRC_URI="https://github.com/dalibo/${PN}/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/dalibo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-erlang/epam/Manifest b/dev-erlang/epam/Manifest
new file mode 100644
index 000000000000..cd1317386b21
--- /dev/null
+++ b/dev-erlang/epam/Manifest
@@ -0,0 +1,2 @@
+DIST epam-1.0.0.tar.gz 44008 SHA256 0febab627700f9570bfafd1a93499a5f43de74d85c7a5bdfda8067c6b75f8f4f SHA512 c0b1fbdc1e910f24b2f39ea34cf6fd5859f3ab0cf762a16cf9ef71b1e49129c8238001151dd9031046049967f31fd2cb3d0c06a7d8bdd46e49f19862c143f374 WHIRLPOOL 9037a749657ea55024a355f2f6f96b906118175be6a68ef8cc0d78a379da1181b01114d739c2d5fc8cee61775d710ac84903a8f5e59ce82bdd9b7bbb5fd405c0
+DIST epam-1.0.2.tar.gz 43720 SHA256 96906817cde9e9a048d6a42e4eae82c5e1c9206c34746e83a71c7f636058d0d5 SHA512 a3fdb379d8c25e56e51dcf1e683d289e9f3d19a537b1a55ca4c09185eb5731fe073a5bf0dd1449f09f8ee5b7d868b0e63f04473c1f3d1b97722dcd9832e4e030 WHIRLPOOL 9e26577ffd5128ad28844f06991182b4a98964d4d5cdeafd7ddb67950e8fb75dc6803531de6d615eee04ba40b40696c0a61be20634c3ab35d99ca0342b497fcd
diff --git a/dev-erlang/epam/epam-1.0.0-r1.ebuild b/dev-erlang/epam/epam-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..58d8b83046af
--- /dev/null
+++ b/dev-erlang/epam/epam-1.0.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+REBAR_APP_SRC=src/p1_pam.app.src
+
+inherit rebar user
+
+DESCRIPTION="epam for ejabberd to help with PAM authentication support"
+HOMEPAGE="https://github.com/processone/epam"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+pkg_setup() {
+	enewgroup "${PN}"
+}
+
+src_install() {
+	rebar_src_install
+
+	local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
+	fowners root:"${PN}" "${epam_path}"
+	fperms 4750 "${epam_path}"
+}
diff --git a/dev-erlang/p1_pam/p1_pam-1.0.0.ebuild b/dev-erlang/epam/epam-1.0.0.ebuild
similarity index 76%
rename from dev-erlang/p1_pam/p1_pam-1.0.0.ebuild
rename to dev-erlang/epam/epam-1.0.0.ebuild
index e2f14d112446..eacf6aecb144 100644
--- a/dev-erlang/p1_pam/p1_pam-1.0.0.ebuild
+++ b/dev-erlang/epam/epam-1.0.0.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=6
 
-inherit rebar
+REBAR_APP_SRC=src/p1_pam.app.src
 
-MY_PN="epam"
-MY_P="${MY_PN}-${PV}"
+inherit rebar
 
 DESCRIPTION="epam for ejabberd to help with PAM authentication support"
 HOMEPAGE="https://github.com/processone/epam"
-SRC_URI="https://github.com/processone/${MY_PN}/archive/${PV}.tar.gz
+SRC_URI="https://github.com/processone/epam/archive/${PV}.tar.gz
 	-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -22,5 +21,3 @@ DEPEND=">=dev-lang/erlang-17.1
 RDEPEND="${DEPEND}"
 
 DOCS=( README.md )
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-erlang/epam/epam-1.0.2.ebuild b/dev-erlang/epam/epam-1.0.2.ebuild
new file mode 100644
index 000000000000..ae214ce36f1a
--- /dev/null
+++ b/dev-erlang/epam/epam-1.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar user
+
+DESCRIPTION="epam for ejabberd to help with PAM authentication support"
+HOMEPAGE="https://github.com/processone/epam"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+pkg_setup() {
+	enewgroup "${PN}"
+}
+
+src_install() {
+	rebar_src_install
+
+	local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
+	fowners root:"${PN}" "${epam_path}"
+	fperms 4750 "${epam_path}"
+}
diff --git a/dev-erlang/p1_pam/metadata.xml b/dev-erlang/epam/metadata.xml
similarity index 100%
rename from dev-erlang/p1_pam/metadata.xml
rename to dev-erlang/epam/metadata.xml
diff --git a/dev-erlang/jiffy/Manifest b/dev-erlang/jiffy/Manifest
index 074f6709c289..de773ccc3865 100644
--- a/dev-erlang/jiffy/Manifest
+++ b/dev-erlang/jiffy/Manifest
@@ -1,3 +1,4 @@
+DIST jiffy-0.14.11.tar.gz 1878494 SHA256 c555726f592b79894c253ca1dc3c3aec6a5697271d29364d57f8175f387b86f3 SHA512 0530958c04ecd3c479b432d15aa5c8c86ce9e39a828bf4e48eaa096a2a9b9c593b9cf07836346bf82e27ffcbaa6e923bc298e856701460e44c9c62a7c888028e WHIRLPOOL 287efef1e6e0403844f3f38c8b20823fc2cce4006f7cf9e961f1fc767bcd16169014323b2d9b815364eeee3c69781c5c4b565d9a2cfb23be26151d3f530ae034
 DIST jiffy-0.14.7.tar.gz 1856522 SHA256 633e2c19aae9cbd94a4a1bb80f369de4c03ee40bd4744a06a3c6305a4e050461 SHA512 b790b47857a063070da1c06a1c4b94af6085cbe8c70ecf079d8ae36c58844e7055a399f843a78ee92bf4e90320b9c6e53753f109eaa99008df793436fa8d4df1 WHIRLPOOL ea96b7b496b7eae9af5a8a53ea5156fe8fb9dfe4e82cf4af8f9951ce2b0ec53971b0700e98433dbd0beceddf3d048441c06fa2bb612b72012df84d882327d78a
 DIST jiffy-0.14.8.tar.gz 1856737 SHA256 7d1054c475c82c626de3ad57201a7fc51da38667c8a7502149eb751edc6b601d SHA512 c91f39ba877daf845ac80d611fee88310e1e3368c36da722c22af841285dcc0b7fd7712b0107dcb1a60155ac58dd7cc0faa4e4295e4aa9c33d79292c5b2cf045 WHIRLPOOL 19ca8167c3fbbb67cf0e23606577162750f156eb64a64345a0a5fb7e816e8bfcf29e1653927d70a8613c3e06179332fdac528ec7f2617b78d1cfb6e8556486bd
 DIST jiffy-0.14.9.tar.gz 1878413 SHA256 5312475932dcbc0dd804f354ebd6a2f56fb8e7a6bbe08cace96dc5e6632575be SHA512 2c8e7b2ea95c69cb0c6a7d02e341591e6807d0d81577050bf6f884dc7af7335e909f01cf7017ea27fae922d9a50ca4709fe0603b5de282b58d71afe4e06f7813 WHIRLPOOL 3ce8bdf9a48387e2618bba7b7d9f6a64421821a806de0f4c2f29f38c1d89f26df9b62b7e0d91473efd5efa169a0653cdec2c59a5e567bc7b1a6d916803f9fde0
diff --git a/dev-erlang/jiffy/jiffy-0.14.11.ebuild b/dev-erlang/jiffy/jiffy-0.14.11.ebuild
new file mode 100644
index 000000000000..a7da3d1b9333
--- /dev/null
+++ b/dev-erlang/jiffy/jiffy-0.14.11.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="JSON NIFs for Erlang"
+HOMEPAGE="https://github.com/davisp/jiffy"
+SRC_URI="https://github.com/davisp/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
diff --git a/dev-erlang/p1_pam/Manifest b/dev-erlang/p1_pam/Manifest
deleted file mode 100644
index 882d529664d4..000000000000
--- a/dev-erlang/p1_pam/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST p1_pam-1.0.0.tar.gz 44008 SHA256 0febab627700f9570bfafd1a93499a5f43de74d85c7a5bdfda8067c6b75f8f4f SHA512 c0b1fbdc1e910f24b2f39ea34cf6fd5859f3ab0cf762a16cf9ef71b1e49129c8238001151dd9031046049967f31fd2cb3d0c06a7d8bdd46e49f19862c143f374 WHIRLPOOL 9037a749657ea55024a355f2f6f96b906118175be6a68ef8cc0d78a379da1181b01114d739c2d5fc8cee61775d710ac84903a8f5e59ce82bdd9b7bbb5fd405c0
diff --git a/dev-erlang/p1_utils/Manifest b/dev-erlang/p1_utils/Manifest
index 4556fdd4b1ff..6d889d2153d4 100644
--- a/dev-erlang/p1_utils/Manifest
+++ b/dev-erlang/p1_utils/Manifest
@@ -2,3 +2,4 @@ DIST p1_utils-1.0.4.tar.gz 44082 SHA256 3fb5157f1c1cc22c992b2b6541a95cedafbc1a2a
 DIST p1_utils-1.0.5.tar.gz 44167 SHA256 ef1009ea2fd3ffbe46747dd911e2b790621991b07ebbbe66d81893f9f5f8f7ee SHA512 40d030e00eb5d9623035200c0a3650d2e0bc34c2cee3e46f8084c04643649fcaf33d265395d5d7414357e7e052a7be8929d3720e2c7a13a20a1379426fb5a5f2 WHIRLPOOL 628d057f635d4ca30d952c460861fba2f781a9dcee7bb5ce62e60c29668159a051d5a973751f72f66e5c8726d3ff80cfd339125650d3dc8b4a5d7f83f8ae23f8
 DIST p1_utils-1.0.6.tar.gz 46271 SHA256 95814a11fcfb76bca0b9bac7100286000b6cb5ca067febd68a7bdbaa452f8ea9 SHA512 8944e8317358701a4bd5f266b32a8d07ac80e144c768a5118d67dea21321f01bdcc2bd13a8175e306313c8a117ebd8876fdce8fb2b52bc098341cd72ce041c29 WHIRLPOOL 0110c5e60d8656b4553c4d3016df3b7d33a489b270bea3a8e7dcf7d05e76247e524c45ed74308b07f851ca4e67aec9bebf0087f1d273b8354f279ea2d44be3a7
 DIST p1_utils-1.0.7.tar.gz 46312 SHA256 242261beb7450c84458003f9a13f6b8866cf09d9c0ea267e41aa569f6c094954 SHA512 1a60ef061d543e688f22bbccafdd7d0aa749c23646546a55702eee5f8d6c8fa80f0c3b3a0b1054ea0b00bd76eb094473554fafd8d48f4785975e73e9c7dd4fee WHIRLPOOL b52afd06ec7f2ecca4b6b31d0c298863bec415be46d6c520963cc330b61589c72145c4fda966171e802767ce3741efa3588304609559fdddfcc32fd568f45fe3
+DIST p1_utils-1.0.8.tar.gz 53349 SHA256 9b43e025b923221cfe6a6efc76790d97b1c233e3e2db37fc804294d847bcfaa3 SHA512 675439bf8872bc79a603032683eb322636b4c8687ac18d4bde2cd526bd86539c342024ef8aed5717083d9638f69f409bfd2f255d49267f528f67c42d7ad1e43f WHIRLPOOL 4e44463b04da267c5d736481e05a014af67c4ce0bc4ae9204010ac17b7e17e17c018b4b3b2009e894f6de0f65b2e6a3e5fc2922027bd5d3b75a3bee9b3db590d
diff --git a/dev-erlang/p1_utils/p1_utils-1.0.8.ebuild b/dev-erlang/p1_utils/p1_utils-1.0.8.ebuild
new file mode 100644
index 000000000000..02a060c06384
--- /dev/null
+++ b/dev-erlang/p1_utils/p1_utils-1.0.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang utility modules from ProcessOne"
+HOMEPAGE="https://github.com/processone/p1_utils"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-haskell/annotated-wl-pprint/Manifest b/dev-haskell/annotated-wl-pprint/Manifest
new file mode 100644
index 000000000000..30108e23223a
--- /dev/null
+++ b/dev-haskell/annotated-wl-pprint/Manifest
@@ -0,0 +1 @@
+DIST annotated-wl-pprint-0.7.0.tar.gz 10338 SHA256 0c262d7fe13a9a50216438ec882c13e25f31236b886a5692e3c35b85cd773d18 SHA512 1e7ea93a63c500ebb23458202c62ed37eee7f462bbc4c390822de37fd0f411983eed49fed4c69ffb32705519f9aa956131d14ad930f21b48b28c5de5d4095f0a WHIRLPOOL 0a4ac97264a4954b85f58e4b180ade3af1421e7294caa2f2df16234e3f547d8a6cc2ad33cdc14c588eb04dc9bfe78c2d5057dd2d69866b678a52b400cdd41ece
diff --git a/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild b/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild
new file mode 100644
index 000000000000..9fcad81af4f1
--- /dev/null
+++ b/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The Wadler/Leijen Pretty Printer, with annotation support"
+HOMEPAGE="https://github.com/david-christiansen/annotated-wl-pprint"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.10.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/annotated-wl-pprint/metadata.xml b/dev-haskell/annotated-wl-pprint/metadata.xml
new file mode 100644
index 000000000000..5a30faac9d8f
--- /dev/null
+++ b/dev-haskell/annotated-wl-pprint/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This is a modified version of wl-pprint, which was based on Wadler's
+		paper "A Prettier  Printer".  See the haddocks for full info.  This
+		version allows the library user to annotate the text with semantic
+		information, which can later be rendered in a variety of ways.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/attoparsec/Manifest b/dev-haskell/attoparsec/Manifest
index afe7d8aa741a..0da543288845 100644
--- a/dev-haskell/attoparsec/Manifest
+++ b/dev-haskell/attoparsec/Manifest
@@ -3,3 +3,4 @@ DIST attoparsec-0.11.2.1.tar.gz 36439 SHA256 3ce8f56c0231ddc19e326285acfaca3c144
 DIST attoparsec-0.12.1.5.tar.gz 64844 SHA256 388bf78177d4b8b870db7fb291d103691ccf171d97d2944f09cc62d01516348c SHA512 e861b93bfcdeb284c95e7c96d2a41754e2ad061f169842523bd8680b60743f0d6d300e13237d17b776f60b338152b4fa10679aeb95d1cf0c9d073e093952e9e4 WHIRLPOOL ea6488c08134eebcc3ab86433047a0920bd8fb31e189f864526cd7828265d3edbb682e75ff4235efd6ff9d54c0e4386dda9cca600898a0018648ebfcd17cf45f
 DIST attoparsec-0.13.0.1.tar.gz 66039 SHA256 ce880acb45142eafd872e01d9af57d8dbb95c9f2b9a27f01ca9912ba4e9ef932 SHA512 596a1bda128c116b9e56decf0f5850b01f58c4b0bb81454155a1ee7b4c6b7143476cb9d66f02fba10e6fa5d5fb7a47dead6265dd3d98baeea4d8fa4a9958289c WHIRLPOOL 7b54f3015be2d77b1dcfcb2dd7053de3a2b2a5e13b18c5b61d0a17c6e5dd74261dd1aa3fcf0fdf17df6bcbf92c6c66bc0c1c3b7b04843bda3ae0371ba00dbff1
 DIST attoparsec-0.13.0.2.tar.gz 67669 SHA256 69f7f381f644ba4a6f348bbff9b2b4280b7b602e8e25e59eadb6e30ad5f2ec6a SHA512 3b9453e5e4baca58182c8463b4ff988eb66b3984e93e7f38ea4378d3a6265ed7044cbb896aaa3c797f6389e953f73e8c6994024db1cb7aec1e165f007c010754 WHIRLPOOL 6d3b5cbd2297607b8e3526bda500c06cdcea887a28b808b70a8f38e2b4d7d6a434cb9aaf821b1571c1c56e4be7c4d27cf90d1af67401b370471da83b0baabe91
+DIST attoparsec-0.13.1.0.tar.gz 159512 SHA256 52dc74d4955e457ce4f76f5c9d6dba05c1d07e2cd2a542d6251c6dbc66ce3f64 SHA512 bb66cab56208975b252a418a43eecbe85f3f2f3d16ff53accecade02885bc45828eb5dc5b79565d8d3f2ed955ac0400f9733658eed516aef8bb41b829c747d9e WHIRLPOOL b86c99ae74002f0f7d2baf1515fb741ed9e82bbf363a1b09ebb74fdfc921c13387af94f20f1cfcbacb643f8efadfe2c262536338c148cc3c44b3b7389c3bb6af
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild
new file mode 100644
index 000000000000..0170701c6b19
--- /dev/null
+++ b/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+#hackport: flags: -developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast combinator parsing for bytestrings and text"
+HOMEPAGE="https://github.com/bos/attoparsec"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/text-1.1.1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/quickcheck-2.7
+		dev-haskell/quickcheck-unicode
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-quickcheck-0.8
+		dev-haskell/vector )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer
+}
diff --git a/dev-haskell/base-prelude/Manifest b/dev-haskell/base-prelude/Manifest
new file mode 100644
index 000000000000..a4c021668833
--- /dev/null
+++ b/dev-haskell/base-prelude/Manifest
@@ -0,0 +1 @@
+DIST base-prelude-1.0.1.1.tar.gz 4038 SHA256 dccf0a9a3b45f950bac92b6d87997c0a2a4304e40027204b12d018698b7a31b5 SHA512 6bcb0794488d9b0805f6385257d6d04ef8cbadd2445534e688a66ac18863be4af2878be968c9733fd58a60dc8c7531f6a7cedd193b46342feb43a3f1f023b757 WHIRLPOOL 5bfa9233c6e984b1d64687d61a62da7c60ee7bcbdd44561e44b05ad6c5d8e4d9190d6d1dc44f8b5cb44d0efbbd056b8a9752615e64cced50c0e9a05206e09e1b
diff --git a/dev-haskell/base-prelude/base-prelude-1.0.1.1.ebuild b/dev-haskell/base-prelude/base-prelude-1.0.1.1.ebuild
new file mode 100644
index 000000000000..e31dd3a6ed52
--- /dev/null
+++ b/dev-haskell/base-prelude/base-prelude-1.0.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The most complete prelude formed solely from the \"base\" package"
+HOMEPAGE="https://github.com/nikita-volkov/base-prelude"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
diff --git a/dev-haskell/base-prelude/metadata.xml b/dev-haskell/base-prelude/metadata.xml
new file mode 100644
index 000000000000..ca9a5160de97
--- /dev/null
+++ b/dev-haskell/base-prelude/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A library which aims to reexport all the non-conflicting and
+		most general definitions from the \&quot;base\&quot; package.
+		This includes APIs for applicatives, arrows, monoids, foldables, traversables,
+		exceptions, generics, ST, MVars and STM.
+		
+		This package will never have any dependencies other than \&quot;base\&quot;.
+		
+		/Versioning policy/
+		
+		The versioning policy of this package deviates from PVP in the sense
+		that its exports in part are transitively determined by the version of \&quot;base\&quot;.
+		Therefore it&#39;s recommended for the users of \&quot;base-prelude\&quot; to specify
+		the bounds of \&quot;base\&quot; as well.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/binary-orphans/Manifest b/dev-haskell/binary-orphans/Manifest
new file mode 100644
index 000000000000..9a64406050c7
--- /dev/null
+++ b/dev-haskell/binary-orphans/Manifest
@@ -0,0 +1 @@
+DIST binary-orphans-0.1.6.0.tar.gz 5320 SHA256 e0e1dc7e5f00feb225efde400988d5e0e199cc910446f05a40fecba7d55684a5 SHA512 646410b79d92a20ef7b6d6583fca38da672e7fe072d2d5a7a9d50bacd1fb3da20efd9ab42e74029279dcd5a2c4b80218b860ae8e45bef348a692b23bcc8ea351 WHIRLPOOL 35b7f84e08f5fd643082764a096ccd7945d9ef28287d58b975f11b3191851442af2eceb109531249a31ee3e39266c59901370eb9e81e5786636cabd69dcc1910
diff --git a/dev-haskell/binary-orphans/binary-orphans-0.1.6.0-r1.ebuild b/dev-haskell/binary-orphans/binary-orphans-0.1.6.0-r1.ebuild
new file mode 100644
index 000000000000..d47e578a5ab3
--- /dev/null
+++ b/dev-haskell/binary-orphans/binary-orphans-0.1.6.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Orphan instances for binary"
+HOMEPAGE="https://github.com/phadej/binary-orphans#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
+	>=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.2.1:=[profile?]
+	>=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-haskell/scientific-0.3.3.8:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.16.2.2:=[profile?]
+	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.8.6:=[profile?]
+	>=dev-haskell/text-1.2.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/text-binary-0.1.0:=[profile?] <dev-haskell/text-binary-0.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/vector-binary-instances-0.2.1.0:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?]
+	>=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.6.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9.3
+		>=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.3.13
+		>=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-0.12
+		>=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.9 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'semigroups               >=0.16.2.2  && <0.18.3' 'semigroups               >=0.16.2.2'
+}
diff --git a/dev-haskell/binary-orphans/metadata.xml b/dev-haskell/binary-orphans/metadata.xml
new file mode 100644
index 000000000000..3b512c102ba0
--- /dev/null
+++ b/dev-haskell/binary-orphans/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		`binary-orphans` defines orphan instances for types in some popular packages.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/binary-tagged/Manifest b/dev-haskell/binary-tagged/Manifest
new file mode 100644
index 000000000000..d3bae397c44f
--- /dev/null
+++ b/dev-haskell/binary-tagged/Manifest
@@ -0,0 +1 @@
+DIST binary-tagged-0.1.4.2.tar.gz 9318 SHA256 311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784 SHA512 381ac0833c13c9b50174d2c5d3695e4af9955631dbaa20719556084ce013973ea37993cb86ac4880f41044fbf178dabe6f100cc53c2d982037a2ca9826878706 WHIRLPOOL 94cff52e6b0601ee18f4dc7a7316cfbfb2d65e366857b85b3c39bb46c01d543eadeaf4f2252a7acc5dffa32b181c4ad8f667e26d0f671fa697c30d0df53c6774
diff --git a/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild b/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild
new file mode 100644
index 000000000000..f85e9a698e53
--- /dev/null
+++ b/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Tagged binary serialisation"
+HOMEPAGE="https://github.com/phadej/binary-tagged#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/generics-sop-0.1:=[profile?]
+	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/bifunctors
+		>=dev-haskell/binary-orphans-0.1.1
+		dev-haskell/quickcheck-instances
+		dev-haskell/tasty
+		dev-haskell/tasty-quickcheck )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'generics-sop             >=0.1  && <0.3' 'generics-sop             >=0.1'
+}
diff --git a/dev-haskell/binary-tagged/metadata.xml b/dev-haskell/binary-tagged/metadata.xml
new file mode 100644
index 000000000000..56b4888b6898
--- /dev/null
+++ b/dev-haskell/binary-tagged/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Check &lt;https://github.com/phadej/binary-tagged#readme README on Github&gt;
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/bitarray/Manifest b/dev-haskell/bitarray/Manifest
new file mode 100644
index 000000000000..a75a14ecaa13
--- /dev/null
+++ b/dev-haskell/bitarray/Manifest
@@ -0,0 +1 @@
+DIST bitarray-0.0.1.1.tar.gz 3701 SHA256 b27f6f1065053a0e8e24fbf9382b7060af9962d8d150b631c682c0c58469d802 SHA512 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602 WHIRLPOOL 18357b0aee98e40fc1245266e6d1a5a1fbb941d4c014649e95a539881ce8eb700ed326e6ad8a488bb8579b550c4d4eed4c5035b22ebd21da0f18fcdfd6a94ec1
diff --git a/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild b/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild
new file mode 100644
index 000000000000..f321b1e47159
--- /dev/null
+++ b/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Mutable and immutable bit arrays"
+HOMEPAGE="http://code.haskell.org/~bkomuves/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
diff --git a/sys-firmware/amdgpu-ucode/metadata.xml b/dev-haskell/bitarray/metadata.xml
similarity index 51%
rename from sys-firmware/amdgpu-ucode/metadata.xml
rename to dev-haskell/bitarray/metadata.xml
index c99005d73f27..799ae0c2c099 100644
--- a/sys-firmware/amdgpu-ucode/metadata.xml
+++ b/dev-haskell/bitarray/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="legacy">Install firmware for older chipsets which are optionally supported by AMDGPU</flag>
-	</use>
+	<longdescription>
+		Mutable and immutable bit arrays.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/bytedump/Manifest b/dev-haskell/bytedump/Manifest
new file mode 100644
index 000000000000..291ff953269f
--- /dev/null
+++ b/dev-haskell/bytedump/Manifest
@@ -0,0 +1 @@
+DIST bytedump-1.0.tar.gz 3812 SHA256 ae17b5040f0423eec792505f14d1d3e53f5ff81ddf83524f1c5dc7a16c0dc0dd SHA512 3bea638bc926fe8dc34d5ac20b5609a8b169562f266ccbaf73a9d95caf49ee368d5c516a0f52937bf6c48bbb585c8ad2819264e4109a57cebed0f836126705fe WHIRLPOOL 6abecf3c86497b75bf2e4476d686585c923e2c73eeca17bb5c44f1d8e20647945a16767f30997b792ac8f6ca21119390f34394d6ee25f32d3be67eef206a51fd
diff --git a/dev-haskell/bytedump/bytedump-1.0.ebuild b/dev-haskell/bytedump/bytedump-1.0.ebuild
new file mode 100644
index 000000000000..7d9aaaec020d
--- /dev/null
+++ b/dev-haskell/bytedump/bytedump-1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Flexible byte dump helpers for human readers"
+HOMEPAGE="https://github.com/vincenthz/hs-bytedump"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable)
+}
diff --git a/dev-haskell/bytedump/metadata.xml b/dev-haskell/bytedump/metadata.xml
new file mode 100644
index 000000000000..218ff830841b
--- /dev/null
+++ b/dev-haskell/bytedump/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A set of helpers to dump bytes with lots of different output formats
+		easy to read for humans eyes.
+	</longdescription>
+	<use>
+		<flag name="executable">build executable file</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-haskell/cereal-vector/Manifest b/dev-haskell/cereal-vector/Manifest
new file mode 100644
index 000000000000..d6a955a604f9
--- /dev/null
+++ b/dev-haskell/cereal-vector/Manifest
@@ -0,0 +1 @@
+DIST cereal-vector-0.2.0.1.tar.gz 3337 SHA256 ff0685a6c39e7aae32f8b4165e2ae06f284c867298ad4f7b776c1c1b2859f933 SHA512 8e54e349b61e7e8f56e1f2029afd03e5b6677afaf79756771efdeb1b01364befa5a170b5caea445dae7342d71cc51f8fd3bf4300b0707252535e2e4d31213f00 WHIRLPOOL 938078d219ac562ef27ccd2de78afad8a16ec55f54883e7d3ea3aac1a366ed1dd82e6b015b8c6ee5434476a2a14b2efed4bd9fd5aae5095e689a38367d838ec4
diff --git a/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild b/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild
new file mode 100644
index 000000000000..37187b1128a4
--- /dev/null
+++ b/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Serialize instances for Data.Vector types"
+HOMEPAGE="https://github.com/acfoltzer/cereal-vector"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/cereal-vector/metadata.xml b/dev-haskell/cereal-vector/metadata.xml
new file mode 100644
index 000000000000..62b7f047cd62
--- /dev/null
+++ b/dev-haskell/cereal-vector/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Serialize instances for Data.Vector types.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/cryptohash/Manifest b/dev-haskell/cryptohash/Manifest
index 6a7c05838e87..aad214380314 100644
--- a/dev-haskell/cryptohash/Manifest
+++ b/dev-haskell/cryptohash/Manifest
@@ -1,4 +1,5 @@
 DIST cryptohash-0.10.0.tar.gz 63901 SHA256 58fd9af060cf2b74f8e22f5e0d0d3fc81ddf717a08dcaa2785cc04d75be8fb6b SHA512 14a58c7d35feea846fc14821e532bd26046844a5d34274a46fcfd9cbc5100d414f980c95b64ef7ed5431993fb558962d6f7e262adc7297a54987dfa32cc4da2a WHIRLPOOL 7e1dd2d0f3709c4dd71360a44b462d37137a476c0cdba60bb85f9c7c99bcdb9bef3a53f2ea4d7f7bc56ae2bb455b0fbec954ada0bccb3e77686dbf8029f0781d
 DIST cryptohash-0.11.1.tar.gz 64985 SHA256 be76351650517042e390887069af3dc047ed5621e1e2c96fa8a04444675c8773 SHA512 eb2da3e2c8a523354b81200b7ab3f36d29690d5f3311008ac24a5abaefe288551b67d7637b662f5a2b2b46bc5ef548ff6eae4f59ed9f1231ab9d8b0e6d039551 WHIRLPOOL 405e10f66f257bdfe5af153010ec9f7e8549dcd07f65919199e037a9a3b9b02c562762add7f8a9c1ca338d99205cd6a8c661196de6205ab020296d2f790cd190
 DIST cryptohash-0.11.6.tar.gz 65798 SHA256 da382334857a88f3e94ce0fb83f425f0a0787b0644100913c61f6e94bb62df37 SHA512 a6d3bd33104eb3b71d836323b330636cdce84165daa7e3b908296980468828c624a96db58cf9f953581986e090e53b78b10e15e361d354a00c9e9b49843a6956 WHIRLPOOL 4d5fd2e21f200880f30d21dc5b253e6a08e841478a2da29b0bc54c62bf5256a0f4c01c6addc60d75a2d04d9345d2e0efecf055c6e74298f52a9edc817583530d
+DIST cryptohash-0.11.9.tar.gz 25762 SHA256 c28f847fc1fcd65b6eea2e74a100300af940919f04bb21d391f6a773968f22fb SHA512 d0eb07f59ae893df1a92a4dc45a98142e507ba3da25057ae4acf781b1b6200a2fb68dd2a19f1ba5f9395217bc81e7be1311a479dc3dcb4ec5338518a2f5239af WHIRLPOOL 20825aaed7bd3312a5856ba0cf5f8a12815098f0e5380c13a443100fd03de47dfbe603a50e548125d2b3b53e5c8731ebed08fa3b83b403afa950b8b2182d7b14
 DIST cryptohash-0.9.1.tar.gz 64991 SHA256 e0276e96dc06062b91ade9aa25009571c598136f4203a83513332425db209298 SHA512 773a16c1e16f8d2b48f4c107d22f14d439a15ffe9e92e43886538ee15e9349fdf53d1e15d20f888eaeac4fcaa07eb907b92de6f436b6655925a617f5139ac298 WHIRLPOOL 5e499e584e817630131f00870df4b0956a16287e71683b26c736a26e1fa89825e500a5239b2b0fdf7cbbef40e6b49e85f24bbe770418a91c8174706d4c078cf4
diff --git a/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild b/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
new file mode 100644
index 000000000000..eced9c7e4297
--- /dev/null
+++ b/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="collection of crypto hashes, fast, pure and practical"
+HOMEPAGE="https://github.com/vincenthz/hs-cryptohash"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/byteable:=[profile?]
+	>=dev-haskell/cryptonite-0.13:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		>=dev-haskell/quickcheck-2
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/filelock/Manifest b/dev-haskell/filelock/Manifest
new file mode 100644
index 000000000000..b6adb0ae1559
--- /dev/null
+++ b/dev-haskell/filelock/Manifest
@@ -0,0 +1 @@
+DIST filelock-0.1.0.1.tar.gz 5884 SHA256 ad8c63f27fec6396ac83981a67d5a799b6b614c119a35ebdf2d82b379795d763 SHA512 73cc119bcca61b040692738aefcc779debef8815182a9f74e9e0700d9b1e5de0e12812f573f9daa8a127d99269f69e3cfc572cd5cd104d1fddb04ec8d4bf0c97 WHIRLPOOL 8b561fba28c20676323aed11ee5348b633f3a06a1585535d652ef04ea7f7687111042c4eee2838ad4c0847adda83f14e448e282a660d7497c582e500e407790c
diff --git a/dev-haskell/filelock/filelock-0.1.0.1.ebuild b/dev-haskell/filelock/filelock-0.1.0.1.ebuild
new file mode 100644
index 000000000000..8b500a36e9b4
--- /dev/null
+++ b/dev-haskell/filelock/filelock-0.1.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Portable interface to file locking (flock / LockFileEx)"
+HOMEPAGE="https://github.com/takano-akio/filelock"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.14.0
+"
diff --git a/dev-haskell/filelock/metadata.xml b/dev-haskell/filelock/metadata.xml
new file mode 100644
index 000000000000..8bf42d916cfe
--- /dev/null
+++ b/dev-haskell/filelock/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 type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package provides an interface to Windows and Unix
+		file locking functionalities.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/getopt-generics/Manifest b/dev-haskell/getopt-generics/Manifest
new file mode 100644
index 000000000000..97a994db9073
--- /dev/null
+++ b/dev-haskell/getopt-generics/Manifest
@@ -0,0 +1 @@
+DIST getopt-generics-0.13.0.1.tar.gz 27772 SHA256 6902d7e366dea566f533be6b40ce219b010f1e9fcbc089285da3d4ecca524e83 SHA512 df27c67bd92047b5213404220389200cf72c79d20a761c390120d13a82fb126aa38ef5afbb826ae2be0fe65941f4fe5be42bb49301fabd6343e8b0c8a7f3e707 WHIRLPOOL 809a4d23feac8d38a1eb62d67a346319c715f886936019ac5e7c56689122e18ff07b3b15d5cf1354382a4c7a8f47722a51541b2bb52f89f427b1789034322913
diff --git a/dev-haskell/getopt-generics/getopt-generics-0.13.0.1.ebuild b/dev-haskell/getopt-generics/getopt-generics-0.13.0.1.ebuild
new file mode 100644
index 000000000000..58d292fcfb33
--- /dev/null
+++ b/dev-haskell/getopt-generics/getopt-generics-0.13.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Create command line interfaces with ease"
+HOMEPAGE="https://github.com/soenkehahn/getopt-generics#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-compat-0.8:=[profile?]
+	dev-haskell/base-orphans:=[profile?]
+	>=dev-haskell/generics-sop-0.1:=[profile?] <dev-haskell/generics-sop-0.4:=[profile?]
+	dev-haskell/tagged:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hspec-2.1.8
+		dev-haskell/quickcheck
+		dev-haskell/safe
+		dev-haskell/silently )
+"
diff --git a/dev-haskell/getopt-generics/metadata.xml b/dev-haskell/getopt-generics/metadata.xml
new file mode 100644
index 000000000000..3198e24c64f7
--- /dev/null
+++ b/dev-haskell/getopt-generics/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Create command line interfaces with ease
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hit/Manifest b/dev-haskell/hit/Manifest
new file mode 100644
index 000000000000..be9a68e6116f
--- /dev/null
+++ b/dev-haskell/hit/Manifest
@@ -0,0 +1 @@
+DIST hit-0.6.3.tar.gz 38690 SHA256 db86b3712029a4e40d1306dd6cc9ca2c9f4c77fe65a2b74106f1cbd2de26e471 SHA512 82ccfeb77a439caa1792f1ae29535636764be9e6e94f75973f37a86db6627a492e57da835954384ef8468799de9f0897e20905f65dad256fe3547a4248d5fffc WHIRLPOOL e90e0d842666b027be5c3996a233e66385c9cb62d694a8dd923ca20cfadeedabc892dc25c5a6367310cf9d3892e731563234fe49330e48cd1a46346095388c0c
diff --git a/dev-haskell/hit/hit-0.6.3.ebuild b/dev-haskell/hit/hit-0.6.3.ebuild
new file mode 100644
index 000000000000..466101757343
--- /dev/null
+++ b/dev-haskell/hit/hit-0.6.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Git operations in haskell"
+HOMEPAGE="https://github.com/vincenthz/hit"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug executable"
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?]
+	dev-haskell/byteable:=[profile?]
+	dev-haskell/cryptohash:=[profile?]
+	>=dev-haskell/hourglass-0.2:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/parsec-3:=[profile?]
+	dev-haskell/patience:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/system-fileio:=[profile?]
+	dev-haskell/system-filepath:=[profile?]
+	dev-haskell/unix-compat:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	dev-haskell/vector:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	executable? ( >=dev-haskell/hashable-1.2:=[profile?]
+			dev-haskell/hashtables:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/bytedump-1.0
+		dev-haskell/tasty
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug debug) \
+		$(cabal_flag executable executable)
+}
diff --git a/dev-haskell/hit/metadata.xml b/dev-haskell/hit/metadata.xml
new file mode 100644
index 000000000000..3f0d2b779d97
--- /dev/null
+++ b/dev-haskell/hit/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+	    <email>haskell@gentoo.org</email>
+	    <name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		
+		An haskell implementation of git storage operations, allowing users
+		to manipulate git repositories (read and write).
+		
+		This implementation is fully interoperable with the main C implementation.
+		
+		This is stricly only manipulating the git store (what's inside the .git directory),
+		and doesn't do anything with the index or your working directory files.
+		
+	</longdescription>
+	<use>
+	    <flag name="executable">Build the executable</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-haskell/hpack/Manifest b/dev-haskell/hpack/Manifest
new file mode 100644
index 000000000000..7c0ced9a5ffe
--- /dev/null
+++ b/dev-haskell/hpack/Manifest
@@ -0,0 +1 @@
+DIST hpack-0.14.1.tar.gz 38373 SHA256 a930e8719c52f42826efab92f33252e3dfbf664296ce8075334b48e38bc51280 SHA512 5bd7b5335aef1a3d866c07937e457397c82235c99b578b6270b699895b9a5d39259eef324e6741af9a6e296bfe56587fc9888dc0fc2e4bd6fe99bbc74a7e0b04 WHIRLPOOL 5ae4e8e65009b5a576176590abd276bedd4a46a8c8adaeff7f14cc7752d17ee10b1f3c1530caab45ad7ac53ae1daf5d273717081da6edba875f1450064436ecd
diff --git a/dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch b/dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch
new file mode 100644
index 000000000000..a4b3fd1f4b6a
--- /dev/null
+++ b/dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch
@@ -0,0 +1,24 @@
+diff --git a/src/Hpack/Config.hs b/src/Hpack/Config.hs
+index cb84f71..5566b8c 100644
+--- a/src/Hpack/Config.hs
++++ b/src/Hpack/Config.hs
+@@ -101,3 +101,9 @@ githubBaseUrl = "https://github.com/"
+ 
+-genericParseJSON_ :: forall a. (Generic a, GFromJSON (Rep a), HasTypeName a) => Value -> Parser a
++#if MIN_VERSION_aeson(1,0,0)
++#    define AESON_ARITY Zero
++#else
++#    define AESON_ARITY
++#endif
++
++genericParseJSON_ :: forall a. (Generic a, GFromJSON AESON_ARITY (Rep a), HasTypeName a) => Value -> Parser a
+ genericParseJSON_ = genericParseJSON defaultOptions {fieldLabelModifier = hyphenize name}
+diff --git a/test/Hpack/ConfigSpec.hs b/test/Hpack/ConfigSpec.hs
+index 320ba9a..d13d932 100644
+--- a/test/Hpack/ConfigSpec.hs
++++ b/test/Hpack/ConfigSpec.hs
+@@ -971,3 +971,3 @@ spec = do
+             |]
+-          readPackageConfig file `shouldReturn` Left (file ++ ": Error in $.executables.foo: failed to parse field executables: The key \"main\" was not found")
++          readPackageConfig file `shouldReturn` Left (file ++ ": Error in $.executables.foo: key \"main\" not present")
+ 
diff --git a/dev-haskell/hpack/hpack-0.14.1.ebuild b/dev-haskell/hpack/hpack-0.14.1.ebuild
new file mode 100644
index 000000000000..7ae2c30ef742
--- /dev/null
+++ b/dev-haskell/hpack/hpack-0.14.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An alternative format for Haskell packages"
+HOMEPAGE="https://github.com/sol/hpack#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
+	>=dev-haskell/base-compat-0.8:=[profile?]
+	dev-haskell/glob:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/yaml:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/aeson-0.10
+		dev-haskell/aeson-qq
+		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		dev-haskell/interpolate
+		>=dev-haskell/mockery-0.3
+		dev-haskell/quickcheck
+		dev-haskell/temporary )
+"
+
+PATCHES=("${FILESDIR}"/${P}-aeson-1.patch)
diff --git a/dev-haskell/hpack/metadata.xml b/dev-haskell/hpack/metadata.xml
new file mode 100644
index 000000000000..acec350af770
--- /dev/null
+++ b/dev-haskell/hpack/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		An alternative format for Haskell packages
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hspec-smallcheck/Manifest b/dev-haskell/hspec-smallcheck/Manifest
new file mode 100644
index 000000000000..dbda51ae2c0d
--- /dev/null
+++ b/dev-haskell/hspec-smallcheck/Manifest
@@ -0,0 +1 @@
+DIST hspec-smallcheck-0.4.1.tar.gz 1861 SHA256 c5ddd014ad58679554d2726a4442a124d7a3a9fad04c928c610cdc46773fc0f5 SHA512 bdb8dc6432d085dd192af77d34ae4188e002a419025006680abc076bea1216f0481c629a1c6025382de963d1ee351913f9f3159ed92fbedd0972363f27bded27 WHIRLPOOL ac197e8681771a8fa962418467398e8b44facb9081cfc4ea94476beee8acb59e11f547c2e402754f64bd0ab87745c2ea153b655e2de8287a865d1c10f2f51230
diff --git a/dev-haskell/hspec-smallcheck/hspec-smallcheck-0.4.1.ebuild b/dev-haskell/hspec-smallcheck/hspec-smallcheck-0.4.1.ebuild
new file mode 100644
index 000000000000..c985caa6d77b
--- /dev/null
+++ b/dev-haskell/hspec-smallcheck/hspec-smallcheck-0.4.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="SmallCheck support for the Hspec testing framework"
+HOMEPAGE="http://hspec.github.io/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
+	>=dev-haskell/smallcheck-1.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hspec
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/hspec-smallcheck/metadata.xml b/dev-haskell/hspec-smallcheck/metadata.xml
new file mode 100644
index 000000000000..f9940a6d1350
--- /dev/null
+++ b/dev-haskell/hspec-smallcheck/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		SmallCheck support for the Hspec testing framework
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/interpolate/Manifest b/dev-haskell/interpolate/Manifest
new file mode 100644
index 000000000000..d2c0fcdc48dd
--- /dev/null
+++ b/dev-haskell/interpolate/Manifest
@@ -0,0 +1 @@
+DIST interpolate-0.1.0.tar.gz 4894 SHA256 2d1a6d5d19fe19d2fa4c7552ef7fd26a26ddfe13d80f458cec03afd030088c72 SHA512 5273195c77ef22919dfcb8df9e6db4a1ee186ca0d218f24e94a53236b0af20897d01273e027307a7164bf15a66ebf47afcc9ecc35f6e867c3c2a0e1572eaf435 WHIRLPOOL 3de47b79b8fe3945b4bd2919c9d29838b5cd3eecee187a2f5591d5a87a55ae4f024b7d4337595e9924b5209c0b9a888c040529e6fa0869c40ffd377bf575dcc6
diff --git a/dev-haskell/interpolate/interpolate-0.1.0.ebuild b/dev-haskell/interpolate/interpolate-0.1.0.ebuild
new file mode 100644
index 000000000000..c634e9b50195
--- /dev/null
+++ b/dev-haskell/interpolate/interpolate-0.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="String interpolation done right"
+HOMEPAGE="http://hackage.haskell.org/package/interpolate"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/haskell-src-meta:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.5
+		dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances
+		dev-haskell/text )
+"
diff --git a/dev-haskell/interpolate/metadata.xml b/dev-haskell/interpolate/metadata.xml
new file mode 100644
index 000000000000..62fee7cb97ec
--- /dev/null
+++ b/dev-haskell/interpolate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		String interpolation done right
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/lifted-async/Manifest b/dev-haskell/lifted-async/Manifest
index 2bbd4e47b527..b95b91c943a6 100644
--- a/dev-haskell/lifted-async/Manifest
+++ b/dev-haskell/lifted-async/Manifest
@@ -2,3 +2,4 @@ DIST lifted-async-0.2.0.2.tar.gz 6907 SHA256 ee512dc63f21cc212db1a85f5acc49a96b6
 DIST lifted-async-0.6.0.1.tar.gz 8871 SHA256 aeeacd800a604c6a239b3bb0219ef23397b01c7e22e016aae9d21a41f58a0b8b SHA512 afa436919bf50a343739ec9ca1e492cdac037df1e286812e77089c939303ce00a0f8681303eb41ea476df5d4013be6ef45c63c161ab0fa92b0ced4a0c4e57120 WHIRLPOOL 7ac3572cc38eb681972536f0aa98a3f061484967923b2ff64cd5bdb1ff3ce48ca34cb13a2ae75a492f5e5ef1a516cb760a7f5cedb54bad04cf9cc422adfad265
 DIST lifted-async-0.7.0.2.tar.gz 9096 SHA256 0e8a97500b5cb387c711e8dc0db27a07b61d21d610ba8aebf4cae5f92920b7ac SHA512 7dcbc10d0e5c055b3b1d3f4a2a69304b2b66413cb0ba99d1abb03f067b6f898b1aa0d9ed9deae0016fd1198717c048b8ba5b40e60ce3c1bf888c876dca15a222 WHIRLPOOL 3672afeee185e184715f61629296521c690c3452e6a82695c5a417a75b585d713cca85fc971341b9b3908e00f666306d0ebbeb17f15525e01124cc9487322e68
 DIST lifted-async-0.8.0.1.tar.gz 9453 SHA256 ef8ca870155abb93e4ce742c46606ac59ab031ed86da31c75a6179c62be5f9bf SHA512 529a8c2c88f6277f5618d89f62d99318c9ae059c650f40e6cbc61f70621f073a10fff0ce3f27936d71a0dcd222afdbfa58d0922ae45075753d74c3e7bab5bcfa WHIRLPOOL 6b74cfda16fbe9c77e8a766ddbe026a1431402d67330224069459289d78f83107eaaaa4f11292520eee0a190b034cf44c3fe3dfcec0e8abd649bffa5268a3d1b
+DIST lifted-async-0.9.1.1.tar.gz 10077 SHA256 31ac44b834723c9b9d40a319135a712802f2690d700df283d0a380fcd8d48e40 SHA512 c8e3d3e6bcfb361b5fe1bd948d21f8d2087e18b2f035557564e94fb444fae64baf0302d3938c5ca31f8a68a2fd5e7fb1389f1a318c3a2b447facee823511b5ad WHIRLPOOL 4951eae1fe6a37368d0c93237144284bf8638f8a799ff02ef5af163de85c819e1b105451f40073c897cd4f7d6ae2dc423e5be255b5f3bdf880dd25b51752baa0
diff --git a/dev-haskell/lifted-async/lifted-async-0.9.1.1-r1.ebuild b/dev-haskell/lifted-async/lifted-async-0.9.1.1-r1.ebuild
new file mode 100644
index 000000000000..01598835b9a7
--- /dev/null
+++ b/dev-haskell/lifted-async/lifted-async-0.9.1.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
+HOMEPAGE="https://github.com/maoe/lifted-async"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+monad-control-1"
+
+RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?]
+	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.10:=[profile?]
+				>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] )
+	!monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		dev-haskell/mtl
+		dev-haskell/tasty
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
+		dev-haskell/tasty-th )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag monad-control-1 monad-control-1)
+}
diff --git a/dev-haskell/lifted-base/Manifest b/dev-haskell/lifted-base/Manifest
index 745439552394..9f9367304b63 100644
--- a/dev-haskell/lifted-base/Manifest
+++ b/dev-haskell/lifted-base/Manifest
@@ -1,3 +1,4 @@
 DIST lifted-base-0.1.1.tar.gz 10640 SHA256 759300ba3eaf4e78455066c438c3f64ccffd6af5d80550bf4d0075c57f180691 SHA512 e213b8cc40e14e4ce1c85691b69fffefbc1049aaeeb5463543e6361073caf1068905e08a1f52a0b4f43c169b5a97788c0879c02f0f737614f44ac138d204bd29 WHIRLPOOL 3cf82c52ed6e7ed2688b8c53f1235032f15f1ca02c0f80a1695754fb3ccba5053bacb8e6a217fbbd632d374cd957f5ea6871385fe5d3bdc9b79f87b454122f8d
 DIST lifted-base-0.2.1.1.tar.gz 11706 SHA256 b330aff460e52c7987dba68737487d1b2b15e23f03d0c1bc6d8a3062066c5518 SHA512 b3def493a40b1d64e9fe0466e9718baf63568af7785eaca5aa47456ac01a10d2677cbe36dcc17705a47ebc9c84df01dc897ef8e1ddaefe88dcaec674353bb500 WHIRLPOOL baae7dc5973e91c538c873a4d3229220e44cd8594adaf06d6df3ad5ea2c68a9a28a4ae9290785ff35b2a9c2c6a1cdba33c80bf3fa015027aebaf9847730ff816
+DIST lifted-base-0.2.3.10.tar.gz 11779 SHA256 e677e560b176c40da2478d2f27dbeadc79630b2295ea3828603e0de4784d24fc SHA512 f4251e0322b2802c6eebf7ee2f1d7b0bc8cb89464e710373ef66868c657bcdf9a5ca9a1c0f0b1c9d397c60fa25dbfe78e925820acdd2520633877dadea9c6370 WHIRLPOOL 2f6ec0a8e338751732b6fa7b3d88e1c289fb59c5072a5b4f41e64995814dd7eb089867aa54f6c2a1925b8e44480a93f17b1cae2fc37296c57f521178aed2c6dd
 DIST lifted-base-0.2.3.6.tar.gz 11613 SHA256 57c5837d83f569bb72136ca89256e50e1ac168ee935804a8e7763e9d8322e1fb SHA512 7fee2208c9043cdeccbea87d0ad44bff82505c10f55a539220484fe09792cd61562a94c9f6fbc2c6f360dd25e8d39ed139972432dbdb748fc2e1f2d47be8a658 WHIRLPOOL fbd7185ac69d1cfde05c14826c2a73efba83b41d52002907301e3caf3fe8869a6f74f41cde3b47f6cf6684b62ff8e6c4ff82350d9be7c46219510a6254d81341
diff --git a/dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild b/dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild
new file mode 100644
index 000000000000..e0bbdc5a1c91
--- /dev/null
+++ b/dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="lifted IO operations from the base library"
+HOMEPAGE="https://github.com/basvandijk/lifted-base"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND=">=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.5
+		>=dev-haskell/monad-control-1.0.0.3 <dev-haskell/monad-control-1.1
+		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6
+		>=dev-haskell/transformers-base-0.4.4 <dev-haskell/transformers-base-0.5
+		>=dev-haskell/transformers-compat-0.3 <dev-haskell/transformers-compat-0.6 )
+"
diff --git a/dev-haskell/microlens/Manifest b/dev-haskell/microlens/Manifest
new file mode 100644
index 000000000000..def8f6720639
--- /dev/null
+++ b/dev-haskell/microlens/Manifest
@@ -0,0 +1 @@
+DIST microlens-0.4.8.0.tar.gz 24766 SHA256 aa0b12717671593f7e2cd686762fb842b22bf3e5b4559e4db8863f1d30be7af5 SHA512 472b4ef43161a21c2864d87d53e2e4138d4ee16d64cc9e96f43c2cdc11894df178189525be1c6e5c8e0db582f878d1d603696f0ace82986fcb42d888aee99ae2 WHIRLPOOL 2585e1f4a9c489ee62219e699573d39b1cf132336e207285f291bc1d4999d81eb10ba2ee74bb615638d315532784a674f60cf3c62169302f9f1379bfe4c77112
diff --git a/dev-haskell/microlens/metadata.xml b/dev-haskell/microlens/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/microlens/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 type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/microlens/microlens-0.4.8.0.ebuild b/dev-haskell/microlens/microlens-0.4.8.0.ebuild
new file mode 100644
index 000000000000..3d15c5a2fee6
--- /dev/null
+++ b/dev-haskell/microlens/microlens-0.4.8.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A tiny lens library with no dependencies"
+HOMEPAGE="https://github.com/aelve/microlens"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/neat-interpolation/Manifest b/dev-haskell/neat-interpolation/Manifest
new file mode 100644
index 000000000000..dbf183bbc220
--- /dev/null
+++ b/dev-haskell/neat-interpolation/Manifest
@@ -0,0 +1 @@
+DIST neat-interpolation-0.3.2.1.tar.gz 4339 SHA256 5530e43ca4de09b972d173e522f9dc96265f3afe0df695a25f0141be816fa014 SHA512 aaefc95b85e8546bd20848b3d4da39437b48e5e3c54829f9ae06f8f4021752812a643a638bcc10213db168d3217bd8913b2feec81d90199a14eea8c35fe62245 WHIRLPOOL 972819cc726f6d2db5a17d83d8ebc2130872105888773cb69251df5c8996a9f88800eda85c931d7ec3c4b281cecd9a40af46d95b6664de95c7baaa3632d5618d
diff --git a/dev-haskell/neat-interpolation/metadata.xml b/dev-haskell/neat-interpolation/metadata.xml
new file mode 100644
index 000000000000..d8ffb5043713
--- /dev/null
+++ b/dev-haskell/neat-interpolation/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A quasiquoter for producing Text values with support for
+		a simple interpolation of input values.
+		It removes the excessive indentation from the input and
+		accurately manages the indentation of all lines of the interpolated variables.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.1.ebuild b/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.1.ebuild
new file mode 100644
index 000000000000..e33689966ee2
--- /dev/null
+++ b/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A quasiquoter for neat and simple multiline text interpolation"
+HOMEPAGE="https://github.com/nikita-volkov/neat-interpolation"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="<dev-haskell/base-prelude-2:=[profile?]
+	>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
+	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/htf-0.11 <dev-haskell/htf-0.14 )
+"
diff --git a/dev-haskell/open-browser/Manifest b/dev-haskell/open-browser/Manifest
new file mode 100644
index 000000000000..f7c04c4dee85
--- /dev/null
+++ b/dev-haskell/open-browser/Manifest
@@ -0,0 +1 @@
+DIST open-browser-0.2.1.0.tar.gz 2629 SHA256 0bed2e63800f738e78a4803ed22902accb50ac02068b96c17ce83a267244ca66 SHA512 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1 WHIRLPOOL 0a05e08e9a9129783c138dc49f48764d80c34d4a0eb470f3df4e86c10bfa756f247ef06736bdac35eadbcb3a61d36418b36bc6753d36b482ed83f2d4b6775137
diff --git a/dev-haskell/open-browser/metadata.xml b/dev-haskell/open-browser/metadata.xml
new file mode 100644
index 000000000000..59f5d334b5e5
--- /dev/null
+++ b/dev-haskell/open-browser/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 type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Open a web browser from Haskell.
+		Currently BSD, Linux, OS X and Windows are supported.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/open-browser/open-browser-0.2.1.0-r1.ebuild b/dev-haskell/open-browser/open-browser-0.2.1.0-r1.ebuild
new file mode 100644
index 000000000000..dca61ae014c1
--- /dev/null
+++ b/dev-haskell/open-browser/open-browser-0.2.1.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Open a web browser from Haskell"
+HOMEPAGE="https://github.com/rightfold/open-browser"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'executable example' 'executable open-browser-example'
+}
diff --git a/dev-haskell/optparse-simple/Manifest b/dev-haskell/optparse-simple/Manifest
new file mode 100644
index 000000000000..c1081d4add90
--- /dev/null
+++ b/dev-haskell/optparse-simple/Manifest
@@ -0,0 +1 @@
+DIST optparse-simple-0.0.3.tar.gz 2972 SHA256 4547f0a6c1bd959b1d9c3c2a5fabee39ac9a19dffabbb2d75461a2d461df8c7e SHA512 d607482a9ef9e9d4992328fb141cf797ad72e43cbe42eab23adacd21843b8c62c98d6c8fc342b2a11019a220759854b6587a1fd07fa8268462c4cc3d40c4a1c4 WHIRLPOOL a023eab34712537b3678edc1a3c60250253ef637a5a5f65d4ddda2a078a3e7c3b410fc53133f40032467f76f410387224c449cb6c2ac71e40c975c5500e617eb
diff --git a/dev-haskell/optparse-simple/metadata.xml b/dev-haskell/optparse-simple/metadata.xml
new file mode 100644
index 000000000000..fd80ae8104d5
--- /dev/null
+++ b/dev-haskell/optparse-simple/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Simple interface to optparse-applicative
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/optparse-simple/optparse-simple-0.0.3.ebuild b/dev-haskell/optparse-simple/optparse-simple-0.0.3.ebuild
new file mode 100644
index 000000000000..0ac1d9a5a79b
--- /dev/null
+++ b/dev-haskell/optparse-simple/optparse-simple-0.0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple interface to optparse-applicative"
+HOMEPAGE="http://hackage.haskell.org/package/optparse-simple"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/either:=[profile?]
+	dev-haskell/gitrev:=[profile?]
+	dev-haskell/optparse-applicative:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/path-io/Manifest b/dev-haskell/path-io/Manifest
new file mode 100644
index 000000000000..7a2ed45c1181
--- /dev/null
+++ b/dev-haskell/path-io/Manifest
@@ -0,0 +1 @@
+DIST path-io-1.2.2.tar.gz 17818 SHA256 72255f9d014285c87dd4c537f445a5448b2b64e81c4ee4759464b4b0e401fe46 SHA512 910af5fd9345daa815235027992e6ab4af3784da7afa314644abaf8acb5bee59f3f1444449ce55e88961c86031cf4537c855e13ba2e777348d9fe4c0104fb6d1 WHIRLPOOL f6f62b8168d14f5ddaac4752557dda517e7224d76cfae0147e083403fff00453f3b95cdac060dee9e77c95b4f24d532a3bdce156f49cf38b3054931682ecd8c9
diff --git a/dev-haskell/path-io/metadata.xml b/dev-haskell/path-io/metadata.xml
new file mode 100644
index 000000000000..f7fb2720334b
--- /dev/null
+++ b/dev-haskell/path-io/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Interface to directory package for users of path.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/path-io/path-io-1.2.2.ebuild b/dev-haskell/path-io/path-io-1.2.2.ebuild
new file mode 100644
index 000000000000..54a64dff47ee
--- /dev/null
+++ b/dev-haskell/path-io/path-io-1.2.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Interface to 'directory' package for users of 'path'"
+HOMEPAGE="https://github.com/mrkkrp/path-io"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
+	>=dev-haskell/path-0.5:=[profile?] <dev-haskell/path-0.6:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
+	dev-haskell/unix-compat:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'time         >= 1.4     && < 1.7' 'time         >= 1.4'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
diff --git a/dev-haskell/path/Manifest b/dev-haskell/path/Manifest
new file mode 100644
index 000000000000..9c5467fdb337
--- /dev/null
+++ b/dev-haskell/path/Manifest
@@ -0,0 +1 @@
+DIST path-0.5.13.tar.gz 16988 SHA256 1968303e1632499890c3c760ade68e91e848cb45de552090d86e6c75b93e7d51 SHA512 bf1e4750aa025382735f0b8329daa092501f1bbcb25ca3951be653cc3193d19be4339697e966db7dbff7ea2f78b251259c9f6f4cb36402a51221b077af388284 WHIRLPOOL 16c4d6076e052aef91e3b522c596defe729772f11a5da2e773e974c691d75669006075750725616bc54387639bac84758104a5e00917bbb79e0cf6e8df7ab904
diff --git a/dev-haskell/path/metadata.xml b/dev-haskell/path/metadata.xml
new file mode 100644
index 000000000000..e42b1c1a4d04
--- /dev/null
+++ b/dev-haskell/path/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Path
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/path/path-0.5.13.ebuild b/dev-haskell/path/path-0.5.13.ebuild
new file mode 100644
index 000000000000..cafe98096f2d
--- /dev/null
+++ b/dev-haskell/path/path-0.5.13.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+#hackport: flags: -validity
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Support for well-typed paths"
+HOMEPAGE="http://hackage.haskell.org/package/path"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
+	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
+		>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-validity
+}
diff --git a/dev-haskell/pid1/Manifest b/dev-haskell/pid1/Manifest
new file mode 100644
index 000000000000..db79908ba7f7
--- /dev/null
+++ b/dev-haskell/pid1/Manifest
@@ -0,0 +1 @@
+DIST pid1-0.1.0.1.tar.gz 5677 SHA256 163b6dc85426558ad1a897675bf7f560389addf172c8e5858f817342ee7345c8 SHA512 9cf7953d35d230162307c656351f4d552c2d137b54b0cdc8f5bcb07ab6a77aadb903cd968961fbf8b25fa7b9375e149f21e67af3d57713d3dde1d8c8d9df970f WHIRLPOOL c168611f060b32d946558945a48d0471f2fd5dcea63bd1ecd2a87ffa3b005d8330b7414cabc704cb8aa9e4b49b1a0acaaa03e9abcdd4ba953e47b6bb480a202f
diff --git a/dev-haskell/pid1/metadata.xml b/dev-haskell/pid1/metadata.xml
new file mode 100644
index 000000000000..f1430f9dafe6
--- /dev/null
+++ b/dev-haskell/pid1/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Please see README.md or view Haddocks at &lt;https://www.stackage.org/package/pid1&gt;
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/pid1/pid1-0.1.0.1.ebuild b/dev-haskell/pid1/pid1-0.1.0.1.ebuild
new file mode 100644
index 000000000000..401195048351
--- /dev/null
+++ b/dev-haskell/pid1/pid1-0.1.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Do signal handling and orphan reaping for Unix PID1 init processes"
+HOMEPAGE="https://github.com/fpco/pid1#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/regex-applicative-text/Manifest b/dev-haskell/regex-applicative-text/Manifest
new file mode 100644
index 000000000000..b890be1567c4
--- /dev/null
+++ b/dev-haskell/regex-applicative-text/Manifest
@@ -0,0 +1 @@
+DIST regex-applicative-text-0.1.0.1.tar.gz 3975 SHA256 b093051f80865d257da2ded8ad1b566927b01b3d2f86d41da2ffee4a26c4e2d9 SHA512 8ee1d581498e047a7b759476ce98c43c19656b767790b0f12b8485bc212a71c7115cee5c3e5089392995bc71851025093c406bce9d8ac3c5962675ae06fa4339 WHIRLPOOL 08ac911d44b795e4e68e111b6151fe043b15609ceb1c6b5e142d26e04634ac6faeed4ef2365a85b32deb876c67401ae944e5ffe7227321bf189238168d26d841
diff --git a/dev-haskell/regex-applicative-text/metadata.xml b/dev-haskell/regex-applicative-text/metadata.xml
new file mode 100644
index 000000000000..f7c350d52710
--- /dev/null
+++ b/dev-haskell/regex-applicative-text/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Wrapped regex-applicative primitives to work with Text
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild b/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild
new file mode 100644
index 000000000000..af47c8861f1d
--- /dev/null
+++ b/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="regex-applicative on text"
+HOMEPAGE="https://github.com/phadej/regex-applicative-text#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/regex-applicative-0.3:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/resourcet/Manifest b/dev-haskell/resourcet/Manifest
index 661fdf208fc5..881ed98f66fc 100644
--- a/dev-haskell/resourcet/Manifest
+++ b/dev-haskell/resourcet/Manifest
@@ -3,3 +3,4 @@ DIST resourcet-0.4.9.tar.gz 9624 SHA256 5fd1329d934e0cf6f3f3c9c3db8c4b49064e4c77
 DIST resourcet-1.1.2.2.tar.gz 10665 SHA256 5a85bf4e5d11a8941d8f75c80ce6c5b6aa4b07342386fedfed429e26e74786c8 SHA512 10f80a7c9070c557ce30a30d132d483e5664cf72ebc0446ee2ab4280d80125a1445d87c931ca3124d8087f4972e6fde5dead73efcd90530e98cbb7744032cc90 WHIRLPOOL 5ed0eeffae48b1ac49cfbefce2b3a3284b7e4eb2cd903b7812940f36b56413a27dfeb4f3cb9329d00fb336a1d986ae8d91ed3958ca1d8b7341578616c528125a
 DIST resourcet-1.1.7.4.tar.gz 11674 SHA256 a757d3a4d17373dc48a7072c2d98574934a53eb0ac98a32642952beb751e8f85 SHA512 b61c117a12762b15be2de2676c4fdf9bf89b72ebc4875677a70f5b66358fb49ddd4753d6b1a541ae01dab41368b4e30cbd796caebdc4b8cce6ebf75c9cef08b5 WHIRLPOOL 32956d853d81aad70092700d61bcde88abfaaf7de11b135fd9bd810cb542d85a3dafc4b4b22439deb8fd78bab63e53cbf4e015cf6fb789b5e356875f8a24e989
 DIST resourcet-1.1.7.tar.gz 11627 SHA256 3b79d07199160c966c67a5300a51b7c8790dda7bed6c00e554a0062d03c9ab4d SHA512 27a348354fddfa348882217cb7a66987d843c87658c53f7d173276731e11cfc3438312028d4c35f7821db087a30227979a6d1018bc7e4ca516145c4f2a91a231 WHIRLPOOL 4f04bcea75914a5eca361c3b865be31817cae2411b81717de172add419dd4e61409bc03ea8dc7e92e85c33704a40f9677df46965833014d706c28b3b31026646
+DIST resourcet-1.1.9.tar.gz 15215 SHA256 5a1999d26b896603cab8121b77f36723dc50960291872b691ff4a9533e162ef5 SHA512 e26e627c19198c1f25e368dda67ca15d52ad41eea70a81acf8ce244b30880b476d3d33b097199d12611bf80a3521196587d669684b18c47999e7abb5c00a7ab9 WHIRLPOOL 4ab03fa87db8de7c2ef8abbeb064c91a881ee7338d7be6c67d605120468ce6018d02df58bc8af00166f33c5fe8e27314cafbc7f3e9675448e364c1afecd24259
diff --git a/dev-haskell/resourcet/resourcet-1.1.9.ebuild b/dev-haskell/resourcet/resourcet-1.1.9.ebuild
new file mode 100644
index 000000000000..bccf52351dc9
--- /dev/null
+++ b/dev-haskell/resourcet/resourcet-1.1.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Deterministic allocation and freeing of scarce resources"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?]
+	dev-haskell/mmorph:=[profile?]
+	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-1.3 )
+"
diff --git a/dev-haskell/retry/Manifest b/dev-haskell/retry/Manifest
new file mode 100644
index 000000000000..0da330013e1d
--- /dev/null
+++ b/dev-haskell/retry/Manifest
@@ -0,0 +1 @@
+DIST retry-0.7.4.2.tar.gz 9721 SHA256 521b392570b37b17ac8aaea2586a0a16a578f56b9cd0bbf69813b35f7ed2b47c SHA512 5caeb55225759eae466dc0b0a78ff2538380fda75fbd52758639c12c20e3194d2b272fb9286fbffaf70366418654f2e46088954921a9840720b590598314ba2b WHIRLPOOL 6d257f892933740b803118af4ff78555ce56d8f344201174a3bf6b52a309843204bd5c4ef9502c1d9a2d4d783d25f87443ed64adcaba5eee371e3c10ed26e60a
diff --git a/dev-haskell/retry/metadata.xml b/dev-haskell/retry/metadata.xml
new file mode 100644
index 000000000000..8df6740dd53a
--- /dev/null
+++ b/dev-haskell/retry/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package exposes combinators that can wrap arbitrary
+		monadic actions. They run the action and potentially retry
+		running it with some configurable delay for a configurable
+		number of times.
+		The purpose is to make it easier to work with IO and
+		especially network IO actions that often experience temporary
+		failure and warrant retrying of the original action. For
+		example, a database query may time out for a while, in which
+		case we should hang back for a bit and retry the query instead
+		of simply raising an exception.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/retry/retry-0.7.4.2.ebuild b/dev-haskell/retry/retry-0.7.4.2.ebuild
new file mode 100644
index 000000000000..b497f43dc689
--- /dev/null
+++ b/dev-haskell/retry/retry-0.7.4.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Retry combinators for monadic actions that may fail"
+HOMEPAGE="https://github.com/Soostone/retry"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-1.9
+		>=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.6
+		dev-haskell/mtl
+		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10
+		dev-haskell/stm )
+"
diff --git a/dev-haskell/stack/Manifest b/dev-haskell/stack/Manifest
new file mode 100644
index 000000000000..57e400d23a9d
--- /dev/null
+++ b/dev-haskell/stack/Manifest
@@ -0,0 +1 @@
+DIST stack-1.3.2.tar.gz 502764 SHA256 488b9292ea605c92f6ebf79b233e8e374d857b21053051cb44b305dad8f0d3f7 SHA512 1805268fa548ea8c120abe2498b0de75d0e6a265c1a53aab1a6da51e8c4b00bc8b5c100abb1e1e822a3a68b2f469c3c82ba9c12ad7753a20a0819f8e0bd27d12 WHIRLPOOL 4354ac08c592baa165bfe18e944ff6cf1fa1826fa8bd61ba0832d08582116fea34e453e0bec941c87a70b1c2e9d2df66e31d472197dd9ec433bf3fdcaa63798b
diff --git a/dev-haskell/stack/metadata.xml b/dev-haskell/stack/metadata.xml
new file mode 100644
index 000000000000..d702142876ff
--- /dev/null
+++ b/dev-haskell/stack/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Please see the README.md for usage information, and
+		the wiki on Github for more details.  Also, note that
+		the API for the library is not currently stable, and may
+		change significantly, even between minor releases. It is
+		currently only intended for use by the executable.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/stack/stack-1.3.2.ebuild b/dev-haskell/stack/stack-1.3.2.ebuild
new file mode 100644
index 000000000000..5026954bf78f
--- /dev/null
+++ b/dev-haskell/stack/stack-1.3.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+#hackport: flags: -disable-git-info,-hide-dependency-versions,-integration-tests,-static
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="The Haskell Tool Stack"
+HOMEPAGE="http://haskellstack.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # installs packages from network
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
+	>=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?] <dev-haskell/annotated-wl-pprint-0.8:=[profile?]
+	>=dev-haskell/ansi-terminal-0.6.2.3:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?]
+	>=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.2:=[profile?]
+	>=dev-haskell/attoparsec-0.12.1.5:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base-compat-0.6:=[profile?] <dev-haskell/base-compat-0.10:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/binary-tagged-0.1.1:=[profile?] <dev-haskell/binary-tagged-0.2:=[profile?]
+	>=dev-haskell/blaze-builder-0.4.0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
+	>=dev-haskell/cabal-1.18.1.5:=[profile?] <dev-haskell/cabal-1.25:=[profile?]
+	>=dev-haskell/clock-0.7.2:=[profile?] <dev-haskell/clock-0.8:=[profile?]
+	>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+	>=dev-haskell/conduit-extra-1.1.7.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?]
+	>=dev-haskell/cryptohash-0.11.6:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
+	>=dev-haskell/cryptohash-conduit-0.1.1:=[profile?] <dev-haskell/cryptohash-conduit-0.2:=[profile?]
+	>=dev-haskell/either-4.4.1.1:=[profile?] <dev-haskell/either-4.5:=[profile?]
+	>=dev-haskell/errors-2.1.2:=[profile?] <dev-haskell/errors-2.2:=[profile?]
+	>=dev-haskell/exceptions-0.8.0.2:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
+	>=dev-haskell/extra-1.4.10:=[profile?] <dev-haskell/extra-1.6:=[profile?]
+	>=dev-haskell/fast-logger-2.3.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
+	>=dev-haskell/file-embed-0.0.10:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
+	>=dev-haskell/filelock-0.1.0.1:=[profile?] <dev-haskell/filelock-0.2:=[profile?]
+	>=dev-haskell/fsnotify-0.2.1:=[profile?] <dev-haskell/fsnotify-0.3:=[profile?]
+	>=dev-haskell/generic-deriving-1.10.5:=[profile?] <dev-haskell/generic-deriving-1.12:=[profile?]
+	>=dev-haskell/gitrev-1.1:=[profile?] <dev-haskell/gitrev-1.3:=[profile?]
+	>=dev-haskell/hashable-1.2.3.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/hastache-0.6.1:=[profile?] <dev-haskell/hastache-0.7:=[profile?]
+	>=dev-haskell/hit-0.6.3:=[profile?] <dev-haskell/hit-0.7:=[profile?]
+	>=dev-haskell/hpack-0.14.0:=[profile?] <dev-haskell/hpack-0.16:=[profile?]
+	>=dev-haskell/http-client-0.5.3.3:=[profile?] <dev-haskell/http-client-0.6:=[profile?]
+	>=dev-haskell/http-client-tls-0.3.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-conduit-2.2.3:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?]
+	>=dev-haskell/http-types-0.8.6:=[profile?] <dev-haskell/http-types-0.10:=[profile?]
+	>=dev-haskell/lifted-async-0.9.0:=[profile?] <dev-haskell/lifted-async-0.10:=[profile?]
+	>=dev-haskell/lifted-base-0.2.3.8:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+	>=dev-haskell/microlens-0.3.0.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
+	>=dev-haskell/monad-control-1.0.1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/monad-logger-0.3.13.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
+	>=dev-haskell/monad-unlift-0.2.0:=[profile?] <dev-haskell/monad-unlift-0.3:=[profile?]
+	>=dev-haskell/mtl-2.1.3.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/open-browser-0.2.1:=[profile?] <dev-haskell/open-browser-0.3:=[profile?]
+	>=dev-haskell/optparse-applicative-0.13:=[profile?] <dev-haskell/optparse-applicative-0.14:=[profile?]
+	>=dev-haskell/optparse-simple-0.0.3:=[profile?] <dev-haskell/optparse-simple-0.1:=[profile?]
+	>=dev-haskell/path-0.5.9:=[profile?] <dev-haskell/path-0.6:=[profile?]
+	>=dev-haskell/path-io-1.1.0:=[profile?] <dev-haskell/path-io-2.0.0:=[profile?]
+	>=dev-haskell/persistent-2.1.2:=[profile?] <dev-haskell/persistent-2.7:=[profile?]
+	>=dev-haskell/persistent-template-2.1.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?]
+	>=dev-haskell/pid1-0.1:=[profile?] <dev-haskell/pid1-0.2:=[profile?]
+	>=dev-haskell/project-template-0.2:=[profile?] <dev-haskell/project-template-0.3:=[profile?]
+	>=dev-haskell/regex-applicative-text-0.1.0.1:=[profile?] <dev-haskell/regex-applicative-text-0.2:=[profile?]
+	>=dev-haskell/resourcet-1.1.4.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
+	>=dev-haskell/retry-0.6:=[profile?] <dev-haskell/retry-0.8:=[profile?]
+	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/safe-exceptions-0.1.4.0:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?]
+	>=dev-haskell/semigroups-0.5:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/split-0.2.3.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
+	>=dev-haskell/stm-2.4.4:=[profile?] <dev-haskell/stm-2.5:=[profile?]
+	>=dev-haskell/store-0.2.1.0:=[profile?] <dev-haskell/store-0.4:=[profile?]
+	>=dev-haskell/streaming-commons-0.1.10.0:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
+	>=dev-haskell/tar-0.5.0.3:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/temporary-1.2.0.3:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
+	>=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/text-binary-0.2.1.1:=[profile?] <dev-haskell/text-binary-0.3:=[profile?]
+	>=dev-haskell/text-metrics-0.1:=[profile?] <dev-haskell/text-metrics-0.3:=[profile?]
+	>=dev-haskell/tls-1.3.8:=[profile?] <dev-haskell/tls-1.4:=[profile?]
+	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-haskell/unicode-transforms-0.1:=[profile?] <dev-haskell/unicode-transforms-0.3:=[profile?]
+	>=dev-haskell/unix-compat-0.4.1.4:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-haskell/vector-binary-instances-0.2.3.2:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?]
+	>=dev-haskell/yaml-0.8.20:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3.7:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5.4.2:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	>dev-haskell/persistent-sqlite-2.5.0.1:=[profile?] <dev-haskell/persistent-sqlite-2.7:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/attoparsec-0.13.1.0 <dev-haskell/attoparsec-0.14
+		>=dev-haskell/conduit-extra-1.1.14 <dev-haskell/conduit-extra-1.2
+		>=dev-haskell/cryptohash-0.11.9 <dev-haskell/cryptohash-0.12
+		>=dev-haskell/exceptions-0.8.3 <dev-haskell/exceptions-0.9
+		>=dev-haskell/hspec-2.2 <dev-haskell/hspec-2.4
+		>=dev-haskell/monad-logger-0.3.20.1 <dev-haskell/monad-logger-0.4
+		>=dev-haskell/mono-traversable-0.10.2 <dev-haskell/mono-traversable-0.11
+		>=dev-haskell/neat-interpolation-0.3 <dev-haskell/neat-interpolation-0.4
+		>=dev-haskell/quickcheck-2.8.2 <dev-haskell/quickcheck-2.10
+		>=dev-haskell/resourcet-1.1.8.1 <dev-haskell/resourcet-1.2
+		>=dev-haskell/smallcheck-1.1.1 <dev-haskell/smallcheck-1.2
+		>=dev-haskell/temporary-1.2.0.4 <dev-haskell/temporary-1.3
+		>=dev-haskell/text-1.2.2.1 <dev-haskell/text-1.3
+		>=dev-haskell/th-reify-many-0.1.6 <dev-haskell/th-reify-many-0.2
+		>=dev-haskell/vector-0.11.0.0 <dev-haskell/vector-0.12 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'directory >=1.2.1.0 && <1.3' 'directory >=1.2.1.0'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-disable-git-info \
+		--flag=-hide-dependency-versions \
+		--flag=-integration-tests \
+		--flag=-static
+}
diff --git a/dev-haskell/store-core/Manifest b/dev-haskell/store-core/Manifest
new file mode 100644
index 000000000000..abeef7bc01db
--- /dev/null
+++ b/dev-haskell/store-core/Manifest
@@ -0,0 +1 @@
+DIST store-core-0.3.tar.gz 6952 SHA256 8793230b634a310a91db98727dfa6f34a0b7f5ded55985342066d33d98507087 SHA512 32800552f02a4b205794e238637d3c4d12d58e78fdb1b8bb51e4c9c09634c58f6fed13c108ffda1fb9059ef00dafc674c105832b2df290cb3c183d7ba76bbd05 WHIRLPOOL 6b5c4208c7a871549c21115286b8973848af3808dcdae53dac2953eeba0a70fc05085cbe08de9f63b6eeb644810eb1d2c82a28234cb5acdef4a21e42ae515489
diff --git a/dev-haskell/store-core/metadata.xml b/dev-haskell/store-core/metadata.xml
new file mode 100644
index 000000000000..46a27879f9b1
--- /dev/null
+++ b/dev-haskell/store-core/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Fast and lightweight binary serialization
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/store-core/store-core-0.3.ebuild b/dev-haskell/store-core/store-core-0.3.ebuild
new file mode 100644
index 000000000000..58d73d15803f
--- /dev/null
+++ b/dev-haskell/store-core/store-core-0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Fast and lightweight binary serialization"
+HOMEPAGE="https://github.com/fpco/store#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/fail:=[profile?]
+	>=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-1.0:=[profile?]
+	>=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-2.0:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/store/Manifest b/dev-haskell/store/Manifest
new file mode 100644
index 000000000000..b9b17a2eedc1
--- /dev/null
+++ b/dev-haskell/store/Manifest
@@ -0,0 +1 @@
+DIST store-0.3.1.tar.gz 41555 SHA256 ec1005ebaf7334f6e5166315f8406553c94cffa8e06bc1d60f372c0d46ceda90 SHA512 7e6064cbee01ce7357e5b7235d502ee9b5b323358ebd7e71b5b310830ae52595384bb143dbbbad8e28cdde2c9001f1ae9ea03b47f2dc5cf50ac18cb2c4e9d7cd WHIRLPOOL b308ea6abf2a3a8cb44bffb62ddd59012af9ba943a4043560feaf6cd37ad6521893f2572211b0b137769f55020f144589fb8aeb36799b87b224225e9208bfb49
diff --git a/dev-haskell/store/metadata.xml b/dev-haskell/store/metadata.xml
new file mode 100644
index 000000000000..61d4d499fa23
--- /dev/null
+++ b/dev-haskell/store/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Fast binary serialization
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/store/store-0.3.1.ebuild b/dev-haskell/store/store-0.3.1.ebuild
new file mode 100644
index 000000000000..fd2828763476
--- /dev/null
+++ b/dev-haskell/store/store-0.3.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+#hackport: flags: -small-bench,-comparison-bench
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast binary serialization"
+HOMEPAGE="https://github.com/fpco/store#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/async-2.0.2:=[profile?]
+	>=dev-haskell/base-orphans-0.4.3:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1.1:=[profile?]
+	>=dev-haskell/conduit-1.2.3.1:=[profile?]
+	>=dev-haskell/contravariant-1.3:=[profile?]
+	>=dev-haskell/cryptohash-0.11.6:=[profile?]
+	>=dev-haskell/free-4.11:=[profile?]
+	>=dev-haskell/hashable-1.2.3.1:=[profile?]
+	>=dev-haskell/hspec-2.1.2:=[profile?]
+	>=dev-haskell/hspec-smallcheck-0.3.0:=[profile?]
+	>=dev-haskell/lifted-base-0.2.3.3:=[profile?]
+	>=dev-haskell/monad-control-0.3.3.0:=[profile?]
+	>=dev-haskell/mono-traversable-0.7.0:=[profile?]
+	>=dev-haskell/network-2.6.0.2:=[profile?]
+	>=dev-haskell/primitive-0.6:=[profile?]
+	>=dev-haskell/resourcet-1.1.3.3:=[profile?]
+	>=dev-haskell/safe-0.3.8:=[profile?]
+	>=dev-haskell/semigroups-0.8:=[profile?]
+	>=dev-haskell/smallcheck-1.1.1:=[profile?]
+	>=dev-haskell/store-core-0.3:=[profile?] <dev-haskell/store-core-0.4:=[profile?]
+	>=dev-haskell/streaming-commons-0.1.10.0:=[profile?]
+	>=dev-haskell/syb-0.4.4:=[profile?]
+	>=dev-haskell/text-1.2.0.4:=[profile?]
+	>=dev-haskell/th-lift-0.7.1:=[profile?]
+	>=dev-haskell/th-lift-instances-0.1.4:=[profile?]
+	>=dev-haskell/th-orphans-0.12.2:=[profile?]
+	>=dev-haskell/th-reify-many-0.1.6:=[profile?]
+	>=dev-haskell/th-utilities-0.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.5.1:=[profile?]
+	>=dev-haskell/vector-0.10.12.3:=[profile?]
+	>=dev-haskell/void-0.5.11:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/cereal
+		dev-haskell/cereal-vector
+		dev-haskell/criterion
+		dev-haskell/vector-binary-instances
+		dev-haskell/weigh )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-comparison-bench \
+		--flag=-small-bench
+}
diff --git a/dev-haskell/text-binary/Manifest b/dev-haskell/text-binary/Manifest
new file mode 100644
index 000000000000..262d814fecc9
--- /dev/null
+++ b/dev-haskell/text-binary/Manifest
@@ -0,0 +1 @@
+DIST text-binary-0.2.1.1.tar.gz 1729 SHA256 b697b2bd09080643d4686705c779122129638904870df5c1d41c8fc72f08f4a1 SHA512 eea91648ddc63f2997432abd2cc3d78efa27e3745c199eeccd01114df6a67dae948a16a6f784e09ba380047101fefab802f1812b0833d3e02deb45b6292c34a1 WHIRLPOOL 7e2cf1963a0e49d3386b4cb5f29fa4734f75802e00b5862ee973545bf8478900318b60760062e6c96c9e8603fbbea8f4a38e266ea3fdd91a26d94a75402d1626
diff --git a/dev-haskell/text-binary/metadata.xml b/dev-haskell/text-binary/metadata.xml
new file mode 100644
index 000000000000..1845f50353d3
--- /dev/null
+++ b/dev-haskell/text-binary/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A compatibility layer providing Binary instances for strict
+		and lazy text types for versions older than 1.2.1 of
+		&lt;https://hackage.haskell.org/package/text&gt;.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/text-binary/text-binary-0.2.1.1.ebuild b/dev-haskell/text-binary/text-binary-0.2.1.1.ebuild
new file mode 100644
index 000000000000..9fccf239ec5d
--- /dev/null
+++ b/dev-haskell/text-binary/text-binary-0.2.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binary instances for text types"
+HOMEPAGE="https://github.com/kawu/text-binary"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/text-metrics/Manifest b/dev-haskell/text-metrics/Manifest
new file mode 100644
index 000000000000..00e13674b969
--- /dev/null
+++ b/dev-haskell/text-metrics/Manifest
@@ -0,0 +1 @@
+DIST text-metrics-0.2.0.tar.gz 8660 SHA256 082304ce14ac6182cbb93f51207d90b91d104e5d1fc1b17bbe1c9280ebffe43a SHA512 6a7a2b78fcb7efd03e32bf093b2820837f5b9997574d724fd6e67b789a8fcb166ed1396e49d925c55c278e0e72615ba99e40f630092e961871a7821e5b513d70 WHIRLPOOL b167afbca98e1f8aaaa9b1a5c991ff37617df0aa1fa0b95b04ead0a63955f2a48038f5c105ba585336e6dd3147c0d31aa7e14e38d376d545ba8e70c6cfea2225
diff --git a/dev-haskell/text-metrics/metadata.xml b/dev-haskell/text-metrics/metadata.xml
new file mode 100644
index 000000000000..a94b82566b9e
--- /dev/null
+++ b/dev-haskell/text-metrics/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Calculate various string metrics efficiently.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/text-metrics/text-metrics-0.2.0.ebuild b/dev-haskell/text-metrics/text-metrics-0.2.0.ebuild
new file mode 100644
index 000000000000..0e6d539734e3
--- /dev/null
+++ b/dev-haskell/text-metrics/text-metrics-0.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Calculate various string metrics efficiently"
+HOMEPAGE="https://github.com/mrkkrp/text-metrics"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-2:=[profile?]
+	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
+		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-3.0 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
diff --git a/dev-haskell/th-lift-instances/Manifest b/dev-haskell/th-lift-instances/Manifest
new file mode 100644
index 000000000000..321a9a985651
--- /dev/null
+++ b/dev-haskell/th-lift-instances/Manifest
@@ -0,0 +1 @@
+DIST th-lift-instances-0.1.11.tar.gz 4477 SHA256 1da46afabdc73c86f279a0557d5a8f9af1296f9f6043264ba354b1c9cc65a6b8 SHA512 e4e443637c10cd21d9b6159f29ad8eb61a65bda2b625dff48ccbf1310c9abdbb1f48ff0c7e74974b78e0517db6af2889abb3c5cfeaed202c7b3efbe1c83dbc7a WHIRLPOOL 4d73b70d03c4c9a3cc888814fdcf05f1c4ea5b9479155d666a28afa5dcdfb5aec5aa4738d8dbf4274b8d163651d3a979670b26ad78473c133ffabb470765347c
diff --git a/dev-haskell/th-lift-instances/metadata.xml b/dev-haskell/th-lift-instances/metadata.xml
new file mode 100644
index 000000000000..0d764dc95edd
--- /dev/null
+++ b/dev-haskell/th-lift-instances/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 type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Most data types in haskell platform do not have Lift instances. This package provides orphan instances
+		for containers, text, bytestring and vector.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/th-lift-instances/th-lift-instances-0.1.11.ebuild b/dev-haskell/th-lift-instances/th-lift-instances-0.1.11.ebuild
new file mode 100644
index 000000000000..5213fdf2b696
--- /dev/null
+++ b/dev-haskell/th-lift-instances/th-lift-instances-0.1.11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lift instances for template-haskell for common data types"
+HOMEPAGE="https://github.com/bennofs/th-lift-instances/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/text:=[profile?]
+	dev-haskell/th-lift:=[profile?]
+	>=dev-haskell/vector-0.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/quickcheck-2.6 )
+"
diff --git a/dev-haskell/th-lift/Manifest b/dev-haskell/th-lift/Manifest
index 5714e940533d..e5fe20c21b34 100644
--- a/dev-haskell/th-lift/Manifest
+++ b/dev-haskell/th-lift/Manifest
@@ -1,3 +1,4 @@
 DIST th-lift-0.7.2.tar.gz 10980 SHA256 755c2477d4f1c77d9da73ef5a824b34b1c382aa98833b64ad7d9255813e8824a SHA512 a560d9b7737a1b8a9ebb656edea035dd452349e4dc95af92bc152843b50960ebe498a1577a5c16eecaf6cb937fa72b67d7eff19aaa70293904adaa10e99e4f50 WHIRLPOOL 6c3fe7a74cf2b2bb8b30f806381c5c054d925376c5a6357fdab67f58109f729e6fa144a63fc998d9ea0a412a82e665f671782235c3ea1673b6374265e79947ae
 DIST th-lift-0.7.5.tar.gz 12147 SHA256 f3d483f1f85556e0be70b3c4f6570bb2828cda68a83b9d0a70f035c8c29cad8f SHA512 79d01b50d424206602c810d2cd2c810b85a098737926f343c47c818bd43b2dd09c32964b52fa6fe4acc2462be16bcb4142b386337207321352f3e6d450158589 WHIRLPOOL c6dbc032b4b05d5771c28347c9ec788b5b64ab6c5a7b631bdaf17d25dde7af677469fffe48dd0dbdaada23ce0d98c4cdcc8604e74e52a764211bf9633711d4aa
 DIST th-lift-0.7.6.tar.gz 12390 SHA256 326a2c9dac32506d5b7e5d9f3234c0e7a33a612256e4745bfb8de5a32803ecd1 SHA512 701d0064ab55414706e664ce8d8fa006329b3db6d04647204e1039ca267a5e5a2f7bbce477c4530070ccc1e2b23ac1653da24b765ea6340cafc696a077cdaf83 WHIRLPOOL 0b06a0d06f3ac4561a9caf62bc82248ef5de41df216295bc5e20672d8df2d724a31b38b99e3cb7c3fcfd86225f30cfbd00ad2c7db7a47089a2ad6bf653725546
+DIST th-lift-0.7.7.tar.gz 12399 SHA256 16c6fa6fbe972fa0d850698c147cd9a30dc0e201554d9a4ee9ade62dc807cbb5 SHA512 490d349ef2985defcf58eb49686c89ab79f8f9a3e29f3edb195440fe7995ecec6b2538767855ae0a5b9f43e5b00fe0bee167513486be99c111776ab7855d37d2 WHIRLPOOL c84e64c30ca8ebc781e78cd896fe4080acf9ee43a902711645a43555a0f14ed3f56c35a5c309fd289fcbc2d0afe5040a704c18ec349b712f6593f26bc9d5b0d1
diff --git a/dev-haskell/th-lift/th-lift-0.7.7.ebuild b/dev-haskell/th-lift/th-lift-0.7.7.ebuild
new file mode 100644
index 000000000000..2c0d9efca6a0
--- /dev/null
+++ b/dev-haskell/th-lift/th-lift-0.7.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Derive Template Haskell's Lift class for datatypes"
+HOMEPAGE="https://github.com/mboes/th-lift"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/th-orphans/Manifest b/dev-haskell/th-orphans/Manifest
index e7ba2224fa77..9aab2e7c3be2 100644
--- a/dev-haskell/th-orphans/Manifest
+++ b/dev-haskell/th-orphans/Manifest
@@ -1,2 +1,3 @@
 DIST th-orphans-0.11.1.tar.gz 5511 SHA256 be0b88c2f83fb8a373498f95044ff9f9b68480cdc74e6bb11a256516f79e2c84 SHA512 49f3467ed2a8365ccd3ab2f3a7281e04a4b42fb81b6411f0553b1770974710df6005ecd3e3e41724ac02602c47150daad51010c107564d330d7b08cf52320503 WHIRLPOOL affe9e663744a332ef15cc740e4f29a4d884a6856f0ec23c42e173678b44189691372dc96f70f462252262e614c427428c1a77e3be3a72846db07880842af16c
+DIST th-orphans-0.13.3.tar.gz 6549 SHA256 7380d5b66d0c754e383e7b16e982b5d9ddf5f45f5a33118a20023ec8af78c46d SHA512 5adc55392c2575d885365631ec90c6f26186fcb5ccc42f0e53cace064f1bf5ce389519aa78939a6390054a3ce144484de09205147fe06cbecbc0663898b0371d WHIRLPOOL e8d088c74c770943ef0f9b2ebae89df578ed4ba3c0bb28dd4b2e7698602ac547e9aba20c5a3336d48b05b9f7793efa0bdb3629e5a0a9621b478cf80cbd545847
 DIST th-orphans-0.8.2.tar.gz 4116 SHA256 de8db3117fae31e33e3125f66fbcb9cea514771da0a4c4922db6767a85a6a4a5 SHA512 d0cad737caebcf943a7289fd5ba771530553ff57d40dd3ac7dc7fb4ffe949ab04d7af660a3b84491366119ffdcf607819135bfd160c94a1f8401376d2b7b49a7 WHIRLPOOL 78e14f309ba12da10f8b93991e4ccb093cb1ca8143368b31058e7a48e342f20f25ca4a0707903a939e73abb2dc836ddacd28d446ba0417944d000caf9bd87383
diff --git a/dev-haskell/th-orphans/th-orphans-0.13.3.ebuild b/dev-haskell/th-orphans/th-orphans-0.13.3.ebuild
new file mode 100644
index 000000000000..454122d489f4
--- /dev/null
+++ b/dev-haskell/th-orphans/th-orphans-0.13.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Orphan instances for TH datatypes"
+HOMEPAGE="http://hackage.haskell.org/package/th-orphans"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/generic-deriving-1.9:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/th-lift-0.7.1:=[profile?]
+	dev-haskell/th-lift-instances:=[profile?]
+	>=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/th-utilities/Manifest b/dev-haskell/th-utilities/Manifest
new file mode 100644
index 000000000000..bec1308b9bb4
--- /dev/null
+++ b/dev-haskell/th-utilities/Manifest
@@ -0,0 +1 @@
+DIST th-utilities-0.2.0.1.tar.gz 14996 SHA256 65c64cee69c0d9bf8d0d5d4590aaea7dcf4177f97818526cbb3fac20901671d6 SHA512 30cb5c09071beb1f8e029d217fefc6e58aa6eaa8a28994990d1549091fc174195b04a10e7873b1ac5f894cb4a528bf9764256ff1ad5c969493fbf5f872f1749f WHIRLPOOL f7f515d011c1edc2b049708700a4b2f5675e8a82dd7eaf93f54457f2c2409d7b8a978aef438c271f06c0cd346f75b81c7e864b729880d26349a674a4ba967480
diff --git a/dev-haskell/th-utilities/metadata.xml b/dev-haskell/th-utilities/metadata.xml
new file mode 100644
index 000000000000..93ba8d9ecc21
--- /dev/null
+++ b/dev-haskell/th-utilities/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Collection of useful functions for use with Template Haskell
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/th-utilities/th-utilities-0.2.0.1.ebuild b/dev-haskell/th-utilities/th-utilities-0.2.0.1.ebuild
new file mode 100644
index 000000000000..26d2cbd60e01
--- /dev/null
+++ b/dev-haskell/th-utilities/th-utilities-0.2.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Collection of useful functions for use with Template Haskell"
+HOMEPAGE="https://github.com/fpco/th-utilities#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/primitive:=[profile?]
+	dev-haskell/syb:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/th-orphans:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec
+		dev-haskell/vector )
+"
diff --git a/dev-haskell/unicode-transforms/Manifest b/dev-haskell/unicode-transforms/Manifest
new file mode 100644
index 000000000000..ec7040ad5e0d
--- /dev/null
+++ b/dev-haskell/unicode-transforms/Manifest
@@ -0,0 +1 @@
+DIST unicode-transforms-0.2.1.tar.gz 714210 SHA256 1d8baa0de3c58685aa1e476961f7f3765395ba257d79258c66e86b06a87f3abc SHA512 9bdd7c6bb75ae6b71152371663e2c37a828574a782039f94059b3d68832680958749ab36df9eb4aca45a81d45ae91e791dc243b921dc24b4a8e8ad6337e6e082 WHIRLPOOL 7e4a335478becd10df73b68adb3b56042a6d57a2d9492706f40bf5322e128e3b68ad7452ecdd9ed1d59448daeecc7a1a7b95acc549853bc7b12d11799e9207bb
diff --git a/dev-haskell/unicode-transforms/metadata.xml b/dev-haskell/unicode-transforms/metadata.xml
new file mode 100644
index 000000000000..38ea7b682ea6
--- /dev/null
+++ b/dev-haskell/unicode-transforms/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Fast Unicode 8.0 normalization in Haskell (NFC, NFKC, NFD, NFKD).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/unicode-transforms/unicode-transforms-0.2.1.ebuild b/dev-haskell/unicode-transforms/unicode-transforms-0.2.1.ebuild
new file mode 100644
index 000000000000..676ee2cb0a43
--- /dev/null
+++ b/dev-haskell/unicode-transforms/unicode-transforms-0.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+#hackport: flags: -dev,-has-icu,-has-llvm
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Unicode normalization"
+HOMEPAGE="https://github.com/harendra-kumar/unicode-transforms"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/bitarray-0.0.1:=[profile?] <dev-haskell/bitarray-0.1:=[profile?]
+	>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14
+		>=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.10
+		>=dev-haskell/split-0.1 <dev-haskell/split-0.3 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev \
+		--flag=-has-icu \
+		--flag=-has-llvm
+}
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index f11970e3f71e..54af6cd3448c 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,36 +1,28 @@
-DIST icedtea-bin-core-3.3.0-amd64.tar.xz 61771188 SHA256 98c84aab8ea1ac6b8bb438aa8f45a9060ce0ad13fb9a1033f819dda7848da74c SHA512 8ff9d9d830450d92dec89485443e4d28f986b8fe0e58b841484b658d91d4d6173cdae9f49d39ba6ad1e245cffc6df57452f562bf9c44b32407d50f03d883f615 WHIRLPOOL e169e342746bbcac215a01442c82460a36adf2a22ce022bca1109ce33b2421c1db7cab040b3648de917a7e64820363bba4c6f2101851bbb0f16fc1c524035f2f
-DIST icedtea-bin-core-3.3.0-arm.tar.xz 53095408 SHA256 01fd2c41efcd72153b13b1adf752aeeca277232deff598ab2aa3f03f6f3a3a9a SHA512 0d75e222c71d5ddbdd33b89a72a0a425cddedbd8ea91ea3c41d2be525b42eae922909f209a3e6dd42ab7640ac3b4eaf7cdb2f3166ebc966df0b3408fca93edcd WHIRLPOOL 33bd54029725da70832ea4770441f15e5103acbf9257f84f30cd671f64e596fd9fba711b9cc019b7a808d6b42737d08b7c8bee3f600e28ef1fd374e859086cf5
-DIST icedtea-bin-core-3.3.0-ppc64.tar.xz 54126156 SHA256 a0f407f5e84b4a32b69e2465b38bc5a50c6a4ffc5e3a0c06ee61bf25f22bfa23 SHA512 c526423192f14441908d80f961fcb4ea79fa9c714e646d7d46d7e4582c89da038a266e0a62b0440e09c25a94a278f6f2fd93867ba54b66d65f30213bbdfd7450 WHIRLPOOL 1882b03b9586327221af2c2de68623800a5f5d59c70679f5e2f543903050030170c3b1537805946c30e383136ccdd4c9dbc6da68425322367fd22f78a9f6ef49
-DIST icedtea-bin-core-3.3.0-x86.tar.xz 61185420 SHA256 739aa08159cdf31e1016581bc74e85094e1e0a0e0129e3f23638bb751dd614fc SHA512 7e080afd159af01497f49e7a3f78399bb45d7cef2af43b266e83fae7ff6040cabff4daecd842b4aad7a6b54ef7333d51cb3eb7b546e286dd8e51ea85e999a8de WHIRLPOOL 33a5676105a2c33b48cfa89bba7f0b3de292858e11ca38aaa83983ccbe6427a2c2b521b7386fc9908653460560e43c3063033d8b3353189eace4656a4e52b1d5
 DIST icedtea-bin-core-3.4.0-amd64.tar.xz 61846296 SHA256 254e4e889061e8632cbb61b86b568e9e8c143342e3fdb02cfa96f068ec0db7a9 SHA512 56bd24ec9dfc75256201a930274713630f1fb062747f721cbe75e2de41a60497f2dd9294a9b726614ce3e260400a663a2c25fd43c31705318d646b58383ba960 WHIRLPOOL 9695ee029e0df02493ddd92d6f74818d145d9fb0426838c6312d8bca949599cd11cf29d7b05929fd366deea3adedce2cfa2d6ee6ba5d7727e7e4d23532ad66e8
 DIST icedtea-bin-core-3.4.0-arm.tar.xz 53464220 SHA256 c5a793a6b967943bf51d334db15ea8608358d308dd9c5c8ba7ea4609d6d5ef85 SHA512 5bb1986caeedbdcae26637a4bea1177fc5cf89fa026245093083d9ff6d1a378878286ef7f6e5bd9527ce6fca3a6a5e9e152f87f68ce56afa66a86f65f4d6817a WHIRLPOOL 7a08039cd6934c73db4c72fa787566880d8ed66c47bf28a76bd4913695c2526c05464cb8a15522816abbf3d3fb5f9e76373e7ae51019cd21f1005ccd53a4624f
 DIST icedtea-bin-core-3.4.0-ppc64.tar.xz 54156476 SHA256 4ab0d286746e583be1d630e1e125a1abb9c77b0933f4e3d5002bcfef8e421b17 SHA512 705cd2479622db75af6732afd79fc20cb1f20d2b402372b0e40225dfc20d9d96fa5ae85654b6dc77cbf79257064f48e39bd02d35fe1d70881d96d1c64cf3730f WHIRLPOOL 0cf0e7097d4a33d448906109fe8b27cd9bbbdf715d690cae4704a339c82831ca65ab6b8ca4efb99ee4c99c24cd78384aae953b7f2e1cc14e4652c5aebf1c44fe
 DIST icedtea-bin-core-3.4.0-x86.tar.xz 61316304 SHA256 673dd4eb192b769c3781d3f286fb7cfcd71ca61a376070d511239f6903ff2e65 SHA512 52091c3e5eb7b453169d87aeeda348c122d5c7c03ec801fde11cb6cdb6f97ae5daa4889bfb724a50feba63ab073ca5a2c341c67a812ccb2bcd0f3866c11e74a2 WHIRLPOOL 6ee9e1239eb5981bb66056256e4c3d1e49b1dd91a9eb988bbc3146cf2317c07aed15d8e1bb8929cadbb4b235cbee7f7bbe9bf45e2eb3283cff7f5598cf2f058b
+DIST icedtea-bin-core-7.2.6.10-amd64.tar.xz 53414248 SHA256 332468fbfacd89cffd6f6f7f4860bbf9a4e49446e09d4a38154cef1f018a154d SHA512 11e2d094c3f53ffce8ddd639501d0ded25b991ede87521208da66cfe60c9d43ba1d5a0bb8b7985db5555796c1beaf931cc385a4c78910c1ddfc790322a678bc2 WHIRLPOOL e6a9a4b3043c53fb07d2b39bff08e13393a5cf515f901334397a3a6409efb79b98ac752830a6d73a7fa767e46589fc28d137c8422488b7b68b0da7a180e7e507
+DIST icedtea-bin-core-7.2.6.10-x86.tar.xz 55334952 SHA256 717ebb14e834390206578c9ed487a03f3e80e663eb7c08d39dd05785641a1332 SHA512 4e0a8eb204d1144d9f784f0bc4de3f7ff6d84585c34c154f9f49b3bed2c2896ccbaadb016bd252c7f4d8402d4857f3541da1a953325d0bd962ff0674587c6d76 WHIRLPOOL 6d4f161aa8a403fd2517b390a4465c3513e470ed5ff9f8b5fdbfc659411668951dc336b972740d558f39b91234ab4e7cc764faa0ca59ee9a747685eed93422c3
 DIST icedtea-bin-core-7.2.6.8-amd64.tar.xz 53161352 SHA256 f96ef80de8568e3cd9d41c7829918e77c9705866e284e1390c94f68f911887a6 SHA512 833d586119cfa218e711bbccf33aaa4934bd4bc34839920af7ab2677b93e4c5ebe844c9cc293fb1aa47265695c9ac9673eea81d44fcc533118ccfcfa2aa490a3 WHIRLPOOL a438aa02fa1b3fec1129b06c43cad7990068798956a3880c8b71fc135e2ebab01dde9f3bf84c3ed44007b65f6e52e306e00933f8d9260f0550b6720945549301
 DIST icedtea-bin-core-7.2.6.8-x86.tar.xz 54834440 SHA256 c5867db7613cb73d94c0d413f00d1bc5e5563143977bdf046ca1bc42f00a28da SHA512 da511acc62225af3a3755e6dac7f0ffb47ed9eb4c6ce7faecde6850fd499cf9427504903d94b7efe5c5126095b0ac71dd5bbe401ff47ebd8026574f105b2b9c9 WHIRLPOOL 8471a3e60dbb75befeeb8f338165d3ae28b6fa3fb602f98ca5eaca4759ed8a447a728023853d3bbd04a822411dfdcaf45dcb55f6b2ba9beac6ccacba0ee3140e
 DIST icedtea-bin-core-7.2.6.9-amd64.tar.xz 53340768 SHA256 dc520389dc96e6b79ea7f7d72ec464c070977af5e17ab9843e84c406d884475e SHA512 2b7cc0fb6b1baea07c2bf429581868563f5b79cb0ff2f0d6ad7ae9fefd4ce99c9394b46ca41b04a345fe3bfa40d90654a1b30318ab1aae6e983ab5cca9571603 WHIRLPOOL 9a6781a662b7e46c5103c1098a2abc0c274bc0a3e3947437962630178647cba2a06ba3a649f5d2ba7c354a1430550e8a83cad0952e8879ce2997573b943c5817
 DIST icedtea-bin-core-7.2.6.9-x86.tar.xz 55025384 SHA256 0ea41e0bd36f23591be3a00f355ad0310e9a223892c10437b2f62ec846551d0f SHA512 a7d87789557532e9ad2ac36e836a5ea83357bfcede100e1225fa33258848f94d85cda59aae298bff3672b48b2ebdcc2efc72dab5078d3a168bdca920f00c3df7 WHIRLPOOL 95cb5658985d5e08233c0c6b6509c797b2b97464261ac42b3b2c01ba04d734aadb363401943b77842828cc1e5641bed198c850d56beee004be761b6669ef799d
-DIST icedtea-bin-doc-3.3.0.tar.xz 11683924 SHA256 7c47903bdb8aac992a52a2d51157022288162394ca1e59228a7baa757ed58721 SHA512 89ea51e86899e144aa1f0b8756887eb149ef33780ee85f17e76a1c789464a7acca761e3d542a547758faefd3305a979e55c7298589af3ece46d96fe9893b44e8 WHIRLPOOL 93747929a6dac84828073ae3d9f9c021b4802dd90d197d661796b20133f2544a14203fbce317d8f4984384792610b91fd58544d343e7c151c09782369acdc09e
 DIST icedtea-bin-doc-3.4.0.tar.xz 11684272 SHA256 fb6d16f81bfc1b6d8c9bbf93a07797a3b667c7e3fbf6083292cfb858b6f58056 SHA512 06682cdb16fa7a49918f892aeb9ab6bf3fb4a4fc2b64cc555b38d38f826a70fa2451a5c549d0f1c113fc20f216d9ae3ab2fd81cd88ea79a14af94854e9ef3799 WHIRLPOOL 666aec67b8f1fe8d4bc2bdb0a5873ece59cebb44c480074d694365a04c40c17bc54913394fcbf6ce6257bac35e9e831217ec0806e63d9f7a66a97a480e6d4dbd
+DIST icedtea-bin-doc-7.2.6.10.tar.xz 10614336 SHA256 e8a79fd42c8b6341df6dfc9a5a277aaecadcfe48e214988c900d1773313a95e2 SHA512 fa0748d0042f297527f5af11beccdad0b671225b8f258495ec93faa3f55b8669488575e53375ec71a8a8c75d17db4b26fd5980ce0381ed5ab598fb5c07c80af6 WHIRLPOOL 3f9f82c115869c5f849527485ef841d6b985139c3494e388a4d0a4a5c9adeba6c45aabe2da87d9717c692866a8baad0170f1059dd22d0911ba8b88e84f55f777
 DIST icedtea-bin-doc-7.2.6.8.tar.xz 10608092 SHA256 259f3e3bc826f93b5bab5720e21901ac1f17ef5807e9b8ff077c5315ee0275ae SHA512 84c741aea87ee9edbb4c54ee4dcecd2adc155f0598bbc1031fac5ed5e5c5828e259a839200b3f908d0928806a0c851ffcfa8aed4ec0486c11fb521a21173fafa WHIRLPOOL cadc1346bf2aeceabf60fac58d7a104012fb857962a9e7684071ca1319c2caf66d5909bfee5802d020db981db65cf58ffa70ecbf0a9ba40cfa5ba48797175d80
 DIST icedtea-bin-doc-7.2.6.9.tar.xz 10612564 SHA256 8b1674e37f5678aeb21c0b9ad6355aca21e03d699a8f1dc456b7a8fc7447e23c SHA512 6673ded54bd3719bcc3b53e91b426a3c71994d41dee674a5c25f4bf695fee47c77c8503313df6ab8e2c6055d779783550c70ce8e7a4d578c9e5b6af3bf9c0412 WHIRLPOOL 26243f77299e36f28303bc8dd762c2eb3fb24cad80338fc0af8a0d85d2b8bd0475a7e833fffcf0550c47c6540247f58448dd0dec0cccd3aa455b98f60a151e9c
-DIST icedtea-bin-examples-3.3.0-amd64.tar.xz 1856784 SHA256 63d0a3be2741bfeac1d2b768d5f3440346c763f5973089b0e29f7e4700db16ad SHA512 26c2fd1c09fd27ae9ad87f9d4708cc320e782598cbebd0504e914bc4554c2289cc3539ece36496f07c6cf1f32daebdd4d56f9cb078e64d96b168d857a99b170c WHIRLPOOL a1687b5dd8240893d3077637ff3d880b814a067123a677449f138a6c24fbfb02786080f550dca2b2e7a5b2add5105529367b124c190d5ba179f4be75036f27f7
-DIST icedtea-bin-examples-3.3.0-arm.tar.xz 1839564 SHA256 807aa2a27995eca0966167d89216d4c5d775715d681a49d88169021b0a6437c4 SHA512 ae178242c2d8407a655bad9589ee85f2ef2d91b8a51f4cffe30f8aa2fc1447c9465f7875366b31465df5d719322af4b0f92b0f550c539800853fc7481e981c8c WHIRLPOOL fd3b5dceebfa6119c7717df47f2110dcf4f865a05371fd677f95a633da6a910b46b9c1b8bc67d9243b0d2e8bdf937eef720c957217b2f32c053b97bed360c630
-DIST icedtea-bin-examples-3.3.0-ppc64.tar.xz 1848688 SHA256 04c566884db88b98625f28a50d7d5bc44468de54dc7dfa3bc9df51d5c43c8824 SHA512 bedec9222a56791f2a54d272b7d208faac65a9cf7f862d693d2234b3a7b9dc13cbfb75fd1e0dc30088877624b45e1a42902af9dc2dc8c66b1ea038fb8c535823 WHIRLPOOL d9c85433674c0f3316f6440e943793a38fd18fd0cf92a146a75ba8b67fc274fd2e41cf9bbe181204af1b7f3fdcb8ca47156df654bf6bfd637ba37a5fb0340307
-DIST icedtea-bin-examples-3.3.0-x86.tar.xz 1862264 SHA256 dc804edcbb89b3dff58eb148382aa3511a0d1ba9a9eebb4f9e8e63acaa2aa8af SHA512 fb659100e676aba74312797a326fac25fe298544ddb490ddcc557e6a6423351c95197a4198b61c08bae83514f728dafe45dde11ccf60cb7609f357830ffb6615 WHIRLPOOL 8c922ed311be294e8e88c08d85853dba835e1d854cbd3b20d4f550e45a1735ad1d0676b77010a1b8a905aa3cb6928557e3cde9e6677b74209d466e62511c670d
 DIST icedtea-bin-examples-3.4.0-amd64.tar.xz 1856216 SHA256 05d187bf937fb162ec828ae7fe214e739d4fb1d237320897eff5e196626c86af SHA512 0ec78903919ad524cdd0d9458c6c2ab437d38f2487807e8854e28df04a8126a43529f22080958e90ec16d7a0d9c72d01570058b383e507b2f1a96b7b7d9578e3 WHIRLPOOL 8dfaed413f1f722458e3b1c5616beacebe65b9a8dbec4e892e0c3b69135a0fbc3c2af2aba19ec0a2841a15bdbab4e051275e1ef84a2c870c6e2c6e11e3be85cb
 DIST icedtea-bin-examples-3.4.0-arm.tar.xz 1840060 SHA256 546f99327d2dc1908a057842781c91693bd92c18663e4af65ab82da929de64cf SHA512 0bd3a13f77e69099b11c0dfee8437b43d64bee4f9ed411af523042c5a53ebff592832e5ff8973bfd9c2858789938b1cabbd230e9b6498721249315b7442a7d9e WHIRLPOOL e9096453f7d8fbde8636981aa140d7606380c05b31d8b1fa03430438f4650bc87dc51e890b8416d2fc06922a8e32f7ce32cb8ef0fdcf89dc0fc6706392904a2b
 DIST icedtea-bin-examples-3.4.0-ppc64.tar.xz 1848048 SHA256 0fe715e84b6f405dc4a24e4c0e958b4691938c12452452747eccee3983c74967 SHA512 89565814818b8a07db3e65b49fd1d750521018ae9acc7800184fe511e327b904fdd6d91c7d7bdf85243685719ee9981abd19d4a727c12b936d75acc57ed80f76 WHIRLPOOL dd8a28b15c32c35c9bdfba9a24b6417ea984c15395de106e432b99dd2874a2aa90abd62aaf11f8ad822418ec1bf0068126c433115ee65b5e41d7fbd062538025
 DIST icedtea-bin-examples-3.4.0-x86.tar.xz 1862844 SHA256 e61b53cb1320492ddadcf428ffc15f9a6178ebcffbeefc2bce8a870021ed809a SHA512 128f6afab5f634bab49c11e41b2e763629a728364031b5e27ab84240878b0c07cabaf94b3b7c43182fd6776a48c341074957b250f036ce42fae84754339282e3 WHIRLPOOL 37f60ac345a34dc708de62b89779eaf010438a18f49d6d3cc07b0bed8c080596e01169185c4d1e8579efa83559bb98d8d0c56694507530d53059dc0bd0105701
+DIST icedtea-bin-examples-7.2.6.10-amd64.tar.xz 1796152 SHA256 a50a708e234055912ef8f7374d0d9a86f5dae80efd760ce0c58fb7fb9529dd4f SHA512 f3f2322d6c631130a21320fc4aa82f3c927ef9b877e557adc149d09794c859cd281542b71cacc761516eccf8b5b18ab9a7cd53a37b62cb591c738f5d60fb2301 WHIRLPOOL f47782336d8e6c1539a210f395d7bb999a7fd473ca9ef610fbb873d901a8674aa16bf05db7596a778585cac5de45cc38eb11dd35b5ba620f655facd07df02121
+DIST icedtea-bin-examples-7.2.6.10-x86.tar.xz 1797320 SHA256 2f4de71a29f92b54b151640620853bd71cfa7ee1bd3e4713ed745ada353801aa SHA512 afa5e924bfff796a13e096ef94c708b9192350e86746fe9c86874db2a937add8050daddfba5a50109a6ebc226fa62f66dfc019d27e4053364bfe9249e40a87da WHIRLPOOL 1f6214b2f9fd777ed10a4f5c3f0830f0f3f171d032fffb1ff281f3eea648b9b7994de31fcd7ad65d734bb45d7816819c3d3b34657d52a6b91fa4aea093904464
 DIST icedtea-bin-examples-7.2.6.8-amd64.tar.xz 1796596 SHA256 115bc46dcd307ca9abb264f3b5a2e541c5e4e12fddd7a522d066b0cff249ca42 SHA512 f3fe08e294c1aee2d64a89ab69cb002fd01b640289bc9b68a84aa5261ef4a7432b6be245a144fba628a701354079a1e2d2e0676fd0fa2a1febc612936e157492 WHIRLPOOL d74bb84a95200606e04816f669ddfede9f1991b1df755e1a9cddc91c26301a1ae353470c7e209468f7acae4d34ceed35ed6445d356510fdfa1a2e793a43995d3
 DIST icedtea-bin-examples-7.2.6.8-x86.tar.xz 1796976 SHA256 50c9601c379d51d732ad7e349d2b873973ff2b1f383d7fade4fb2139eee15e8f SHA512 ab3101a86fcc62c2ca159830dffaff561f54cf1dc75ebce45efd72341881c97b078b8213040f70e41b421b17d81c3fa093371be2e160bcfaca7d5ef6ad2dfd31 WHIRLPOOL e2ebfc5fc099e03eab164d09d7ad13db8b97fcb6514961e5b0203bcb42f4ba28a45aadcbcbccf9d6933beb98c6929cecd6f61a51e5260d7c1a078d8d5535f921
 DIST icedtea-bin-examples-7.2.6.9-amd64.tar.xz 1796792 SHA256 edb89de7176d9a155e75034c737666aefceadc9f8026845c7b0175234bb73532 SHA512 5a456c4a3dc27161c0da5fac7f757e59beafafe0ce3d2adf36901f71955cc8075d52507e418f8cd1346d3381754ce5e4ca4a1d40eacbc2f6a37d52abd326dbf8 WHIRLPOOL 2dd6162a0f425a52ec4c4ca61ecf3e431f35da3c6565b0917901dedcdd0a763aee051b24269129975491f396a896b340b5387d8c74ef6e86685dbdf6071cfa50
 DIST icedtea-bin-examples-7.2.6.9-x86.tar.xz 1796468 SHA256 e766aca0dce9ef7e43c4866f7cbd7b9f780a444385259b0d8696f0737ccee65a SHA512 36ed733a1fddca19f6ed23ce66abf77864d1d08a4aed21712cd58aade8699ea39a2113dc74c5404cd875c2aa49b6ca98e02fa8cff82970926a9eb676e2d2f438 WHIRLPOOL 0fe6951506e49493d1ef10c0724089a19e3fe04069c0979d9b91e0428ccab3f382757db407f03866fc80269bd4098004df57759e785f1fd0e48adac24def04d3
-DIST icedtea-bin-src-3.3.0.tar.xz 45698204 SHA256 47aca8467e1b5baf61ba59d80786a54d2f5b2f4651de2d87604ecab0318117a2 SHA512 668d8fa653d2e773c633e74f9043c7ee0a67f04775c8e317f2515c47a85a0cb2732e2d7a30ad0ce05521c32e6d1de19ccfbc7558b4b3d4b60b73765e1a854eaa WHIRLPOOL 0fd4dd6a7483dbd5826938922a339364b006324f01da7d39eba7d38eb73010abd47f9cfe5b16d419163c34e302973e4c5eba0c1fcf759f584dd3d7947c3a59ad
 DIST icedtea-bin-src-3.4.0.tar.xz 45704380 SHA256 c5a91481c3830148041404785316a203e37cbc3f8673cc97feccff443a4d61a5 SHA512 00cf87bbcb271202aaa08efdb3d804f92a5a8f158f998f689f0360a715485180c767fead34cbfdb8230465427227edf9c16c8779ee010301f25a7a2ad8a06c54 WHIRLPOOL bf80985e409636a0d0bab7849efd48eb19ea8bfaac75663e106129c9b2f511865f3ccaac4cd2a9f2402ae70d905aad2efd6a3edab2dcd0503f423f3ba645d4b7
+DIST icedtea-bin-src-7.2.6.10.tar.xz 40201568 SHA256 354b76311fb9e28857dd64c3ca4b53504f5acfaa567d424aa2b24e73b692316a SHA512 c9310a5e776435f2192b046372f051a974e1c9b3be9265a51b344cb46ed82ff4d6cc5870f04ff7a3adb300aadbdbc7b9fda808b890a3a69d7b3ea960a7dddf54 WHIRLPOOL 107b64bfff32317e0439d38a5fbbc79c211048935d00abfebc541e0274123048a59b033e31b07c63156f1726ee127996f4ac0fa95fd5bf2238256bea09fd968c
 DIST icedtea-bin-src-7.2.6.8.tar.xz 40105456 SHA256 9fcc1ebcfa3518804c45215f4e83ea282a87dff2b4b52461cd878c77a5812b2d SHA512 3ba29db8f6edeb3433d03a1b679ea21ead501c7e343fdee15531ff0e86061bca3e37498c75362aaee319424dc6464803659c24089def3f3c579bcf86fe7a6ba6 WHIRLPOOL d0ab4d61ba741b9955deb958927efff871c8941127707dee860a4317c1fdf17301b456739591a81f998d9a2bdaf55eccdd26717df228e9c70960b101e8dd7ab3
 DIST icedtea-bin-src-7.2.6.9.tar.xz 40197760 SHA256 3e59c465de83f5a9f9fb66da1c3af0a0d5fc5da76285ad936846bc675f7823e5 SHA512 392de5356226daff9b91fb79813dce3a8f383136637c5d7f2647ab3cfd664dbc3eadd65b1387c7bc74c9e476c1bed4a02b0efc10445aba27d1ba60d746f892a9 WHIRLPOOL f2b83a21476e611747de33a06ada376bfe15a45336be7ab287db5fabfd2999defa73b12666a4cc4a7fa04ae893e1a0447f05951dbac49cb9fdcc32697c907125
-DIST icedtea-bin-sunec-3.3.0-amd64.tar.xz 58104 SHA256 4a6a621b8fe4375e4bb8b5af40b05601ed51e7afa2a487cd58f0f3da1d634f09 SHA512 0753b3880f2337c60c34b31d60ffbd98e3f11da130771301a6fa01ae4d407705f41f99d53740bcce7972e62df3f277a1c8d4b6c8c5127c349bf0e78daac0b36c WHIRLPOOL 500fcbd2dca3e652804f04b0fc1dc57974d44e1556fdfa7cead513228765cf4f5e664a3771316fb85612efbdbe0eda2302042dda05f43a868c6cb68bcc6d713d
-DIST icedtea-bin-sunec-3.3.0-arm.tar.xz 54160 SHA256 17551c0f12d9769ec5a94c33aac4f8feba71b7c9ed6ce2ddc22d2b9165cae062 SHA512 4e53cbd500bcfc62a491c2e1f7a3bf1e75080e4e5694406d2fe2eea983b506893d6d076262af196ea728f0a15963d6219c3745b32b2e8501a5ac5239b047eaff WHIRLPOOL 2aeb9f1841839ba58c14bc5be2c9a43dcede9b4ecf200d20338977d94c99a5d9fdb972af51176cc2496189f1fbfaf438f138db7e9787bbe0ce924c75acf9fce6
-DIST icedtea-bin-sunec-3.3.0-ppc64.tar.xz 52984 SHA256 796d90328f9ae45eabf0d1f18a3be69468433dfc742c21469a092f5933559fbb SHA512 55ce61e02381bab6951acc652e57a0870ac31076f23a3ab53bf8b6facb3357dba50d93f3cc7f40eed15e17adb91ebc6f4d944a680ff5bfc7d343caf14014dc18 WHIRLPOOL 8f7f217025d9eb20042fdb0adae03fc34fca21ff59c9c9adb61982da785eab64cb2f87bc7e9fb5c7d9012e27f4a11198c5fa0f1b08dc086c42ed4b55315b2ee5
-DIST icedtea-bin-sunec-3.3.0-x86.tar.xz 68916 SHA256 9805096afc88877ec906eac355962324a621c13256c4bb57753dfaaa0ccff2da SHA512 66b333d84d7b365f53a9c4aba7c0f848d39cdd3580a0065afeff18a3f57701f2ea8ca4342dc48d49b41e837cb1b4f79ead2d85dad4a3293fa128373f100b9009 WHIRLPOOL 17b73389a4c175b7238da8553b79e98a87774212ba413a2f64178717df36432e1b1bdd0f56b2e96177f5257d8e9f433e9b08a3b23096a05179676f480f4d3a8f
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.3.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.10.ebuild
similarity index 62%
rename from dev-java/icedtea-bin/icedtea-bin-3.3.0-r1.ebuild
rename to dev-java/icedtea-bin/icedtea-bin-7.2.6.10.ebuild
index d83a7ed11edc..2f0581985f59 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.3.0-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.10.ebuild
@@ -3,22 +3,20 @@
 
 EAPI=6
 
-# Don't block arm. See bug #600134.
-#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* amd64 ~arm ppc64 x86"
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+KEYWORDS="-* ~amd64 ~x86"
 
-inherit java-vm-2 multilib-build toolchain-funcs
+inherit java-vm-2 multilib-build prefix toolchain-funcs
 
 BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
 SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
 	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
-	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ${BASE_URI}/${PN}-sunec-${PV}-x86.tar.xz ) ) )"
+	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )"
 
-for abi in amd64 arm ppc64 x86; do
+for abi in amd64 x86; do
 	SRC_URI+="
 		${abi}? (
 			${BASE_URI}/${PN}-core-${PV}-${abi}.tar.xz
-			${BASE_URI}/${PN}-sunec-${PV}-${abi}.tar.xz
 			examples? ( ${BASE_URI}/${PN}-examples-${PV}-${abi}.tar.xz )
 		)"
 done
@@ -26,9 +24,9 @@ done
 DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
 HOMEPAGE="http://icedtea.classpath.org"
 LICENSE="GPL-2-with-classpath-exception"
-SLOT="8"
+SLOT="7"
 
-IUSE="+alsa +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
+IUSE="+alsa cjk +cups doc examples +gtk headless-awt multilib nsplugin nss pulseaudio selinux source +webstart"
 REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
 
 RESTRICT="preserve-libs strip"
@@ -50,7 +48,7 @@ RDEPEND=">=dev-libs/glib-2.42:2%
 		>=x11-libs/pango-1.36%
 	)
 	!headless-awt? (
-		media-libs/giflib:0/7%
+		>=media-libs/giflib-4.1.6-r1%
 		=media-libs/libpng-1.6*%
 		>=x11-libs/libX11-1.6%
 		>=x11-libs/libXcomposite-0.4%
@@ -58,15 +56,30 @@ RDEPEND=">=dev-libs/glib-2.42:2%
 		>=x11-libs/libXi-1.7%
 		>=x11-libs/libXrender-0.9.8%
 		>=x11-libs/libXtst-1.2%
+	)
+	nss? (
+		>=dev-libs/nss-3.16.1-r1%
+		>=dev-libs/nspr-4.10%
 	)"
 
-RDEPEND=">=sys-devel/gcc-4.9.4[multilib?]
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND=">=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	>=sys-devel/gcc-4.9.3[multilib?]
 	>=sys-libs/glibc-2.22[multilib?]
-	virtual/ttf-fonts
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
 	selinux? ( sec-policy/selinux-java )
 	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
 	!multilib? ( ${RDEPEND//%/} )"
 
+DEPEND="!arm? ( dev-util/patchelf )"
+
 PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
 	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
 	pulseaudio? ( dev-java/icedtea-sound )"
@@ -87,9 +100,49 @@ src_prepare() {
 	fi
 
 	if use headless-awt; then
-		rm -vr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		rm -vr */jre/lib/*/{xawt,libsplashscreen.*} \
 		   */{,jre/}bin/policytool */bin/appletviewer || die
 	fi
+
+	if ! use gtk; then
+		rm -v */jre/lib/*/libjavagtk.* || die
+	fi
+
+	local lib=${P}-${ABI}/jre/lib
+
+	# The nss flag in the icedtea package just (un)comments this line.
+	sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" \
+		${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.
+		rm ${lib}/fontconfig.Gentoo.bfc || die
+		hprefixify ${lib}/fontconfig.Gentoo.properties.src
+		mv ${lib}/fontconfig.Gentoo.properties{.src,} || die
+	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
 }
 
 multilib_src_install() {
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index fa6fbfc87d21..2e253dc3289f 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,11 +1,11 @@
-DIST icedtea-2.6-corba-737fd3fbf139.tar.bz2 1073197 SHA256 48df47fac80597978951125fda10366b4f65b73b322abb80aefbe1ec58227989 SHA512 77e81659d3314172c2b80fb1441d268edc52e0ec0bd25f9a9596e3c7a545f0694a11cc2298952d72c85965529b344493d1f2c2187cf4d38749278018fc85a6b8 WHIRLPOOL be4c4dc243f5f79dc0fae1938040f67b276d1cb835a31c5e4587827da50fb4c81b5b89c90cb0170783b4ed81a57bdf9a4f5ae659b8197d80b66d717530fc7270
-DIST icedtea-2.6-hotspot-9fc0d63c2a74.tar.bz2 8195300 SHA256 d4ff2b6d44192a796af70e663b3ed2c7dd9e320729929ac650b4a1bc90ef329a SHA512 9bd3b2fea69c9e7c27ad9e157a44a20c113acc41bb0c830f18395df61d919dea1cd6bb69f9849ca449be25a9244ccc7bf05a51b3c64521362b0d765bfd59fb32 WHIRLPOOL 4c7b688682aeafd7c1cd234428ef51c9ea3bcc44b0f77ba3a3f1d873510c1de2dfba430df94bafa7c6f990cc7e6e60c79e7b893b7f60599610d19a81fc7e6b79
-DIST icedtea-2.6-jaxp-aa1c302a99fb.tar.bz2 2733907 SHA256 bf4e27af83fc88353986b906a0ac245658cf9d7b34629254e5e21b4aeff0621f SHA512 c1dd1b00d4f232ee8e3f365caa8502069bcf7cbda28e0900891ad9e63905a9bdeed00ae6e661148f181949494aae9bed6e2b0422711f24b2413c0bf484c08522 WHIRLPOOL 81289fe98950a8ce0832b2138870ee44883f3b1ac6ad20801244e39a85390c9074789920afd8ee7ffbb1fd5a7e6d61636cd00b2971657bc524d811822d6a6cc2
-DIST icedtea-2.6-jaxws-ea96df8beff4.tar.bz2 2022538 SHA256 a5d499825c2b7745b73b5e3596057013503bd1df3d60d04cd924e02b25313ca3 SHA512 3feea1a51d6e5d5e639eb482e6754525527f6aa307941470d012c31d26d0858f05bd9dcab39085260c916cb724920d9edf31522a3e85379e0d470c7fc0ea4e3b WHIRLPOOL 828e4c841e72578d48efca217946ce5fd8f6a8af2dd4076502587704e6a4241d63221921fed99584eafb5930ab44b88aa64c7d4cc904009db6226574f38d2f3e
-DIST icedtea-2.6-jdk-ce87b1399385.tar.bz2 32812887 SHA256 44feb033ad9ae3d4b10f6561f1743fe28a13bbcacd150f2f33f5ef116fece7c5 SHA512 9010fd923fa3eda72ff2e532e659dbd406c93043c2a40075e23d395ecee670c1b0a30bd68430fe1fd69a2f65d834e440c91596b5f6e9c29474eef31eca1f9753 WHIRLPOOL afe2a7bd7b13b0c840ca45b83f9c1987c18123af8a4d9767a5915838806a847208a856ce2b1643bf838e0e66bdb8d8a184404b874cdb49555cce46a4371e4458
-DIST icedtea-2.6-langtools-dd8e22d986c8.tar.bz2 1711235 SHA256 3eb33811bf1f8a56ae19078e35da835273e828293bc355b5b04a416bd3c6c96a SHA512 880924b19d3c021f137368eea51c380b0df8222c0148d8442b1b786d13a3698dc567d8783af1798a31364bdaa31b7580fcf02dfb82147a890407cd33c6a5595e WHIRLPOOL 77567688d4309adebea657edc61efc8c872e9bd148f9f3aeac739df590d4dc3bb90b827d3ae78fe9f027b6962af1902bef900f72a47f641206718cc354f6ccec
-DIST icedtea-2.6-openjdk-2dd04ef37829.tar.bz2 130401 SHA256 444c7dcfbcc665b4bb73b7c8b8256ac4d55fdb614ebdc3684a34d5f274684421 SHA512 67493785ec7aa3093f3d558a82e45c3f699bea63ccefacf273754b046d0a10b5cd19bb9a3dad7803a19e5d242ac06082729d1ac73088479db5712ccd08fdd223 WHIRLPOOL 04a9f53fa974792b4cc2279a6d7a5816a075246dfd863e99182c7e929173b0bb89d6aae68f2114637461148b45757716356bd14e096fb2b116f537b5479f66a8
-DIST icedtea-2.6.9.tar.xz 2107156 SHA256 8e4f3eb8d41ef66f1797825343141046973c124b18bf7d4698fae0a9a25495ea SHA512 6362e7329bdf5224d1c6340d4c03fe3ca6e5a879395c3af75390fcff9a8e8a599517a3f287d36110c301ba908e5bc4bcc8aa89cd605aa76f0e51f7a9aced6b3e WHIRLPOOL 5d4db9fc4fd73e9009a26fbbaab0891df13aa5ca7e1292bad5832833088d8bd2fac5593c705d64b1042204353bd9d7a23a7212257045dc36c0e6610e31629988
+DIST icedtea-2.6-corba-4d807b58849e.tar.bz2 1073065 SHA256 2d173e14e89520106bec26696a520b643ae1eee4f615a05a0f44c40ca7f174ed SHA512 6a51c16e3f01fcf41c9f17bfcdc979dee81df1ce5dbe10601025c02046aa4f6794a55af88248ee850e5b0a9cf34514efc6f136f14af1dc8e92ea4fbd31fe010c WHIRLPOOL 8feffc4e25a87ff1c52590aeeac0b79788864035fc7a23f08906b8c181d577115b32d4017f47b62e390b3f5d33dea7b0df30d9e7c6991a753a1e7939227f356b
+DIST icedtea-2.6-hotspot-8edec8d2933a.tar.bz2 8201721 SHA256 ab2b144695d0dfcf342b569b3f4e8450b61c073a3b7c60870fc88cb6d66bd560 SHA512 4374e42caf921ddf3f05fe3e72422105ee41f4cb82048be6d7d6279b2ecee0923d0d97f9c70318fe03125708af276c525de3360eccaddf8bf81c6faf07fe5224 WHIRLPOOL a29e53b06e2a835ab9ea4373ac47a90ca3aec1c1aefdc273668ca9fe2181c55b005fd007dbf13a3d23a0a27fd2dbd67586ab94d838adbaf761ed7471d2763db7
+DIST icedtea-2.6-jaxp-4099d8cf255f.tar.bz2 2734164 SHA256 451df1bed6179be1cfb655623bb67ed0dfd551fdeeeec029ef8db74d8ca51f69 SHA512 fbb23c8370154f443ca503a9f130352b7a1b42bbae926b3abade7e9b379772a30352cc5d76d44722f80914dff450b3c0221751fad315746ee023087e17491f66 WHIRLPOOL bcef192f1f18a330ba3e05329341ecf2e0d66ceba6d0abd320c3b7ed43cd91f42cfa1368b3a87ee289ee3678e499b2c6d06c2dae25bb382712b8f9551de2faec
+DIST icedtea-2.6-jaxws-bc4f48c1ccba.tar.bz2 2022493 SHA256 765cb50d5afeaae0eb717b297e79472d1353d822e56cfc7e9e6845b49731cd57 SHA512 86e0a4c52ef92093e4d4a17f3e2a30764817cdc4285bc7ed4544efaff276a34404cb810a8e4d5aaea311c7942360aa844ffd1d4d32cf7eac9c7c53e075f3b34f WHIRLPOOL acf2563da5fe1102b7c5751ba52c4fe3536ae4683bbc0024bc5546e636f6c368a2a977f242a88b1c981b94a9f87ddc48196522d626a6b2cbdbc76826d6df0c84
+DIST icedtea-2.6-jdk-11e15e507828.tar.bz2 32873593 SHA256 50d0af5fd5008b6f4b07811c77c570d065584f8c1c70bafe016a6d10b6a36481 SHA512 5a8f1c50556379f4496135fc640370fc0e8a79537d0d3a2fe49bb118a2f52c2fba5ba4748b173ad813937678b58d906a959213f870a12ae184683f885f692a2e WHIRLPOOL 4ef15fd4b393733d91fbeecd9d2b668f0d3d2ff04009566bb64e04b3fd013e2c1bae82b4e7bf89a823c070cf07b850c91058ccc8953d0ae04a737e0f5b8bffff
+DIST icedtea-2.6-langtools-6e30439005f6.tar.bz2 1712174 SHA256 02d38317e85b7c10f0cc072c192467a504cf37a2a0d94cddc4347f5c56677653 SHA512 433d6c76aa89365363aeeafe3ba41c4965e75809e8c967cb9a484e8ef1d647e623f7117dc5694885e2d860ae0fa01b20afb0ffe11ae1f5996630c250f931e52d WHIRLPOOL 9556b1cf8487524e123648f65272c4a49d69050b0584378df90e17abda46eccf5122f9fcb2ce50e982350330f89e9e5576ea1517b290a3c4d84a4c3cf52358ce
+DIST icedtea-2.6-openjdk-b3f98f0d4549.tar.bz2 130493 SHA256 b0a9dd2e3c0b3a29d791e49c6e5ea63057380a8eb7574355d4c551986ed7740a SHA512 456ff472161347287812c7a281762f5d80d355dc1851b5887db10acf29a1960ccf2c4cf77d941dd3f92526ed1c327b7da1d2ca9c81adca62b886a92583e61417 WHIRLPOOL 28de0bbe710cd8c1048a869b7eb95fd6084b891b4a796050af9381178f32a010e4db508cabf92aa86d0148caf48536bde9f4de23e0bdd718be5f6b288816d0f6
+DIST icedtea-2.6.10.tar.xz 2106324 SHA256 1c49fd735cc908677044935b6899e59434356b7e65d163bb5033e32f6621a92a SHA512 3b16d5d7f690d96785f3f319964989781eae3668c822b52f9256134ddab4e59261aac187afe1994b74a1d3406d7c5aed40489a49d0a178134a5d9913cd2ea28d WHIRLPOOL e97838675972183d99ea4f6353f3de938c52c8a86116582f33faae54f031426a7feb8ffe129de05b05a55d705df564c2f74645f3ad9f01c4d39f0bc449a58191
 DIST icedtea-3.4-aarch32-b93c39bf2bcf.tar.xz 6743892 SHA256 38e24d556aa269a5168e251b1fa97e84467a722fff27fa2f81de315854f18a33 SHA512 11d25efc36eb776fab3dd411c585d7c3ca6793ac54e17952ed43d22a6928a72fdf4625e836edafb07be3c6ee8612e258c749f5f661d61fb4b90675ed93896e48 WHIRLPOOL a4f931e56b27fab5dfa9a8ff053899b51182407eaa7b6db8a00a83915535b48f241776d7d089b532e6bb89ed629273621c9a65faf71a9efbc095ff679bd7a612
 DIST icedtea-3.4-corba-22ed32f45405.tar.xz 941164 SHA256 47210b6c69dcc6193b9bf0a3d61b75b48f4fa56e8ca348e40200cfa14eca3fd1 SHA512 f0579608ab1342df231c4542dab1c40e648cda8e9780ea584fd47679b07c93508cbfa85f0406d8aa8b9d528fc5bd99c9d41469568fbec41a6456a13d914ac71c WHIRLPOOL cad62367e49620af521d8a7cfb46b2c9d9f0f7b4383b98ceacdc7bebe893afbf8072fb884cdf7cbbfc5dc269279c431cf9b65fd66f00daca1f40a867f0b18987
 DIST icedtea-3.4-hotspot-00b7bbd261c9.tar.xz 6818648 SHA256 973d668f312b869184665def8abe4037dcd78562bf0dda40367102aca647fd76 SHA512 29bc953d283f0a0a464fa150e2c4d71b0adaa29da67246843d230f370b5a20227fb40ef6a7e3b93f10b0cdec18b0cd2bbbceeaea3c9db4d64c158cc23babbad2 WHIRLPOOL 3d37e54360a1c8d0f335b96027a4fc7d1ef0d074e78d08632b0af4ed6e39d2ca1fcdae6033047686cb55c582439ffd96eff04264723dcf20a88b56ba6aa7a4bc
diff --git a/dev-java/icedtea/icedtea-7.2.6.9.ebuild b/dev-java/icedtea/icedtea-7.2.6.10.ebuild
similarity index 97%
rename from dev-java/icedtea/icedtea-7.2.6.9.ebuild
rename to dev-java/icedtea/icedtea-7.2.6.10.ebuild
index afe6951eeb54..0143b078f504 100644
--- a/dev-java/icedtea/icedtea-7.2.6.9.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.10.ebuild
@@ -12,13 +12,14 @@ ICEDTEA_VER=$(get_version_component_range 2-4)
 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
 ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="737fd3fbf139.tar.bz2"
-JAXP_TARBALL="aa1c302a99fb.tar.bz2"
-JAXWS_TARBALL="ea96df8beff4.tar.bz2"
-JDK_TARBALL="ce87b1399385.tar.bz2"
-LANGTOOLS_TARBALL="dd8e22d986c8.tar.bz2"
-OPENJDK_TARBALL="2dd04ef37829.tar.bz2"
-HOTSPOT_TARBALL="9fc0d63c2a74.tar.bz2"
+
+CORBA_TARBALL="4d807b58849e.tar.bz2"
+JAXP_TARBALL="4099d8cf255f.tar.bz2"
+JAXWS_TARBALL="bc4f48c1ccba.tar.bz2"
+JDK_TARBALL="11e15e507828.tar.bz2"
+LANGTOOLS_TARBALL="6e30439005f6.tar.bz2"
+OPENJDK_TARBALL="b3f98f0d4549.tar.bz2"
+HOTSPOT_TARBALL="8edec8d2933a.tar.bz2"
 
 CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
 JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
diff --git a/dev-lang/erlang/erlang-18.3.ebuild b/dev-lang/erlang/erlang-18.3.ebuild
index 8fddc48d66d5..d8c4f8c00680 100644
--- a/dev-lang/erlang/erlang-18.3.ebuild
+++ b/dev-lang/erlang/erlang-18.3.ebuild
@@ -27,7 +27,8 @@ RDEPEND="
 	)
 	emacs? ( virtual/emacs )
 	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )"
+	odbc? ( dev-db/unixODBC )
+	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
 	sctp? ( net-misc/lksctp-tools )
diff --git a/dev-lang/erlang/erlang-19.1.ebuild b/dev-lang/erlang/erlang-19.1.ebuild
index e2c46bbf3531..8200f15eccd0 100644
--- a/dev-lang/erlang/erlang-19.1.ebuild
+++ b/dev-lang/erlang/erlang-19.1.ebuild
@@ -27,7 +27,8 @@ RDEPEND="
 	)
 	emacs? ( virtual/emacs )
 	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )"
+	odbc? ( dev-db/unixODBC )
+	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
 	sctp? ( net-misc/lksctp-tools )
diff --git a/dev-lang/erlang/erlang-19.2.ebuild b/dev-lang/erlang/erlang-19.2.ebuild
index 17f0d84b3b09..5c3eae678ca9 100644
--- a/dev-lang/erlang/erlang-19.2.ebuild
+++ b/dev-lang/erlang/erlang-19.2.ebuild
@@ -27,7 +27,8 @@ RDEPEND="
 	)
 	emacs? ( virtual/emacs )
 	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )"
+	odbc? ( dev-db/unixODBC )
+	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
 	sctp? ( net-misc/lksctp-tools )
diff --git a/dev-lang/erlang/erlang-19.3.ebuild b/dev-lang/erlang/erlang-19.3.ebuild
index 17f0d84b3b09..5c3eae678ca9 100644
--- a/dev-lang/erlang/erlang-19.3.ebuild
+++ b/dev-lang/erlang/erlang-19.3.ebuild
@@ -27,7 +27,8 @@ RDEPEND="
 	)
 	emacs? ( virtual/emacs )
 	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )"
+	odbc? ( dev-db/unixODBC )
+	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
 	sctp? ( net-misc/lksctp-tools )
diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild
index 6ca4874cefef..606ecbb43d37 100644
--- a/dev-lang/ghc/ghc-8.0.2.ebuild
+++ b/dev-lang/ghc/ghc-8.0.2.ebuild
@@ -84,10 +84,7 @@ RDEPEND="
 # gentoo binaries are built against ncurses-6
 RDEPEND+="
 	binary? (
-		|| (
-			sys-libs/ncurses:0/6
-			sys-libs/ncurses:5/6
-		)
+		sys-libs/ncurses:0/6
 	)
 "
 
@@ -461,12 +458,6 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-8.0.2-libffi-alpha.patch
 		epatch "${FILESDIR}"/${PN}-8.0.2-O2-unreg.patch
 
-		if use prefix; then
-			# Make configure find docbook-xsl-stylesheets from Prefix
-			sed -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' \
-				-i utils/haddock/doc/configure.ac || die
-		fi
-
 		bump_libs
 
 		# as we have changed the build system
diff --git a/dev-libs/elfutils/elfutils-0.169-r1.ebuild b/dev-libs/elfutils/elfutils-0.169-r1.ebuild
new file mode 100644
index 000000000000..47328a2ac4f8
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.169-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://elfutils.org/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4"
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch
+	if use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	use test && append-flags -g #407135
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads thread-safety) \
+		--program-prefix="eu-" \
+		--with-zlib \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma)
+}
+
+multilib_src_test() {
+	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc NOTES
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/icu/icu-58.2.ebuild b/dev-libs/icu/icu-58.2.ebuild
deleted file mode 100644
index c196c5b8917b..000000000000
--- a/dev-libs/icu/icu-58.2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug doc examples static-libs"
-
-DEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-	)
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-58.1-iterator.patch"
-)
-
-pkg_pretend() {
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-}
-
-src_prepare() {
-	# apply patches
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	multilib_is_native_abi && myeconfargs+=(
-		$(use_enable examples samples)
-	)
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE=${S} \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/liborcus/liborcus-0.11.2.ebuild b/dev-libs/liborcus/liborcus-0.11.2.ebuild
index c5b9911b2175..a2878fa17014 100644
--- a/dev-libs/liborcus/liborcus-0.11.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.11.2.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-libs/boost:=
 	sys-libs/zlib:=
 	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( >=dev-libs/libixion-0.11.1:= )
+	spreadsheet-model? ( =dev-libs/libixion-0.11*:= )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/mdds-1.2.0:1
diff --git a/dev-libs/liborcus/liborcus-0.12.1.ebuild b/dev-libs/liborcus/liborcus-0.12.1.ebuild
index 4ec3f16e12af..0eb1432bb1e5 100644
--- a/dev-libs/liborcus/liborcus-0.12.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.12.1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-libs/boost:=
 	sys-libs/zlib:=
 	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( >=dev-libs/libixion-0.12.1:= )
+	spreadsheet-model? ( =dev-libs/libixion-0.12*:= )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/mdds-1.2.2:1
diff --git a/dev-libs/libtasn1/libtasn1-4.10-r2.ebuild b/dev-libs/libtasn1/libtasn1-4.10-r2.ebuild
index b41faa2880a9..adcc621256d7 100644
--- a/dev-libs/libtasn1/libtasn1-4.10-r2.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs valgrind"
 
 DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/libtasn1/libtasn1-4.11.ebuild b/dev-libs/libtasn1/libtasn1-4.11-r1.ebuild
similarity index 96%
rename from dev-libs/libtasn1/libtasn1-4.11.ebuild
rename to dev-libs/libtasn1/libtasn1-4.11-r1.ebuild
index 24aca51c0e87..c297f11cae53 100644
--- a/dev-libs/libtasn1/libtasn1-4.11.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.11-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/libtasn1/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/6" # subslot = libtasn1 soname version
+SLOT="0/7" # subslot = libtasn1 soname version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs valgrind"
 
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 4692f9a38052..cc4b7b86b48f 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,3 +1,2 @@
-DIST lzo-2.08.tar.gz 589045 SHA256 ac1b3e4dee46febe9fd28737eb7f5692d3232ef1a01da10444394c3d47536614 SHA512 d03ae521000d69dd1fc92112a7b6e642c388b2898d7fb6ac4168e947a895e8d5e77199f78f05e036cefe02f346ea242bca694522f3c7959ab6ca19de956162dd WHIRLPOOL bea0357b01cb64018a5afc7b0934065dda944866aa23f44edd4eb615d53c0242b70c836d2d8144ed64df4a438bea5c1b8b5120ee4a7f08af15db171f85c11ac8
 DIST lzo-2.09.tar.gz 594855 SHA256 f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c SHA512 7c64e5e7d2050d75ac8c59d613f6f7230b74746b1d207666755b07450053c8b73980f12f8a1ec59d2af0bada02beec126aaacb675b8088b5fe65e97ff7e6bfc7 WHIRLPOOL 5c5aaa79ddc4202b784ec29e6607d450a3824564ac3364a1219cd971be32bc58fc583ab5ffcbd52a8ddf975518059eab9bd1b897c052081e19dc0a43a96fee45
 DIST lzo-2.10.tar.gz 600622 SHA256 c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4 WHIRLPOOL 58ebddd8c8755f7a3808d4c996356e4c45d341ee0600f7a28963bd71cad9e3efcb77f50fb5514d1663e530b38e007f42fe57143252f407756ad2d710e8623654
diff --git a/dev-libs/lzo/lzo-2.08.ebuild b/dev-libs/lzo/lzo-2.08.ebuild
deleted file mode 100644
index 8d7fd6db7770..000000000000
--- a/dev-libs/lzo/lzo-2.08.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="An extremely fast compression and decompression library"
-HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
-SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples static-libs"
-
-RDEPEND="abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
-
-DOCS="BUGS ChangeLog README THANKS doc/*"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h}
-	fi
-
-	prune_libtool_files
-}
diff --git a/dev-perl/AnyEvent-I3/AnyEvent-I3-0.160.0.ebuild b/dev-perl/AnyEvent-I3/AnyEvent-I3-0.160.0.ebuild
deleted file mode 100644
index 764a335a9081..000000000000
--- a/dev-perl/AnyEvent-I3/AnyEvent-I3-0.160.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MSTPLBG
-MODULE_VERSION=0.16
-inherit perl-module
-
-DESCRIPTION="Communicate with the i3 window manager"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-perl/AnyEvent
-	dev-perl/JSON-XS
-"
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/AnyEvent-I3/Manifest b/dev-perl/AnyEvent-I3/Manifest
index 380435dd030c..7067d758f247 100644
--- a/dev-perl/AnyEvent-I3/Manifest
+++ b/dev-perl/AnyEvent-I3/Manifest
@@ -1,2 +1 @@
-DIST AnyEvent-I3-0.16.tar.gz 25320 SHA256 2fc2010011462b6ac9f64dbc5049c5a4298020b9f0f3340d4d22d95a77519be3 SHA512 20d2ea27deaed4b6fcdc818c94c92699e2ae83cc7a655f4ccbde8e77771ec9ba27a577c7585f31e77b11796f2c414bfe719b695c4f9b6fb206e17ec8b09822e1 WHIRLPOOL 8323843067c677eed0e602bcbafd0b8b490267d785481e135d33a74bc9d747c207e6cfdc9d30b607d5bd0fe727800bf1b0fc6aa24d005d31d62e805da886cb8e
 DIST AnyEvent-I3-0.17.tar.gz 25264 SHA256 5382c984c9f138395f29f0c00af81aa0c8f4b765582055c73ede4b13f04a6d63 SHA512 e8b0ccb89be27d5e952e5cb819e1f462ad5c558879a88fb5087d72517424316c0053b081ed9763d701a017c1d838fa694b49f40886335a23a68ebb091714b259 WHIRLPOOL de3b6ecbe22acbf1e4a72f5c30b69a6b4381cc0fa5152ed1411ab67f22f82b730362e3532e165982c80162d14d6650e23d57c9e4832894e5cafa10b42375d462
diff --git a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.190.0-r1.ebuild b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.190.0-r1.ebuild
deleted file mode 100644
index 77adfdba5ee1..000000000000
--- a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.190.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ZEFRAM
-MODULE_VERSION=0.19
-inherit perl-module
-
-DESCRIPTION="Wrap OP check callbacks"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE=""
-
-RDEPEND="virtual/perl-parent"
-DEPEND=">=dev-perl/ExtUtils-Depends-0.302
-	${RDEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/B-Hooks-OP-Check/Manifest b/dev-perl/B-Hooks-OP-Check/Manifest
index a9783062033b..26b5d2dbdc21 100644
--- a/dev-perl/B-Hooks-OP-Check/Manifest
+++ b/dev-perl/B-Hooks-OP-Check/Manifest
@@ -1,2 +1 @@
-DIST B-Hooks-OP-Check-0.19.tar.gz 64368 SHA256 2fff4a860cae4fa69b91164a1e2d396bfddd8466bdd04d718e695f7276bce15e SHA512 3356c875698cdfbada191ba2dcbbf472a743650b68220b499e30198f2bc39e82df72fc6727e2acbf6c4a8d25706c7cf74c7ffd0ffa52dbba3e874195bba63d0c WHIRLPOOL 301213439d51934491864f7f0eb20afc496c7614980449f0c328688a403ffef133520e2d4ab08de043c667259e4a500fd352b3a2e97530a4abd8c6b60a478d87
 DIST B-Hooks-OP-Check-0.21.tar.gz 76100 SHA256 c4bb1566228b1817380c5525a93ce45c055a2ab93b19b784ebb51cf73fdcb3c4 SHA512 fb816d9d591b501c660668c170e368bc6573851736196a8c533720f651b8df30bf38d93e697606e868e19aa9ec4a5d696a786b102bf2284b82cfb887a5a83c2b WHIRLPOOL 10541c6304cde51a1d3e232c3673b99d8b8471c081909cb8edbbc80284bfd5565ea1f3287657f299732c2796c7412cea3593eb5946a592c5fd3220b3e6717b9e
diff --git a/dev-perl/Clone/Clone-0.390.0.ebuild b/dev-perl/Clone/Clone-0.390.0.ebuild
index 861c1bfefc27..b3eb9f8c5215 100644
--- a/dev-perl/Clone/Clone-0.390.0.ebuild
+++ b/dev-perl/Clone/Clone-0.390.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Recursively copy Perl datatypes"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Context-Preserve/Context-Preserve-0.10.0-r1.ebuild b/dev-perl/Context-Preserve/Context-Preserve-0.10.0-r1.ebuild
deleted file mode 100644
index ddbb6b0ca38d..000000000000
--- a/dev-perl/Context-Preserve/Context-Preserve-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=JROCKWAY
-MODULE_VERSION=0.01
-inherit perl-module
-
-DESCRIPTION="Return chained, modified values from subs, without losing context"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Test-Exception
-		>=virtual/perl-Test-Simple-1.1.10
-	)"
-
-SRC_TEST="do"
diff --git a/dev-perl/Context-Preserve/Manifest b/dev-perl/Context-Preserve/Manifest
index 00d9f690b186..f927a23f7bde 100644
--- a/dev-perl/Context-Preserve/Manifest
+++ b/dev-perl/Context-Preserve/Manifest
@@ -1,2 +1 @@
-DIST Context-Preserve-0.01.tar.gz 13158 SHA256 867c0ee574d1cc90aff019b547a7b78ba42ef879eef480f4c4764aae288d5a3f SHA512 f579fdb935fb3d73375d1420db4f2357fae8a9feb350f5967f17dfe67074c02a5567180151fff6387324d995782a720e704cb0f5f5332623e88730117c3fe160 WHIRLPOOL 8927d16af4e209525ccb29d9296497620e6ea4691ee4b0009924637f0cf7e2af329ffec13f9e10fb161cf54c9186bd104465c0270b0e3af23d900e44fd3601fe
 DIST Context-Preserve-0.02.tar.gz 25305 SHA256 ec1d3405e84a5404c0286bdc8f208dcfddecdb0bc25a771dfd07651771907262 SHA512 e5c230e38430c6ea9b7ed75e075a12454262adf1883e5ab6ada4696099e2f246d0f9b613934b4197b0529e126ea083d12d9bbe4ece5cfb82a93f913b7d70b068 WHIRLPOOL e79d6bd8395e6d9c5d51baceb53ee2de382f14b2303986bbc59f4925f551fc0dbd134854211ffe1393afada83af7462e8a40fecc275889de4b0d379220554546
diff --git a/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.20.0-r1.ebuild b/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.20.0-r1.ebuild
deleted file mode 100644
index b2b27ac6393d..000000000000
--- a/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.20.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=FREW
-MODULE_VERSION=2.020
-inherit perl-module
-
-DESCRIPTION="Less indentation and newlines plus sub deparsing"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-aix ~x86-solaris"
-IUSE=""
-
-#RDEPEND="dev-perl/Devel-ArgNames"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.22.0.ebuild b/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.22.0.ebuild
deleted file mode 100644
index 9092159cf04b..000000000000
--- a/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.22.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=FREW
-DIST_VERSION=2.022
-inherit perl-module
-
-DESCRIPTION="Less indentation and newlines plus sub deparsing"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-aix ~x86-solaris"
-IUSE=""
-
-#RDEPEND="dev-perl/Devel-ArgNames"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-"
diff --git a/dev-perl/Data-Dumper-Concise/Manifest b/dev-perl/Data-Dumper-Concise/Manifest
index 9335b4b0bb9f..2182be0f9477 100644
--- a/dev-perl/Data-Dumper-Concise/Manifest
+++ b/dev-perl/Data-Dumper-Concise/Manifest
@@ -1,3 +1 @@
-DIST Data-Dumper-Concise-2.020.tar.gz 21771 SHA256 169e39a67cac637e9263ab31cfa129b0ac7bb9818ff1ea6c03f4d6269a48677d SHA512 aa1312e2d0b66f336e34346b65199c2afe658f06cf2f661dfc3e517631863dedbcaf40f731a7d0c5b7d9823a18b1c2cc026f806c5e29604fc81e06bab9b1bbe7 WHIRLPOOL 645bdea81fd65ab389816c3dee84c949966faf800fc3e9c2bde827c1db0fe439ca582698b5035bc09e12ab42ece0cc3a889866096c2384e37004f6626b64c3ce
-DIST Data-Dumper-Concise-2.022.tar.gz 22637 SHA256 4c0f30edf539665f708db40d085bd1c4252c8ff3bad518ef177c0a17e6ebfb7c SHA512 a3b17d740571db3d1968438830af5aee912f671dbc3692b2708ecb9301bc7770025d48202c3414a8e50cc2b48050f8b27b2a2c9b62d01681f0ce06888c37bd40 WHIRLPOOL 43c8041489a03b6f3bee08191010cb216dc45cc57e06cd1d6161c863a0eedc5f83dd3aa31bb219c462fc988d7c71aadef56b67540ac9cde53bd4e49c598f15f5
 DIST Data-Dumper-Concise-2.023.tar.gz 7867 SHA256 a6c22f113caf31137590def1b7028a7e718eface3228272d0672c25e035d5853 SHA512 cc193bc60228dd3bb1c50d4545ee6a507d80ada27548303bb04fd720504746a2d5a4f32d7c33f52dfaf135a2456e019d794a7d693e2c56df9ea9d0ff385e8cd0 WHIRLPOOL af8e51b1797646867c0ee81cec267b7ace9b893ae5fd7bdabad2b7f6a57f963fea781d3cd6258946fb7a581664595c2acf834a2cc71a20dbd66af893bc936dac
diff --git a/dev-perl/Devel-Cover/Devel-Cover-1.230.0-r1.ebuild b/dev-perl/Devel-Cover/Devel-Cover-1.230.0-r1.ebuild
deleted file mode 100644
index b5127f419bcc..000000000000
--- a/dev-perl/Devel-Cover/Devel-Cover-1.230.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PJCJ
-DIST_VERSION=1.23
-inherit perl-module
-
-DESCRIPTION="Code coverage metrics for Perl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal test"
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-Storable
-	!minimal? (
-		dev-perl/Browser-Open
-		dev-perl/Capture-Tiny
-		dev-perl/Class-XSAccessor
-		virtual/perl-JSON-PP
-		dev-perl/Moo
-		dev-perl/Parallel-Iterator
-		>=dev-perl/Pod-Coverage-0.60.0
-		>=dev-perl/PPI-HTML-1.70.0
-		>=dev-perl/Template-Toolkit-2.0.0
-		dev-perl/Test-Differences
-		dev-perl/namespace-clean
-		>=dev-perl/Perl-Tidy-20060719.0.0
-	)
-"
-DEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Devel-Cover/Devel-Cover-1.230.0.ebuild b/dev-perl/Devel-Cover/Devel-Cover-1.230.0.ebuild
deleted file mode 100644
index 5ecf3a87c6cc..000000000000
--- a/dev-perl/Devel-Cover/Devel-Cover-1.230.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PJCJ
-DIST_VERSION=1.23
-inherit perl-module
-
-DESCRIPTION="Code coverage metrics for Perl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-Storable
-"
-DEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Devel-Cover/Manifest b/dev-perl/Devel-Cover/Manifest
index 9621f4f02081..b49a2b25baef 100644
--- a/dev-perl/Devel-Cover/Manifest
+++ b/dev-perl/Devel-Cover/Manifest
@@ -1,2 +1 @@
-DIST Devel-Cover-1.23.tar.gz 198522 SHA256 fb2d9efdbb73b4b7f6f3091279dbcc6f494e6061ff27572758a410c080084054 SHA512 075a89950f2b02aaae085d99b9fd6c8e52b173aa0ed46dc57980ca8fea9d6f6ec63fe776789d9436bfdd719c7701bad5b741e75e898582f1ceb3d0098e4574a3 WHIRLPOOL 66debd3d9a352db67eed0aa81a3de0332d5fb29f0d9969efed29353b272b99a8f068e850bc8491816069a47b4552c9575bb1f7f477c4263c14eeaa458e35cf66
 DIST Devel-Cover-1.25.tar.gz 204888 SHA256 4880c4f60dd4589e7853dd98a26564f0ec3f15b0006a6a9567bdf4fa0803fa36 SHA512 717b35e8b0aa255e288925d29b959f41965b22bc008f86231ef488c643ec4f8b4cae2b7bf190446ab10a6038f5aa326ac46c1ccc805e55a8696d612f19e15a0f WHIRLPOOL 01ac7c58b5d86dfece844ec6504f6b572720c173dbba1b030ce2d5e404fa876c55c703e4518b97853c4bb2ad147e5446c33fc54bcbd3d02f63f34c9bc4b50062
diff --git a/dev-perl/File-HomeDir/File-HomeDir-1.2.0.ebuild b/dev-perl/File-HomeDir/File-HomeDir-1.2.0.ebuild
index e21ce38f2b8c..2e9f201e60ee 100644
--- a/dev-perl/File-HomeDir/File-HomeDir-1.2.0.ebuild
+++ b/dev-perl/File-HomeDir/File-HomeDir-1.2.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Get home directory for self or other user"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="+xdg test"
 
 RDEPEND="
diff --git a/dev-perl/GD/GD-2.660.0.ebuild b/dev-perl/GD/GD-2.660.0.ebuild
index 7d4ed1b9bc0e..58cae8195002 100644
--- a/dev-perl/GD/GD-2.660.0.ebuild
+++ b/dev-perl/GD/GD-2.660.0.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-Constant-0.230.0
+	dev-perl/ExtUtils-PkgConfig
 	virtual/perl-ExtUtils-MakeMaker
 "
 
diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.460.0-r1.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.460.0-r1.ebuild
deleted file mode 100644
index 070624852302..000000000000
--- a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.460.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ALEXMV
-MODULE_VERSION=0.46
-inherit perl-module
-
-DESCRIPTION="GnuPG::Interface is a Perl module interface to interacting with GnuPG"
-
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
-IUSE=""
-
-RDEPEND=">=app-crypt/gnupg-1.2.1-r1
-	>=virtual/perl-Math-BigInt-1.78
-	dev-perl/Any-Moose"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r2.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r2.ebuild
new file mode 100644
index 000000000000..fa04802748cf
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ALEXMV
+DIST_VERSION=0.52
+inherit perl-module
+
+DESCRIPTION="Perl module interface to interacting with GnuPG"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=app-crypt/gnupg-1.2.1-r1
+	virtual/perl-autodie
+	>=virtual/perl-Math-BigInt-1.780.0
+	>=dev-perl/Moo-0.91.11
+	>=dev-perl/MooX-HandlesVia-0.1.4
+	>=dev-perl/MooX-late-0.14.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-0001-fix-spelling-error-settting-should-be-setting.patch
+	"${FILESDIR}/${P}"-0002-Generalize-the-test-suite.patch
+	"${FILESDIR}/${P}"-0003-subkey-validity-of-an-key-when-we-have-established-n.patch
+	"${FILESDIR}/${P}"-0004-ensure-that-test-covers-all-signatures.patch
+	"${FILESDIR}/${P}"-0005-add-gpg_is_modern-to-test-suite.patch
+	"${FILESDIR}/${P}"-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch
+	"${FILESDIR}/${P}"-0007-test-suite-match-plaintext-output-across-versions-of.patch
+	"${FILESDIR}/${P}"-0008-fix-test_default_key_passphrase-when-passphrase-come.patch
+	"${FILESDIR}/${P}"-0009-clean-up-trailing-whitespace.patch
+	"${FILESDIR}/${P}"-0010-fix-capitalization-of-GnuPG.patch
+	"${FILESDIR}/${P}"-0011-ommand_args-should-be-command_args.patch
+	"${FILESDIR}/${P}"-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch
+	"${FILESDIR}/${P}"-0013-move-key-files-to-generic-names.patch
+	"${FILESDIR}/${P}"-0014-fix-spelling-s-convience-convenience.patch
+	"${FILESDIR}/${P}"-0015-added-new-secret-key-with-different-passphrase.patch
+	"${FILESDIR}/${P}"-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch
+	"${FILESDIR}/${P}"-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch
+	"${FILESDIR}/${P}"-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch
+	"${FILESDIR}/${P}"-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch
+)
+
+DIST_TEST=skip
+# Nearly all tests succeed with this patchset and GnuPG 2.1 when running outside the
+# emerge sandbox. However, the agent architecture is not really sandbox-friendly, so...
+#
+# Test Summary Report
+# -------------------
+# t/decrypt.t              (Wstat: 0 Tests: 6 Failed: 2)
+#  Failed tests:  5-6
+# Failed 1/22 test programs. 2/56 subtests failed.
diff --git a/dev-perl/GnuPG-Interface/Manifest b/dev-perl/GnuPG-Interface/Manifest
index dddfe3c63910..c512f86e2c0c 100644
--- a/dev-perl/GnuPG-Interface/Manifest
+++ b/dev-perl/GnuPG-Interface/Manifest
@@ -1,2 +1 @@
-DIST GnuPG-Interface-0.46.tar.gz 67892 SHA256 c0d2fbb762a4045008e11db7614585165591df1f384fe01510f95e922e39930e SHA512 35a88fdfd28c93e6f320f4fb986bdbbcb0c183876dff4689043ad311c2b60ad0bb23cd3ec7a248eb19c5d3fd286bd92c158bde3651c14cdbea5db875d733049b WHIRLPOOL cca4188bf4603b8d46f4519c4374c7b7e8b96a059f04d2f15828c046c0ee6c0fd93984ab9eecd52b071432da62d9780c34bebf7fede28980028cd34dab0346fa
 DIST GnuPG-Interface-0.52.tar.gz 63733 SHA256 247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35 SHA512 911f47a3b52249e8b39133d4040b86147793d9dd6a78d2b279674d6bba0cd38de5c919bf12b241b0e977790575502531afab6b1d2c05739d050c16d05d52fc49 WHIRLPOOL f9bd6e4ed26802739071127e12e0540d1b7d2880c85a9dda9c91cc4bd18c39734fb308feaf190a1822201048e2c8c8d7714a88210d1e118d38b5e9480c262476
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch
new file mode 100644
index 000000000000..fcec61009070
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch
@@ -0,0 +1,35 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 13 Sep 2016 07:26:00 +0200
+Subject: fix spelling error ("settting" should be "setting")
+
+---
+ README                 | 2 +-
+ lib/GnuPG/Interface.pm | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/README b/README
+index fcb982a..f457577 100644
+--- a/README
++++ b/README
+@@ -6,7 +6,7 @@ SYNOPSIS
+       use IO::Handle;
+       use GnuPG::Interface;
+   
+-      # settting up the situation
++      # setting up the situation
+       my $gnupg = GnuPG::Interface->new();
+       $gnupg->options->hash_init( armor   => 1,
+                                   homedir => '/home/foobar' );
+diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
+index f952f3e..83a4b1a 100644
+--- a/lib/GnuPG/Interface.pm
++++ b/lib/GnuPG/Interface.pm
+@@ -834,7 +834,7 @@ GnuPG::Interface - Perl interface to GnuPG
+   use IO::Handle;
+   use GnuPG::Interface;
+   
+-  # settting up the situation
++  # setting up the situation
+   my $gnupg = GnuPG::Interface->new();
+   $gnupg->options->hash_init( armor   => 1,
+ 			      homedir => '/home/foobar' );
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch
new file mode 100644
index 000000000000..d0d3e6ccdf9d
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch
@@ -0,0 +1,151 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 13 Sep 2016 10:38:12 -0400
+Subject: Generalize the test suite
+
+The test suite currently assumes it knows something about the internal
+state of GnuPG's homedir.
+
+It's safer and less brittle to rely explicitly on the public interface
+that GnuPG has committed to, such as --import-keys and --list-keys,
+rather than assuming that certain files are in certain places in the
+GnuPG homedir.
+
+It's also better to create a fresh homedir and allow GnuPG to populate
+it during the test suite, cleaning it up at the end, rather than hope
+that GnuPG will leave a pre-existing homedir untouched.
+
+With this change, many more of the tests pass when /usr/bin/gpg is
+provided by GnuPG 2.1.
+---
+ t/000_setup.t              | 28 ++++++++++++++++++++++++++++
+ t/MyTestSpecific.pm        |  2 +-
+ t/zzz_cleanup.t            | 17 +++++++++++++++++
+ test/fake-pinentry.pl      | 28 ++++++++++++++++++++++++++++
+ test/{options => gpg.conf} |  0
+ test/secret-keys/1.0.test  |  4 ++--
+ 6 files changed, 76 insertions(+), 3 deletions(-)
+ create mode 100644 t/000_setup.t
+ create mode 100644 t/zzz_cleanup.t
+ create mode 100755 test/fake-pinentry.pl
+ rename test/{options => gpg.conf} (100%)
+
+diff --git a/t/000_setup.t b/t/000_setup.t
+new file mode 100644
+index 0000000..7f7f7b0
+--- /dev/null
++++ b/t/000_setup.t
+@@ -0,0 +1,28 @@
++#!/usr/bin/perl -w
++
++use strict;
++use English qw( -no_match_vars );
++
++use lib './t';
++use MyTest;
++use MyTestSpecific;
++use Cwd;
++use File::Path qw (make_path);
++use File::Copy;
++
++TEST
++{
++    make_path('test/gnupghome', { mode => 0700 });
++    my $agentconf = IO::File->new( "> test/gnupghome/gpg-agent.conf" );
++    $agentconf->write("pinentry-program " . getcwd() . "/test/fake-pinentry.pl\n");
++    $agentconf->close();
++    copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
++    reset_handles();
++
++    my $pid = $gnupg->import_keys(command_args => [ 'test/pubring.gpg', 'test/secring.gpg' ],
++                                  options => [ 'batch'],
++                                  handles => $handles);
++    waitpid $pid, 0;
++
++    return $CHILD_ERROR == 0;
++};
+diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
+index 053b749..1af98ae 100644
+--- a/t/MyTestSpecific.pm
++++ b/t/MyTestSpecific.pm
+@@ -40,7 +40,7 @@ use vars qw( @ISA           @EXPORT
+ 
+ $gnupg = GnuPG::Interface->new( passphrase => 'test' );
+ 
+-$gnupg->options->hash_init( homedir              => 'test',
++$gnupg->options->hash_init( homedir              => 'test/gnupghome',
+                             armor                => 1,
+                             meta_interactive     => 0,
+                             meta_signing_key_id  => '0xF950DA9C',
+diff --git a/t/zzz_cleanup.t b/t/zzz_cleanup.t
+new file mode 100644
+index 0000000..5c03a72
+--- /dev/null
++++ b/t/zzz_cleanup.t
+@@ -0,0 +1,17 @@
++#!/usr/bin/perl -w
++
++use strict;
++use English qw( -no_match_vars );
++
++use lib './t';
++use MyTest;
++use MyTestSpecific;
++use File::Path qw (remove_tree);
++
++# this is actually no test, just cleanup.
++TEST
++{
++    my $err = [];
++    remove_tree('test/gnupghome', {error => \$err});
++    return ! @$err;
++};
+diff --git a/test/fake-pinentry.pl b/test/fake-pinentry.pl
+new file mode 100755
+index 0000000..12d3611
+--- /dev/null
++++ b/test/fake-pinentry.pl
+@@ -0,0 +1,28 @@
++#!/usr/bin/perl -w
++# Use this for your test suites when a perl interpreter is available.
++#
++# The encrypted keys in your test suite that you expect to work must
++# be locked with a passphrase of "test"
++#
++# Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
++#
++# License: This trivial work is hereby explicitly placed into the
++# public domain.  Anyone may reuse it, modify it, redistribute it for
++# any purpose.
++
++use strict;
++use warnings;
++
++# turn off buffering
++$| = 1;
++
++print "OK This is only for test suites, and should never be used in production\n";
++while (<STDIN>) {
++  chomp;
++  next if (/^$/);
++  next if (/^#/);
++  print ("D test\n") if (/^getpin/i);
++  print "OK\n";
++  exit if (/^bye/i);
++}
++1;
+diff --git a/test/options b/test/gpg.conf
+similarity index 100%
+rename from test/options
+rename to test/gpg.conf
+diff --git a/test/secret-keys/1.0.test b/test/secret-keys/1.0.test
+index 5999484..129d472 100644
+--- a/test/secret-keys/1.0.test
++++ b/test/secret-keys/1.0.test
+@@ -1,5 +1,5 @@
+-test/secring.gpg
+-----------------
++test/gnupghome/secring.gpg
++--------------------------
+ sec   1024D/F950DA9C 2000-02-06
+ uid                  GnuPG test key (for testing purposes only)
+ uid                  Foo Bar (1)
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0003-subkey-validity-of-an-key-when-we-have-established-n.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0003-subkey-validity-of-an-key-when-we-have-established-n.patch
new file mode 100644
index 000000000000..23fbf97fee2c
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0003-subkey-validity-of-an-key-when-we-have-established-n.patch
@@ -0,0 +1,37 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 13 Sep 2016 11:35:31 -0400
+Subject: subkey validity of an key when we have established no trust anchors
+
+This apparently isn't tested by deep comparisons, though, so it was
+never caught.
+---
+ t/get_public_keys.t | 2 +-
+ t/get_secret_keys.t | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/get_public_keys.t b/t/get_public_keys.t
+index 53db021..73e320b 100644
+--- a/t/get_public_keys.t
++++ b/t/get_public_keys.t
+@@ -175,7 +175,7 @@ TEST
+     ];
+ 
+     my $subkey = GnuPG::SubKey->new
+-      ( validity                 => 'u',
++      ( validity                 => '-',
+         length                   => 768,
+         algo_num                 => 16,
+         hex_id                   => 'ADB99D9C2E854A6B',
+diff --git a/t/get_secret_keys.t b/t/get_secret_keys.t
+index 3a1d99f..7bba083 100644
+--- a/t/get_secret_keys.t
++++ b/t/get_secret_keys.t
+@@ -48,7 +48,7 @@ TEST
+ 
+ 
+     my $subkey = GnuPG::SubKey->new
+-      ( validity                 => 'u',
++      ( validity                 => '-',
+         length                   => 768,
+         algo_num                 => 16,
+         hex_id                   => 'ADB99D9C2E854A6B',
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0004-ensure-that-test-covers-all-signatures.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0004-ensure-that-test-covers-all-signatures.patch
new file mode 100644
index 000000000000..1743b7d9177c
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0004-ensure-that-test-covers-all-signatures.patch
@@ -0,0 +1,35 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 13 Sep 2016 11:39:04 -0400
+Subject: ensure that test covers all signatures
+
+The earlier test wasn't reporting on one of the known self-sigs for
+the test key for some reason.
+
+This change ensures that all known signatures are present.
+---
+ t/get_public_keys.t | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/t/get_public_keys.t b/t/get_public_keys.t
+index 73e320b..9e96f7d 100644
+--- a/t/get_public_keys.t
++++ b/t/get_public_keys.t
+@@ -83,7 +83,17 @@ TEST
+                             date_string => '2000-02-06',
+                             hex_id => '53AE596EF950DA9C',
+                             sig_class => 0x13,
+-                            validity => '!'));
++                            validity => '!'),
++      GnuPG::Signature->new(
++                            date => 1177086329,
++                            algo_num => 17,
++                            is_exportable => 1,
++                            user_id_string => 'GnuPG test key (for testing purposes only)',
++                            date_string => '2007-04-20',
++                            hex_id => '53AE596EF950DA9C',
++                            sig_class => 0x13,
++                            validity => '!'),
++                          );
+ 
+     my $uid1 = GnuPG::UserId->new( as_string =>  'Foo Bar (1)',
+                                    validity => '-');
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0005-add-gpg_is_modern-to-test-suite.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0005-add-gpg_is_modern-to-test-suite.patch
new file mode 100644
index 000000000000..0016fa755c0c
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0005-add-gpg_is_modern-to-test-suite.patch
@@ -0,0 +1,39 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 13 Sep 2016 14:31:38 -0400
+Subject: add $gpg_is_modern to test suite
+
+MyTestSpecific.pm now produces a new variable indicating whether it
+the version of GnuPG we run against is from the "Modern" line of GnuPG
+development (2.1 or later).  This will be useful when comparing output
+that we can't expect from earlier versions.
+---
+ t/MyTestSpecific.pm | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
+index 1af98ae..a309698 100644
+--- a/t/MyTestSpecific.pm
++++ b/t/MyTestSpecific.pm
+@@ -29,17 +29,20 @@ use GnuPG::Handles;
+ use vars qw( @ISA           @EXPORT
+              $stdin         $stdout           $stderr
+              $gpg_program   $handles          $gnupg
+-             %texts
++             %texts         $gpg_is_modern
+            );
+ 
+ @ISA    = qw( Exporter );
+ @EXPORT = qw( stdin                  stdout          stderr
+               gnupg_program handles  reset_handles
+-              texts                  file_match
++              texts                  file_match      gpg_is_modern
+             );
+ 
+ $gnupg = GnuPG::Interface->new( passphrase => 'test' );
+ 
++my @version = split('\.', $gnupg->version());
++$gpg_is_modern = ($version[0] > 2 || ($version[0] == 2 && $version[1] >= 1));
++
+ $gnupg->options->hash_init( homedir              => 'test/gnupghome',
+                             armor                => 1,
+                             meta_interactive     => 0,
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch
new file mode 100644
index 000000000000..bea8bfc68dfa
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch
@@ -0,0 +1,120 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 13 Sep 2016 14:12:40 -0400
+Subject: Modern GnuPG (2.1) reports more detail about secret keys
+
+the GnuPG "modern" suite (version 2.1 or later) reports more detail
+about secret keys than previous versions did.  In particular, it
+reports stored ownertrust, public key data, and designated revokers
+for secret keys.  Older versions only reported those attributes for
+public keys.
+
+This patch adjusts the test suite to ensure that our handmade key
+matches the produced key when /usr/bin/gpg is supplied by the modern
+suite.
+---
+ t/get_secret_keys.t | 66 +++++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 54 insertions(+), 12 deletions(-)
+
+diff --git a/t/get_secret_keys.t b/t/get_secret_keys.t
+index 7bba083..c798cce 100644
+--- a/t/get_secret_keys.t
++++ b/t/get_secret_keys.t
+@@ -23,16 +23,34 @@ TEST
+     return 0 unless @returned_keys == 1;
+ 
+     $given_key = shift @returned_keys;
+-
+-    $handmade_key = GnuPG::PrimaryKey->new
+-      ( length                 => 1024,
++    my $pubkey_data = [
++     Math::BigInt->from_hex('0x'.
++      '88FCAAA5BCDCD52084D46143F44ED1715A339794641158DE03AA2092AFD3174E3DCA2CB7DF2DDC6FEDF7C3620F5A8BDAD06713E6153F8748DD76CB97305F30CBA8F8801DB47FAC11EED725F55672CB9BDAD629178A677CBB089B3E8AE0D9A9AD7741697A35F2868C62D25670994A92D810480173DC24263EEA0F103A43C0B64B'),
++     Math::BigInt->from_hex('0x'.
++      '8F2A3842C70FF17660CBB78C78FC93F534AB9A17'),
++     Math::BigInt->from_hex('0x'.
++      '83E348C2AA65F56DE84E8FDCE6DA7B0991B1C75EC8CA446FA85869A43350907BFF36BE512385E8E7E095578BB2138C04E318495873218286DE2B8C86F36EA670135434967AC798EBA28581F709F0C6B696EB512D3E561E381A06E4B5239BCC655015F9A926C74E4B859B26EAD604F208A556511A76A40EDCD9C38E6BD82CCCB4'),
++     Math::BigInt->from_hex('0x'.
++      '80DE04C85E30C9D62C13F90CFF927A84A5A59D0900B3533D4D6193FEF8C5DAEF9FF8A7D5F76B244FBC17644F50D524E0B19CD3A4B5FC2D78DAECA3FE58FA1C1A64E6C7B96C4EE618173543163A72EF954DFD593E84342699096E9CA76578AC1DE3D893BCCD0BF470CEF625FAF816A0F503EF75C18C6173E35C8675AF919E5704')
++    ];
++
++
++    my $args = {
++        length                 => 1024,
+         algo_num               => 17,
+         hex_id                 => '53AE596EF950DA9C',
+         creation_date          => 949813093,
+         creation_date_string   => '2000-02-06',
+-        owner_trust            => '', # secret keys do not report ownertrust?
++        owner_trust            => '-',
+         usage_flags            => 'scaESCA',
+-      );
++        pubkey_data            => $pubkey_data,
++    };
++    if (!$gpg_is_modern) {
++      # older versions don't report ownertrust or pubkey_data for secret keys:
++      delete $args->{pubkey_data};
++      $args->{owner_trust} = '';
++    }
++    $handmade_key = GnuPG::PrimaryKey->new($args);
+ 
+     $handmade_key->fingerprint
+       ( GnuPG::Fingerprint->new( as_hex_string =>
+@@ -42,20 +60,42 @@ TEST
+ 
+     $handmade_key->push_user_ids(
+       GnuPG::UserId->new( as_string => 'GnuPG test key (for testing purposes only)',
+-                          validity => ''), # secret keys do not report uid validity?
++                          validity => $args->{owner_trust}),
+       GnuPG::UserId->new( as_string => 'Foo Bar (1)',
+-                          validity => '')); # secret keys do not report uid validity?
+-
+-
+-    my $subkey = GnuPG::SubKey->new
+-      ( validity                 => '-',
++                          validity => $args->{owner_trust}));
++
++    my $revoker = GnuPG::Revoker->new
++      ( algo_num       => 17,
++        class          => 0x80,
++        fingerprint    => GnuPG::Fingerprint->new( as_hex_string =>
++                                                   '4F863BBBA8166F0A340F600356FFD10A260C4FA3'),
++        );
++
++    my $subkey_pub_data = [
++     Math::BigInt->from_hex('0x'.
++      '8831982DADC4C5D05CBB01D9EAF612131DDC9C24CEA7246557679423FB0BA42F74D10D8E7F5564F6A4FB8837F8DC4A46571C19B122E6DF4B443D15197A6A22688863D0685FADB6E402316DAA9B560D1F915475364580A67E6DF0A727778A5CF3'),
++     Math::BigInt->from_hex('0x'.
++      '6'),
++     Math::BigInt->from_hex('0x'.
++      '2F3850FF130C6AC9AA0962720E86539626FAA9B67B33A74DFC0DE843FF3E90E43E2F379EE0182D914FA539CCCF5C83A20DB3A7C45E365B8A2A092E799A3DFF4AD8274EB977BAAF5B1AFB2ACB8D6F92454F01682F555565E73E56793C46EF7C3E')
++    ];
++
++    my $sub_args = {
++        validity                 => '-',
+         length                   => 768,
+         algo_num                 => 16,
+         hex_id                   => 'ADB99D9C2E854A6B',
+         creation_date            => 949813119,
+         creation_date_string     => '2000-02-06',
+         usage_flags              => 'e',
+-      );
++        pubkey_data              => $subkey_pub_data,
++      };
++
++    if (!$gpg_is_modern) {
++      # older versions do not report pubkey data for secret keys
++      delete $sub_args->{pubkey_data};
++    }
++    my $subkey = GnuPG::SubKey->new($sub_args);
+ 
+     $subkey->fingerprint
+       ( GnuPG::Fingerprint->new( as_hex_string =>
+@@ -64,6 +104,8 @@ TEST
+       );
+ 
+     $handmade_key->push_subkeys( $subkey );
++    # older versions do not report designated revokers for secret keys
++    $handmade_key->push_revokers( $revoker ) if ($gpg_is_modern);
+ 
+     $handmade_key->compare( $given_key );
+ };
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0007-test-suite-match-plaintext-output-across-versions-of.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0007-test-suite-match-plaintext-output-across-versions-of.patch
new file mode 100644
index 000000000000..85c1a46adae5
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0007-test-suite-match-plaintext-output-across-versions-of.patch
@@ -0,0 +1,95 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 13 Sep 2016 14:46:13 -0400
+Subject: test suite: match plaintext output across versions of GnuPG
+
+The human-readable version of --list-keys is *not* expected to be
+static over time or as the user's environment changes (e.g. LANG or
+LC_MESSAGES), so expecting it to be machine-parseable is probably a
+mistake.
+
+That said, some users might want to pull textual information about
+specific keys to display directly to the user, so it's not a terrible
+idea to have it in the test suite.
+
+Modern GnuPG (2.1 or later) changes the default structure of the
+human-readable output in a few significant ways:
+
+ * it writes the path to the keyring as an absolute path, even if
+   $GNUPGHOME is set to a non-absolute path.
+
+ * it shows the calculated user id validity by default (see
+   show-uid-validity in gpg's --list-options).  (note that this is a
+   translated string, so that "unknown" (in the default C locale)
+   becomes "inconnue" when LANG or LC_MESSAGES is set to fr_CH.UTF-8,
+   for example.
+
+ * it writes the key algorithm names differently (e.g. rsa2048 instead
+   of 2048R)
+
+ * it does not display the key ID at all by default
+
+ * it displays the full fingerprint in compact form by default
+
+This changeset fixes the test suite so that it can do a rough
+verification of the human-readable text output by list_secret_keys in
+the C locale in modern versions of GnuPG, while leaving it working for
+older GnuPG suites.
+---
+ t/list_secret_keys.t           | 15 +++++++++++++--
+ test/secret-keys/1.modern.test |  8 ++++++++
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+ create mode 100644 test/secret-keys/1.modern.test
+
+diff --git a/t/list_secret_keys.t b/t/list_secret_keys.t
+index 1fe9b7e..51e3651 100644
+--- a/t/list_secret_keys.t
++++ b/t/list_secret_keys.t
+@@ -16,13 +16,22 @@ TEST
+ {
+     reset_handles();
+ 
++    $ENV{LC_MESSAGES} = 'C';
+     my $pid = $gnupg->list_secret_keys( handles => $handles );
+     close $stdin;
+ 
+     $outfile = 'test/secret-keys/1.out';
+     my $out = IO::File->new( "> $outfile" )
+       or die "cannot open $outfile for writing: $ERRNO";
+-    $out->print( <$stdout> );
++    while (<$stdout>) {
++      if ($gpg_is_modern && /^\/.*\/test\/gnupghome\/pubring.kbx$/) {
++        $out->print("test/gnupghome/pubring.kbx\n");
++      } elsif ($gpg_is_modern && /^--*$/) {
++        $out->print("--------------------------\n");
++      } else {
++        $out->print( $_ );
++      }
++    }
+     close $stdout;
+     $out->close();
+     waitpid $pid, 0;
+@@ -33,7 +42,9 @@ TEST
+ 
+ TEST
+ {
+-    my @files_to_test = ( 'test/secret-keys/1.0.test' );
++    my $suffix = '0';
++    $suffix = 'modern' if ($gpg_is_modern);
++    my @files_to_test = ( 'test/secret-keys/1.'.$suffix.'.test' );
+ 
+     return file_match( $outfile, @files_to_test );
+ };
+diff --git a/test/secret-keys/1.modern.test b/test/secret-keys/1.modern.test
+new file mode 100644
+index 0000000..3e46407
+--- /dev/null
++++ b/test/secret-keys/1.modern.test
+@@ -0,0 +1,8 @@
++test/gnupghome/pubring.kbx
++--------------------------
++sec   dsa1024 2000-02-06 [SCA]
++      93AFC4B1B0288A104996B44253AE596EF950DA9C
++uid           [ unknown] GnuPG test key (for testing purposes only)
++uid           [ unknown] Foo Bar (1)
++ssb   elg768 2000-02-06 [E]
++
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0008-fix-test_default_key_passphrase-when-passphrase-come.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0008-fix-test_default_key_passphrase-when-passphrase-come.patch
new file mode 100644
index 000000000000..5ae938325ff1
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0008-fix-test_default_key_passphrase-when-passphrase-come.patch
@@ -0,0 +1,29 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 13 Sep 2016 15:22:27 -0400
+Subject: fix test_default_key_passphrase when passphrase comes from agent
+
+In the modern GnuPG suite, where the passphrase is always managed by
+the agent, gpg itself doesn't emit the GOOD_PASSPHRASE status.
+Instead, if signing is successful it emits plain old SIG_CREATED.
+
+There are probably even better ways to test whether a given key is
+unlocked in this case, but this is a straightforward baseline fix that
+should get this part of the test suite to pass with all available
+versions of GnuPG.
+---
+ lib/GnuPG/Interface.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
+index 83a4b1a..1f1e6d5 100644
+--- a/lib/GnuPG/Interface.pm
++++ b/lib/GnuPG/Interface.pm
+@@ -808,7 +808,7 @@ sub test_default_key_passphrase() {
+ 
+     # all we realy want to check is the status fh
+     while (<$status>) {
+-        if (/^\[GNUPG:\]\s*GOOD_PASSPHRASE/) {
++        if (/^\[GNUPG:\]\s*(GOOD_PASSPHRASE|SIG_CREATED)/) {
+             waitpid $pid, 0;
+             return 1;
+         }
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0009-clean-up-trailing-whitespace.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0009-clean-up-trailing-whitespace.patch
new file mode 100644
index 000000000000..f408c6568b0f
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0009-clean-up-trailing-whitespace.patch
@@ -0,0 +1,112 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 11 Oct 2016 19:52:13 -0400
+Subject: clean up trailing whitespace
+
+---
+ lib/GnuPG/Fingerprint.pm |  2 +-
+ lib/GnuPG/Handles.pm     |  2 +-
+ lib/GnuPG/Interface.pm   | 16 ++++++++--------
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/lib/GnuPG/Fingerprint.pm b/lib/GnuPG/Fingerprint.pm
+index fcb1028..81c38a7 100644
+--- a/lib/GnuPG/Fingerprint.pm
++++ b/lib/GnuPG/Fingerprint.pm
+@@ -20,7 +20,7 @@ with qw(GnuPG::HashInit);
+ 
+ has as_hex_string => (
+     isa => 'Any',
+-    is  => 'rw',        
++    is  => 'rw',
+ );
+ 
+ sub compare {
+diff --git a/lib/GnuPG/Handles.pm b/lib/GnuPG/Handles.pm
+index b30ca57..3eee0e3 100644
+--- a/lib/GnuPG/Handles.pm
++++ b/lib/GnuPG/Handles.pm
+@@ -73,7 +73,7 @@ GnuPG::Handles - GnuPG handles bundle
+     = ( IO::Handle->new(), IO::Handle->new(), IO::Handle->new(),
+         IO::Handle->new(), IO::Handle->new(), IO::Handle->new(),
+       );
+- 
++
+   my $handles = GnuPG::Handles->new
+     ( stdin      => $stdin,
+       stdout     => $stdout,
+diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
+index 1f1e6d5..19e8070 100644
+--- a/lib/GnuPG/Interface.pm
++++ b/lib/GnuPG/Interface.pm
+@@ -833,7 +833,7 @@ GnuPG::Interface - Perl interface to GnuPG
+   # A simple example
+   use IO::Handle;
+   use GnuPG::Interface;
+-  
++
+   # setting up the situation
+   my $gnupg = GnuPG::Interface->new();
+   $gnupg->options->hash_init( armor   => 1,
+@@ -852,7 +852,7 @@ GnuPG::Interface - Perl interface to GnuPG
+   # Now we'll go about encrypting with the options already set
+   my @plaintext = ( 'foobar' );
+   my $pid = $gnupg->encrypt( handles => $handles );
+-  
++
+   # Now we write to the input of GnuPG
+   print $input @plaintext;
+   close $input;
+@@ -1144,7 +1144,7 @@ The following setup can be done before any of the following examples:
+ 
+   my $handles = GnuPG::Handles->new( stdin    => $input,
+                                      stdout   => $output );
+-   
++
+   # this sets up the communication
+   # Note that the recipients were specified earlier
+   # in the 'options' data member of the $gnupg object.
+@@ -1220,7 +1220,7 @@ The following setup can be done before any of the following examples:
+   # a file written to disk
+   # Make sure you "use IO::File" if you use this module!
+   my $cipher_file = IO::File->new( 'encrypted.gpg' );
+-   
++
+   # this sets up the communication
+   my $pid = $gnupg->decrypt( handles => $handles );
+ 
+@@ -1252,7 +1252,7 @@ The following setup can be done before any of the following examples:
+   # This time we'll just let GnuPG print to our own output
+   # and read from our input, because no input is needed!
+   my $handles = GnuPG::Handles->new();
+-  
++
+   my @ids = ( 'ftobin', '0xABCD1234' );
+ 
+   # this time we need to specify something for
+@@ -1260,7 +1260,7 @@ The following setup can be done before any of the following examples:
+   # search ids as arguments
+   my $pid = $gnupg->list_public_keys( handles      => $handles,
+                                       command_args => [ @ids ] );
+-  
++
+    waitpid $pid, 0;
+ 
+ =head2 Creating GnuPG::PublicKey Objects
+@@ -1280,7 +1280,7 @@ The following setup can be done before any of the following examples:
+       command_args => [ qw( test/key.1.asc ) ],
+       handles      => $handles,
+     );
+-    
++
+     my @out = <$handles->stdout()>;
+     waitpid $pid, 0;
+ 
+@@ -1357,7 +1357,7 @@ under the same terms as Perl itself.
+ 
+ =head1 AUTHOR
+ 
+-GnuPg::Interface is currently maintained by Jesse Vincent <jesse@cpan.org>.  
++GnuPg::Interface is currently maintained by Jesse Vincent <jesse@cpan.org>.
+ 
+ Frank J. Tobin, ftobin@cpan.org was the original author of the package.
+ 
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0010-fix-capitalization-of-GnuPG.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0010-fix-capitalization-of-GnuPG.patch
new file mode 100644
index 000000000000..f55d4b15942c
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0010-fix-capitalization-of-GnuPG.patch
@@ -0,0 +1,35 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 11 Oct 2016 19:52:58 -0400
+Subject: fix capitalization of GnuPG
+
+---
+ README                 | 2 +-
+ lib/GnuPG/Interface.pm | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/README b/README
+index f457577..aa7c984 100644
+--- a/README
++++ b/README
+@@ -427,7 +427,7 @@ LICENSE
+     under the same terms as Perl itself.
+ 
+ AUTHOR
+-    GnuPg::Interface is currently maintained by Jesse Vincent
++    GnuPG::Interface is currently maintained by Jesse Vincent
+     <jesse@cpan.org>.
+ 
+     Frank J. Tobin, ftobin@cpan.org was the original author of the package.
+diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
+index 19e8070..cf7138f 100644
+--- a/lib/GnuPG/Interface.pm
++++ b/lib/GnuPG/Interface.pm
+@@ -1357,7 +1357,7 @@ under the same terms as Perl itself.
+ 
+ =head1 AUTHOR
+ 
+-GnuPg::Interface is currently maintained by Jesse Vincent <jesse@cpan.org>.
++GnuPG::Interface is currently maintained by Jesse Vincent <jesse@cpan.org>.
+ 
+ Frank J. Tobin, ftobin@cpan.org was the original author of the package.
+ 
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0011-ommand_args-should-be-command_args.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0011-ommand_args-should-be-command_args.patch
new file mode 100644
index 000000000000..a9ab737aa04a
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0011-ommand_args-should-be-command_args.patch
@@ -0,0 +1,21 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 11 Oct 2016 19:57:10 -0400
+Subject: ommand_args should be command_args
+
+---
+ t/list_public_keys.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/list_public_keys.t b/t/list_public_keys.t
+index 7e563c1..a36a78b 100644
+--- a/t/list_public_keys.t
++++ b/t/list_public_keys.t
+@@ -38,7 +38,7 @@ TEST
+     reset_handles();
+ 
+     my $pid = $gnupg->list_public_keys( handles     => $handles,
+-                                        ommand_args => '0xF950DA9C'
++                                        command_args => '0xF950DA9C'
+                                       );
+     close $stdin;
+ 
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch
new file mode 100644
index 000000000000..9694e0854ce8
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch
@@ -0,0 +1,265 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 11 Oct 2016 20:05:16 -0400
+Subject: use fingerprints as inputs during tests to demonstrate explicit usage
+
+---
+ README                 | 6 +++---
+ lib/GnuPG/Interface.pm | 6 +++---
+ lib/GnuPG/Options.pm   | 2 +-
+ t/MyTestSpecific.pm    | 2 +-
+ t/encrypt.t            | 6 +++---
+ t/export_keys.t        | 4 ++--
+ t/get_public_keys.t    | 2 +-
+ t/get_secret_keys.t    | 2 +-
+ t/list_public_keys.t   | 4 ++--
+ t/list_secret_keys.t   | 4 ++--
+ t/list_sigs.t          | 4 ++--
+ t/sign_and_encrypt.t   | 2 +-
+ 12 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/README b/README
+index aa7c984..ed94ede 100644
+--- a/README
++++ b/README
+@@ -228,7 +228,7 @@ EXAMPLES
+ 
+       $gnupg->options->hash_init( armor    => 1,
+                                   recipients => [ 'ftobin@uiuc.edu',
+-                                                  '0xABCD1234' ],
++                                                  '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' ],
+                                   meta_interactive => 0 ,
+                                 );
+ 
+@@ -347,7 +347,7 @@ EXAMPLES
+       # and read from our input, because no input is needed!
+       my $handles = GnuPG::Handles->new();
+   
+-      my @ids = ( 'ftobin', '0xABCD1234' );
++      my @ids = ( 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' );
+ 
+       # this time we need to specify something for
+       # command_args because --list-public-keys takes
+@@ -358,7 +358,7 @@ EXAMPLES
+        waitpid $pid, 0;
+ 
+   Creating GnuPG::PublicKey Objects
+-      my @ids = [ 'ftobin', '0xABCD1234' ];
++      my @ids = [ 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' ];
+ 
+       my @keys = $gnupg->get_public_keys( @ids );
+ 
+diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
+index cf7138f..6eaef7d 100644
+--- a/lib/GnuPG/Interface.pm
++++ b/lib/GnuPG/Interface.pm
+@@ -1130,7 +1130,7 @@ The following setup can be done before any of the following examples:
+ 
+   $gnupg->options->hash_init( armor    => 1,
+                               recipients => [ 'ftobin@uiuc.edu',
+-                                              '0xABCD1234' ],
++                                              '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' ],
+                               meta_interactive => 0 ,
+                             );
+ 
+@@ -1253,7 +1253,7 @@ The following setup can be done before any of the following examples:
+   # and read from our input, because no input is needed!
+   my $handles = GnuPG::Handles->new();
+ 
+-  my @ids = ( 'ftobin', '0xABCD1234' );
++  my @ids = ( 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' );
+ 
+   # this time we need to specify something for
+   # command_args because --list-public-keys takes
+@@ -1265,7 +1265,7 @@ The following setup can be done before any of the following examples:
+ 
+ =head2 Creating GnuPG::PublicKey Objects
+ 
+-  my @ids = [ 'ftobin', '0xABCD1234' ];
++  my @ids = [ 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' ];
+ 
+   my @keys = $gnupg->get_public_keys( @ids );
+ 
+diff --git a/lib/GnuPG/Options.pm b/lib/GnuPG/Options.pm
+index 86261a0..7788662 100644
+--- a/lib/GnuPG/Options.pm
++++ b/lib/GnuPG/Options.pm
+@@ -198,7 +198,7 @@ GnuPG::Options - GnuPG options embodiment
+ 
+   # assuming $gnupg is a GnuPG::Interface object
+   $gnupg->options->armor( 1 );
+-  $gnupg->options->push_recipients( 'ftobin', '0xABCD1234' );
++  $gnupg->options->push_recipients( 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' );
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
+index a309698..c8764cc 100644
+--- a/t/MyTestSpecific.pm
++++ b/t/MyTestSpecific.pm
+@@ -46,7 +46,7 @@ $gpg_is_modern = ($version[0] > 2 || ($version[0] == 2 && $version[1] >= 1));
+ $gnupg->options->hash_init( homedir              => 'test/gnupghome',
+                             armor                => 1,
+                             meta_interactive     => 0,
+-                            meta_signing_key_id  => '0xF950DA9C',
++                            meta_signing_key_id  => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
+                             always_trust         => 1,
+                           );
+ 
+diff --git a/t/encrypt.t b/t/encrypt.t
+index 3183ac4..e6bdc08 100644
+--- a/t/encrypt.t
++++ b/t/encrypt.t
+@@ -27,7 +27,7 @@ TEST
+ 
+     $gnupg->options->clear_recipients();
+     $gnupg->options->clear_meta_recipients_keys();
+-    $gnupg->options->push_recipients( '0x2E854A6B' );
++    $gnupg->options->push_recipients( '0x7466B7E98C4CCB64C2CE738BADB99D9C2E854A6B' );
+ 
+     my $pid = $gnupg->encrypt( handles => $handles );
+ 
+@@ -43,7 +43,7 @@ TEST
+ {
+     reset_handles();
+ 
+-    my @keys = $gnupg->get_public_keys( '0xF950DA9C' );
++    my @keys = $gnupg->get_public_keys( '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
+     $gnupg->options->clear_recipients();
+     $gnupg->options->clear_meta_recipients_keys();
+     $gnupg->options->push_meta_recipients_keys( @keys );
+@@ -64,7 +64,7 @@ TEST
+ 
+     $gnupg->options->clear_recipients();
+     $gnupg->options->clear_meta_recipients_keys();
+-    $gnupg->options->push_recipients( '0x2E854A6B' );
++    $gnupg->options->push_recipients( '0x7466B7E98C4CCB64C2CE738BADB99D9C2E854A6B' );
+ 
+     $handles->stdin( $texts{plain}->fh() );
+     $handles->options( 'stdin' )->{direct} = 1;
+diff --git a/t/export_keys.t b/t/export_keys.t
+index cf5c82b..5add064 100644
+--- a/t/export_keys.t
++++ b/t/export_keys.t
+@@ -15,7 +15,7 @@ TEST
+     reset_handles();
+ 
+     my $pid = $gnupg->export_keys( handles      => $handles,
+-                                   command_args => '0xF950DA9C' );
++                                   command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
+     close $stdin;
+     waitpid $pid, 0;
+ 
+@@ -31,7 +31,7 @@ TEST
+     $handles->options( 'stdout' )->{direct} = 1;
+ 
+     my $pid = $gnupg->export_keys( handles            => $handles,
+-                                   command_args => '0xF950DA9C' );
++                                   command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
+     waitpid $pid, 0;
+     return $CHILD_ERROR == 0;
+ };
+diff --git a/t/get_public_keys.t b/t/get_public_keys.t
+index 9e96f7d..7893625 100644
+--- a/t/get_public_keys.t
++++ b/t/get_public_keys.t
+@@ -19,7 +19,7 @@ TEST
+ {
+     reset_handles();
+ 
+-    my @returned_keys = $gnupg->get_public_keys_with_sigs( '0xF950DA9C' );
++    my @returned_keys = $gnupg->get_public_keys_with_sigs( '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
+ 
+     return 0 unless @returned_keys == 1;
+ 
+diff --git a/t/get_secret_keys.t b/t/get_secret_keys.t
+index c798cce..a7f1348 100644
+--- a/t/get_secret_keys.t
++++ b/t/get_secret_keys.t
+@@ -18,7 +18,7 @@ TEST
+ {
+     reset_handles();
+ 
+-    my @returned_keys = $gnupg->get_secret_keys( '0xF950DA9C' );
++    my @returned_keys = $gnupg->get_secret_keys( '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
+ 
+     return 0 unless @returned_keys == 1;
+ 
+diff --git a/t/list_public_keys.t b/t/list_public_keys.t
+index a36a78b..622b092 100644
+--- a/t/list_public_keys.t
++++ b/t/list_public_keys.t
+@@ -38,7 +38,7 @@ TEST
+     reset_handles();
+ 
+     my $pid = $gnupg->list_public_keys( handles     => $handles,
+-                                        command_args => '0xF950DA9C'
++                                        command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C'
+                                       );
+     close $stdin;
+ 
+@@ -64,7 +64,7 @@ TEST
+     $handles->options( 'stdout' )->{direct} = 1;
+ 
+     my $pid = $gnupg->list_public_keys( handles      => $handles,
+-                                        command_args => '0xF950DA9C',
++                                        command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
+                                       );
+ 
+     waitpid $pid, 0;
+diff --git a/t/list_secret_keys.t b/t/list_secret_keys.t
+index 51e3651..7040c38 100644
+--- a/t/list_secret_keys.t
++++ b/t/list_secret_keys.t
+@@ -55,7 +55,7 @@ TEST
+     reset_handles();
+ 
+     my $pid = $gnupg->list_secret_keys( handles      => $handles,
+-                                        command_args => '0xF950DA9C' );
++                                        command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
+     close $stdin;
+ 
+     $outfile = 'test/secret-keys/2.out';
+@@ -80,7 +80,7 @@ TEST
+     $handles->options( 'stdout' )->{direct} = 1;
+ 
+     my $pid = $gnupg->list_secret_keys( handles      => $handles,
+-                                        command_args => '0xF950DA9C' );
++                                        command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
+ 
+     waitpid $pid, 0;
+ 
+diff --git a/t/list_sigs.t b/t/list_sigs.t
+index 16cfa6a..1301fb2 100644
+--- a/t/list_sigs.t
++++ b/t/list_sigs.t
+@@ -36,7 +36,7 @@ TEST
+     reset_handles();
+ 
+     my $pid = $gnupg->list_sigs( handles      => $handles,
+-                                 command_args => '0xF950DA9C',
++                                 command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
+                                );
+     close $stdin;
+ 
+@@ -60,7 +60,7 @@ TEST
+     $handles->options( 'stdout' )->{direct} = 1;
+ 
+     my $pid = $gnupg->list_sigs( handles      => $handles,
+-                                 command_args => '0xF950DA9C',
++                                 command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
+                                );
+ 
+     waitpid $pid, 0;
+diff --git a/t/sign_and_encrypt.t b/t/sign_and_encrypt.t
+index 5dc1c08..df0fc75 100644
+--- a/t/sign_and_encrypt.t
++++ b/t/sign_and_encrypt.t
+@@ -14,7 +14,7 @@ TEST
+ {
+     reset_handles();
+ 
+-    $gnupg->options->push_recipients( '0x2E854A6B' );
++    $gnupg->options->push_recipients( '0x7466B7E98C4CCB64C2CE738BADB99D9C2E854A6B' );
+     my $pid = $gnupg->sign_and_encrypt( handles => $handles );
+ 
+     print $stdin @{ $texts{plain}->data() };
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0013-move-key-files-to-generic-names.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0013-move-key-files-to-generic-names.patch
new file mode 100644
index 000000000000..489e685b7b8c
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0013-move-key-files-to-generic-names.patch
@@ -0,0 +1,33 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 11 Oct 2016 20:17:49 -0400
+Subject: move key files to generic names
+
+---
+ t/000_setup.t                         |   2 +-
+ test/{pubring.gpg => public_keys.pgp} | Bin
+ test/{secring.gpg => secret_keys.pgp} | Bin
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ rename test/{pubring.gpg => public_keys.pgp} (100%)
+ rename test/{secring.gpg => secret_keys.pgp} (100%)
+
+diff --git a/t/000_setup.t b/t/000_setup.t
+index 7f7f7b0..a8e3042 100644
+--- a/t/000_setup.t
++++ b/t/000_setup.t
+@@ -19,7 +19,7 @@ TEST
+     copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
+     reset_handles();
+ 
+-    my $pid = $gnupg->import_keys(command_args => [ 'test/pubring.gpg', 'test/secring.gpg' ],
++    my $pid = $gnupg->import_keys(command_args => [ 'test/public_keys.pgp', 'test/secret_keys.pgp' ],
+                                   options => [ 'batch'],
+                                   handles => $handles);
+     waitpid $pid, 0;
+diff --git a/test/pubring.gpg b/test/public_keys.pgp
+similarity index 100%
+rename from test/pubring.gpg
+rename to test/public_keys.pgp
+diff --git a/test/secring.gpg b/test/secret_keys.pgp
+similarity index 100%
+rename from test/secring.gpg
+rename to test/secret_keys.pgp
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0014-fix-spelling-s-convience-convenience.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0014-fix-spelling-s-convience-convenience.patch
new file mode 100644
index 000000000000..ee809b61d754
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0014-fix-spelling-s-convience-convenience.patch
@@ -0,0 +1,53 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 11 Oct 2016 20:25:48 -0400
+Subject: fix spelling: s/convience/convenience/
+
+---
+ README                 | 4 ++--
+ lib/GnuPG/Interface.pm | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/README b/README
+index ed94ede..a05ef9b 100644
+--- a/README
++++ b/README
+@@ -143,7 +143,7 @@ OBJECT METHODS
+         does not come into play. If the passphrase data member handle of the
+         handles object is not defined, but the the passphrase data member
+         handle of GnuPG::Interface object is, GnuPG::Interface will handle
+-        passing this information into GnuPG for the user as a convience.
++        passing this information into GnuPG for the user as a convenience.
+         Note that this will result in GnuPG::Interface storing the
+         passphrase in memory, instead of having it simply 'pass-through' to
+         GnuPG via a handle.
+@@ -271,7 +271,7 @@ EXAMPLES
+                                        );
+ 
+       # indicate our pasphrase through the
+-      # convience method
++      # convenience method
+       $gnupg->passphrase( $passphrase );
+ 
+       # this sets up the communication
+diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
+index 6eaef7d..29205f0 100644
+--- a/lib/GnuPG/Interface.pm
++++ b/lib/GnuPG/Interface.pm
+@@ -1008,7 +1008,7 @@ and so this information is not generated and does not come into play.
+ If the B<passphrase> data member handle of the B<handles> object
+ is not defined, but the the B<passphrase> data member handle of GnuPG::Interface
+ object is, GnuPG::Interface will handle passing this information into GnuPG
+-for the user as a convience.  Note that this will result in
++for the user as a convenience.  Note that this will result in
+ GnuPG::Interface storing the passphrase in memory, instead of having
+ it simply 'pass-through' to GnuPG via a handle.
+ 
+@@ -1175,7 +1175,7 @@ The following setup can be done before any of the following examples:
+ 				   );
+ 
+   # indicate our pasphrase through the
+-  # convience method
++  # convenience method
+   $gnupg->passphrase( $passphrase );
+ 
+   # this sets up the communication
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0015-added-new-secret-key-with-different-passphrase.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0015-added-new-secret-key-with-different-passphrase.patch
new file mode 100644
index 000000000000..fcf20c1b9d1c
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0015-added-new-secret-key-with-different-passphrase.patch
@@ -0,0 +1,117 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 11 Oct 2016 20:59:43 -0400
+Subject: added new secret key with different passphrase
+
+Adding a new secret key with a different passphrase should allow us to
+differentiate between passing the passphrase explicitly and relying on
+the agent + pinentry.
+---
+ t/000_setup.t                  |  2 +-
+ test/new_secret.pgp            | 58 ++++++++++++++++++++++++++++++++++++++++++
+ test/secret-keys/1.0.test      |  4 +++
+ test/secret-keys/1.modern.test |  5 ++++
+ 4 files changed, 68 insertions(+), 1 deletion(-)
+ create mode 100644 test/new_secret.pgp
+
+diff --git a/t/000_setup.t b/t/000_setup.t
+index a8e3042..b183241 100644
+--- a/t/000_setup.t
++++ b/t/000_setup.t
+@@ -19,7 +19,7 @@ TEST
+     copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
+     reset_handles();
+ 
+-    my $pid = $gnupg->import_keys(command_args => [ 'test/public_keys.pgp', 'test/secret_keys.pgp' ],
++    my $pid = $gnupg->import_keys(command_args => [ 'test/public_keys.pgp', 'test/secret_keys.pgp', 'test/new_secret.pgp' ],
+                                   options => [ 'batch'],
+                                   handles => $handles);
+     waitpid $pid, 0;
+diff --git a/test/new_secret.pgp b/test/new_secret.pgp
+new file mode 100644
+index 0000000..5feb72c
+--- /dev/null
++++ b/test/new_secret.pgp
+@@ -0,0 +1,58 @@
++-----BEGIN PGP PRIVATE KEY BLOCK-----
++
++lQPGBFf9iNIBCACZGF36JFTAggUJK85gweUquqh0kvVQICUtyiHXFXBBPzCK+RWL
++oc5yeOfILHH7FfOztwPH1oJ7SWQtOgpuoiMHPtF7ne+MYevMf9jTYb/xCT0yZID5
++/ieoHwUQQPiowxGewOww23RLQ1Cf46nqGBUD+fsWwT2Eq6ojLp/H72h+2lQ1ZCWd
++Q/9MSQQgDo5tWptokFGmLBKCS59pYMBaLbKSj7lFa/ekPm9zhcdmmLrLHCS9rIUP
++VKlWAg02MVmMB4fYm9nbtuwYHWvbDFYzpVr2WNlRZlPy0Y46ahxFbFwhtmOJAgT1
++tgaQtDXo3kXRXngYZstDfe61Hqmc44j1vJ4VABEBAAH+BwMCnvb4v9vnhhzmdZdJ
++EzK3ikXYQp3PcOMDlRE5qtBmXhOJXH2tdEmXjegjWGA501eeoks0VnpBba2m4B36
++Z37fjpOEi4QOuTn6emVwijJZgmmTAC7JHNzAW+IsiRvk/2907UZCwa/1UQpC0bik
++pHTZx+yKp33vGbkbCkKgHFQoHcS9D1by0WOkaLSlcE9CUCKb5LCe2Q1KDwZGrg60
++4WUvg9eM2eatixAyOJEoRONlXDcQnUhSnG5+TUPNhVVWIaM/tPAgYmBG5oCSJ/N0
++ls8cXoOVup/itBHo2Bfn+nyh0OAWdgdVmB0rPYUCLJV0FiQx5tB59OHmA3Naokj5
++rvumyklCg314NnkEXrbPq7kKbX0X8UPoXdzAmalb4++OhgzEwd3NkWxvFSxKkQAt
++XAU5i9XNHJXLwATAMlEaXMBmfcpjyIx4WpBUSmYMTjh0Nu5ee+kGvMY9fUxOKbet
++IS9agFSMwVNRsX91+pKtBCQc7Je5tIrLhC8Hbvotn0GA8iFgu6LBqkrUO9Rh30Xs
++vzz3oXm7WgHbL30m9h+rJ2dmPZOwmW/0zRUec/7alizx0T4sLx7T0qUPUxeEjkeU
++JWtqfrcXEc3xIR9r5S2xqsUSKx6h1UhHMeMtQaDBgeH/Syq7a2gnkNoY84xxojGj
++lGkis5PF3xFpYqvjY0thyPFNxQguRlqktN8gNB+V1dShbCpNI9bDzv4pzvogEiM0
++EM/xvJSCkARCe6nqOugWV8j5f3+9tuyREqcidHq+PR+USoNYdUWQO14kPY6e62wO
++lC5B4G7TDQtigCfOyEOiPXYC/qnC8sPVR2u5bCYm2YJT7L+rYRLSN+628qz7BwH3
++9XtpnRtBFWpjI5qjn4uMM42e3k5UVB/r4GyrLXhEuO8D81TVzRQhjiqLweguk73h
++VDjEd0yachHbtCxHbnVQRzo6SW50ZXJmYWNlIFRlc3Qga2V5IDx0ZXN0QGV4YW1w
++bGUub3JnPokBNwQTAQgAIQUCV/2I0gIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIX
++gAAKCRAbkTzptnR93EZkB/9groVsVMBJtGP1GSFMg2Q9loyijXT2P6hCbUTS4YMz
++O4jQPB8UQ39XIhyWo7hVGsXeA777+7VTto7q0CG9Ph7FTGKK8W2AnzTUKNdXAC6h
++qIc+ymvlm71GxhkKFR0vDbFg6CLJ/MX/x1Bd0TKh4RZtgOqX6A7Pzw/AI7f2YJcJ
++BKPT+/q/F/Wp1r+mxZ5pxUvYm643GVzdnbtuoqgBLng/3n1zjIz+oIz6RGBjzHni
++3TUTKe//ewn1lIdTxPdUZA9G4vTE5dCnM4MHTxQSXA+aUexuONswQhiANtfVCW8c
++sf9MQpkQ/Vqv9hfeYwH4pJ8IPK1No9F0a0fvnq2JaX4gnQPGBFf9iNIBCADEQ6HK
++s5tWN2Ph/3A6D0A2nSc6m1Mh/AXhdptka0aPhhVgspCmQ1lJP/Kdf6AnlCi6u1G7
++QXvGX8OtbKNosLi91nIqvNwckUOvXrLcAk/epkmidopOuHUZhE+1UaLKs7UssBOe
++TQTtADdl2786E3qbtaNrjDTvbNesU1DEZjNoBWfKYHZYv2wCF170Lwzp7NJhAueO
++bTwfUO8EusST6d1NYB0zFxbBi60/hJHCfcAuaSn00jFQ+kj8m7jXCgcyB+1+25d2
++gpPbs19S4pi9f7eQflhglm0wB13C6yl+YgwVZQxU/fU70jgSYhkXNPx5bEN3WGkg
++4hnP53hrsI4p3se1ABEBAAH+BwMCAppvwSTp9Y/mu317D14a9k6m/zC2LrzPx6dl
++P3GtDJUCs1CVH/wXsUxLY4hAgS188xPhNLuIWuXwQ7qX7E8kanxgPqeK7NTAPKxH
++CEqJPevFRBtftHq3zqZZF9CHXulDO3KkWxIHANMclq+zcUotrc4GXIxeYjewXv9p
++tzKEjlt27Q00VvwRM7JVxBlC3xJvKXf6zyRoUt2/Clq+CFkb2s+dAzCI52o7tlB9
++El84sTIlJr0+b6+GcwrKonS8HcGUECfYmSiIiNmxlkJ/4OabDlDYlzvmCYv2pMjc
++Bif70Dowb8TBD/iTFLPY2lkhqBFi3Bcqc51MVecaQk3rRbVyOqhvGaRE084/LmkN
++gkE6vQKRSbzRmYwyKC/QUKOW5qbl5Jf3lrjVeM5tEnvJeRCfZEokKjIZul4nX4dK
++zxH+l+sCUA+RnEeGB2y1yhnPkP4dYHEb8iMLINqXQd18FpBFSs9yv9tFWJhdblUK
++SiS8DXmuoZI2Mk8yMZ0j0bi8mu9eh52dqYgBGD7TgjP5vpYU/zbtpNgMP0Zvne1X
++gig6NKK1+3VAZaiOvYUUHZERJGp/eggTtF66cD/0EHJjoZ/0pAciEvWYUyXWVBdj
++eVWBZE/RVOwrTMBVtrxQsPJ3sfeGlLt21IZYKathTZ/dn5PSlU+i4f9VyC/hHd8S
++xouQU3nB//ihbrR65YH5E53e8+jPaRtFvLbcqmY8YftV0y/5BZwduZoxcOtxD3A0
++J/2GVpUhs3WngCksdUAEbrEXzKKSOC7b4KDw2sTIT5xHra4CBK5L5N85ny8tG7A6
++wmTt+6PHo51gx/W/0jiMB3rEiGoTZ86uWLaGv5SgqLP49euCIEXNKK9srFK3o7QE
++04upH9zOXR8ytvPOLy/K5zT6YH2eyNs19sWfjAfP/bxhnrDYajsZ2WKZiQEfBBgB
++CAAJBQJX/YjSAhsMAAoJEBuRPOm2dH3c+6kH+wWoEqTlPdPLZcTN8I5a6HHD0Ul8
++7xt3OtiRFoMD2M+zgLvImaj8AULap4w/0G+J+7PCUER8JhcePSzLbizfpTczbDP2
++E1LhEM8IBE6GT8yL8VB9AL1xW+hXIi5sWW/f900deOhoh7ikrP7KxT0c8zQjaaqV
++n6bio93CvZ3yBqMO20apwWDyiSoBpXVjLrW00BdL8i9Rsf6v5UwIIy9o7pfjK5zo
++mAZM2dKzlp9z4q5P6yE4aXI0bHz+XvG7hdpkHmjG5A+EQCnN2qoDNIA4QiRhH8TQ
++aTaj4AlCiCAV2hEelPYve5QKccAsfC//qr+FMF+0bhZa05X2afxLYtku0Ms=
++=ftgB
++-----END PGP PRIVATE KEY BLOCK-----
+diff --git a/test/secret-keys/1.0.test b/test/secret-keys/1.0.test
+index 129d472..f8239a9 100644
+--- a/test/secret-keys/1.0.test
++++ b/test/secret-keys/1.0.test
+@@ -5,3 +5,7 @@ uid                  GnuPG test key (for testing purposes only)
+ uid                  Foo Bar (1)
+ ssb    768g/2E854A6B 2000-02-06
+ 
++sec   2048R/B6747DDC 2016-10-12
++uid                  GnuPG::Interface Test key <test@example.org>
++ssb   2048R/AE441D0F 2016-10-12
++
+diff --git a/test/secret-keys/1.modern.test b/test/secret-keys/1.modern.test
+index 3e46407..42b27a1 100644
+--- a/test/secret-keys/1.modern.test
++++ b/test/secret-keys/1.modern.test
+@@ -6,3 +6,8 @@ uid           [ unknown] GnuPG test key (for testing purposes only)
+ uid           [ unknown] Foo Bar (1)
+ ssb   elg768 2000-02-06 [E]
+ 
++sec   rsa2048 2016-10-12 [SC]
++      278F850AA702911F1318F0A61B913CE9B6747DDC
++uid           [ unknown] GnuPG::Interface Test key <test@example.org>
++ssb   rsa2048 2016-10-12 [E]
++
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch
new file mode 100644
index 000000000000..21e6294efaed
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch
@@ -0,0 +1,302 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 11 Oct 2016 21:29:22 -0400
+Subject: Test use of gpg without explicit passphrase (agent+pinentry)
+
+The modern GnuPG suite encourages the use of gpg-agent to control
+access to secret key material.  In this use case, we avoid setting an
+explicit passphrase in code, and rely on either a correctly-configured
+and primed gpg-agent or a dedicated pinentry program to supply the
+passphrase.
+
+This additional test verifies that the passphrase can be handled by
+the agent.  Note that the passphrase for this additional test key is
+*not* the default passphrase, so this test should fail in the event
+that gpg can't use the agent and the pinentry for this task.
+
+Unfortunately, this all assumes that we're using GnuPG "Modern".  I've
+noted concerns about writing forward- and backward-compatible bindings
+for GnuPG here:
+https://lists.gnupg.org/pipermail/gnupg-devel/2016-October/031800.html
+---
+ README                 | 41 +++++++++++++++++++++++++++--------------
+ lib/GnuPG/Interface.pm | 26 +++++++++++++++++++++++++-
+ t/MyTestSpecific.pm    | 10 ++++++++--
+ t/decrypt.t            | 27 +++++++++++++++++++++++++++
+ test/encrypted.2.gpg   | 12 ++++++++++++
+ test/fake-pinentry.pl  |  2 +-
+ test/plain.2.txt       |  1 +
+ 7 files changed, 101 insertions(+), 18 deletions(-)
+ create mode 100644 test/encrypted.2.gpg
+ create mode 100644 test/plain.2.txt
+
+diff --git a/README b/README
+index a05ef9b..be06ef3 100644
+--- a/README
++++ b/README
+@@ -5,7 +5,7 @@ SYNOPSIS
+       # A simple example
+       use IO::Handle;
+       use GnuPG::Interface;
+-  
++
+       # setting up the situation
+       my $gnupg = GnuPG::Interface->new();
+       $gnupg->options->hash_init( armor   => 1,
+@@ -24,7 +24,7 @@ SYNOPSIS
+       # Now we'll go about encrypting with the options already set
+       my @plaintext = ( 'foobar' );
+       my $pid = $gnupg->encrypt( handles => $handles );
+-  
++
+       # Now we write to the input of GnuPG
+       print $input @plaintext;
+       close $input;
+@@ -140,13 +140,26 @@ OBJECT METHODS
+         standard error, standard output, or standard error. If the status or
+         logger handle is not defined, this channel of communication is never
+         established with GnuPG, and so this information is not generated and
+-        does not come into play. If the passphrase data member handle of the
+-        handles object is not defined, but the the passphrase data member
+-        handle of GnuPG::Interface object is, GnuPG::Interface will handle
+-        passing this information into GnuPG for the user as a convenience.
+-        Note that this will result in GnuPG::Interface storing the
+-        passphrase in memory, instead of having it simply 'pass-through' to
+-        GnuPG via a handle.
++        does not come into play.
++
++        If the passphrase data member handle of the handles object is not
++        defined, but the the passphrase data member handle of
++        GnuPG::Interface object is, GnuPG::Interface will handle passing
++        this information into GnuPG for the user as a convenience. Note that
++        this will result in GnuPG::Interface storing the passphrase in
++        memory, instead of having it simply 'pass-through' to GnuPG via a
++        handle.
++
++        If neither the passphrase data member of the GnuPG::Interface nor
++        the passphrase data member of the handles object is defined, then
++        GnuPG::Interface assumes that access and control over the secret key
++        will be handled by the running gpg-agent process. This represents
++        the simplest mode of operation with the GnuPG "modern" suite
++        (version 2.1 and later). It is also the preferred mode for tools
++        intended to be user-facing, since the user will be prompted directly
++        by gpg-agent for use of the secret key material. Note that for
++        programmatic use, this mode requires the gpg-agent and pinentry to
++        already be correctly configured.
+ 
+   Other Methods
+     get_public_keys( @search_strings )
+@@ -241,7 +254,7 @@ EXAMPLES
+ 
+       my $handles = GnuPG::Handles->new( stdin    => $input,
+                                          stdout   => $output );
+-   
++
+       # this sets up the communication
+       # Note that the recipients were specified earlier
+       # in the 'options' data member of the $gnupg object.
+@@ -315,7 +328,7 @@ EXAMPLES
+       # a file written to disk
+       # Make sure you "use IO::File" if you use this module!
+       my $cipher_file = IO::File->new( 'encrypted.gpg' );
+-   
++
+       # this sets up the communication
+       my $pid = $gnupg->decrypt( handles => $handles );
+ 
+@@ -346,7 +359,7 @@ EXAMPLES
+       # This time we'll just let GnuPG print to our own output
+       # and read from our input, because no input is needed!
+       my $handles = GnuPG::Handles->new();
+-  
++
+       my @ids = ( 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' );
+ 
+       # this time we need to specify something for
+@@ -354,7 +367,7 @@ EXAMPLES
+       # search ids as arguments
+       my $pid = $gnupg->list_public_keys( handles      => $handles,
+                                           command_args => [ @ids ] );
+-  
++
+        waitpid $pid, 0;
+ 
+   Creating GnuPG::PublicKey Objects
+@@ -372,7 +385,7 @@ EXAMPLES
+           command_args => [ qw( test/key.1.asc ) ],
+           handles      => $handles,
+         );
+-    
++
+         my @out = <$handles->stdout()>;
+         waitpid $pid, 0;
+ 
+diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
+index 29205f0..5d8b0ec 100644
+--- a/lib/GnuPG/Interface.pm
++++ b/lib/GnuPG/Interface.pm
+@@ -106,6 +106,14 @@ sub fork_attach_exec( $% ) {
+     my ( $self, %args ) = @_;
+ 
+     my $handles = $args{handles} or croak 'no GnuPG::Handles passed';
++    my $use_loopback_pinentry = 0;
++
++    # WARNING: this assumes that we're using the "modern" GnuPG suite
++    # -- version 2.1.x or later.  It's not clear to me how we can
++    # safely and efficiently avoid this assumption (see
++    # https://lists.gnupg.org/pipermail/gnupg-devel/2016-October/031800.html)
++    $use_loopback_pinentry = 1
++      if ($handles->passphrase());
+ 
+     # deprecation support
+     $args{commands} ||= $args{gnupg_commands};
+@@ -293,8 +301,12 @@ sub fork_attach_exec( $% ) {
+             $self->options->$option($fileno);
+         }
+ 
++        my @args = $self->options->get_args();
++        push @args, '--pinentry-mode', 'loopback'
++          if $use_loopback_pinentry;
++
+         my @command = (
+-            $self->call(), $self->options->get_args(),
++            $self->call(), @args,
+             @commands,     @command_args
+         );
+ 
+@@ -1005,6 +1017,7 @@ and standard error will be tied to the running program's standard error,
+ standard output, or standard error.  If the B<status> or B<logger> handle
+ is not defined, this channel of communication is never established with GnuPG,
+ and so this information is not generated and does not come into play.
++
+ If the B<passphrase> data member handle of the B<handles> object
+ is not defined, but the the B<passphrase> data member handle of GnuPG::Interface
+ object is, GnuPG::Interface will handle passing this information into GnuPG
+@@ -1012,6 +1025,17 @@ for the user as a convenience.  Note that this will result in
+ GnuPG::Interface storing the passphrase in memory, instead of having
+ it simply 'pass-through' to GnuPG via a handle.
+ 
++If neither the B<passphrase> data member of the GnuPG::Interface nor
++the B<passphrase> data member of the B<handles> object is defined,
++then GnuPG::Interface assumes that access and control over the secret
++key will be handled by the running gpg-agent process.  This represents
++the simplest mode of operation with the GnuPG "modern" suite (version
++2.1 and later).  It is also the preferred mode for tools intended to
++be user-facing, since the user will be prompted directly by gpg-agent
++for use of the secret key material.  Note that for programmatic use,
++this mode requires the gpg-agent and pinentry to already be correctly
++configured.
++
+ =back
+ 
+ =head2 Other Methods
+diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
+index c8764cc..e513c25 100644
+--- a/t/MyTestSpecific.pm
++++ b/t/MyTestSpecific.pm
+@@ -55,9 +55,15 @@ struct( Text => { fn => "\$", fh => "\$", data => "\$" } );
+ $texts{plain} = Text->new();
+ $texts{plain}->fn( 'test/plain.1.txt' );
+ 
++$texts{alt_plain} = Text->new();
++$texts{alt_plain}->fn( 'test/plain.2.txt' );
++
+ $texts{encrypted} = Text->new();
+ $texts{encrypted}->fn( 'test/encrypted.1.gpg' );
+ 
++$texts{alt_encrypted} = Text->new();
++$texts{alt_encrypted}->fn( 'test/encrypted.2.gpg' );
++
+ $texts{signed} = Text->new();
+ $texts{signed}->fn( 'test/signed.1.asc' );
+ 
+@@ -68,7 +74,7 @@ $texts{temp} = Text->new();
+ $texts{temp}->fn( 'test/temp' );
+ 
+ 
+-foreach my $name ( qw( plain encrypted signed key ) )
++foreach my $name ( qw( plain alt_plain encrypted alt_encrypted signed key ) )
+ {
+     my $entry = $texts{$name};
+     my $filename = $entry->fn();
+@@ -90,7 +96,7 @@ sub reset_handles
+         stderr  => $stderr
+       );
+ 
+-    foreach my $name ( qw( plain encrypted signed key ) )
++    foreach my $name ( qw( plain alt_plain encrypted alt_encrypted signed key ) )
+     {
+         my $entry = $texts{$name};
+         my $filename = $entry->fn();
+diff --git a/t/decrypt.t b/t/decrypt.t
+index b2639ed..ee41448 100644
+--- a/t/decrypt.t
++++ b/t/decrypt.t
+@@ -58,3 +58,30 @@ TEST
+ {
+     return compare( $texts{plain}->fn(), $texts{temp}->fn() ) == 0;
+ };
++
++
++# test without default_passphrase (that is, by using the agent)
++TEST
++{
++    reset_handles();
++
++    $handles->stdin( $texts{alt_encrypted}->fh() );
++    $handles->options( 'stdin' )->{direct} = 1;
++
++    $handles->stdout( $texts{temp}->fh() );
++    $handles->options( 'stdout' )->{direct} = 1;
++
++    $gnupg->clear_passphrase();
++
++    my $pid = $gnupg->decrypt( handles => $handles );
++
++    waitpid $pid, 0;
++
++    return $CHILD_ERROR == 0;
++};
++
++
++TEST
++{
++    return compare( $texts{alt_plain}->fn(), $texts{temp}->fn() ) == 0;
++};
+diff --git a/test/encrypted.2.gpg b/test/encrypted.2.gpg
+new file mode 100644
+index 0000000..105cbb3
+--- /dev/null
++++ b/test/encrypted.2.gpg
+@@ -0,0 +1,12 @@
++-----BEGIN PGP MESSAGE-----
++
++hQEMAw3NS2KuRB0PAQgAuCMQO6blPRIJZib+kDa51gac+BYPl8caXYTLqIHtiz2/
++YRVqePJON4lNAqT6qUksIzQHtejFO6tb1SLqgX9Ti+fKAMLrQw9VGOYaJFoRrTJs
+++X33S4GHVVikRTu0dydAsekbfPSc2nRmTFUlSEV3psgAmg9xy8KA6cZroK9Xfcuh
++xW7KLE0hLP+2NZ7zNmJMdu6LDGzvlQsnm1UeElXK8XdMGf8kA3R+GgeeOnR/oEQc
++Uep77k/fLc+UV4fp9Dk1OBeg3Ko/irSaefk4mU7F4HmS8jIERHRvXBTiur1Zx8Nx
++9U3fcQuc+P9+JC89iS4PJPF1Hr0MlezAghZYJrhOrtJIAe5Uaft5KMGRfy0VQnAs
++MHqGnGtzzVWK6GK83ibgG4tTfPEHHIgNFsJf3rM4cWklUmCS9TeeDJJZfhnRA6+/
++X82e6OI7QNbO
++=DlGE
++-----END PGP MESSAGE-----
+diff --git a/test/fake-pinentry.pl b/test/fake-pinentry.pl
+index 12d3611..40b8b08 100755
+--- a/test/fake-pinentry.pl
++++ b/test/fake-pinentry.pl
+@@ -21,7 +21,7 @@ while (<STDIN>) {
+   chomp;
+   next if (/^$/);
+   next if (/^#/);
+-  print ("D test\n") if (/^getpin/i);
++  print ("D supercalifragilisticexpialidocious\n") if (/^getpin/i);
+   print "OK\n";
+   exit if (/^bye/i);
+ }
+diff --git a/test/plain.2.txt b/test/plain.2.txt
+new file mode 100644
+index 0000000..da5a1d5
+--- /dev/null
++++ b/test/plain.2.txt
+@@ -0,0 +1 @@
++test message
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch
new file mode 100644
index 000000000000..2f20f1455397
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch
@@ -0,0 +1,42 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Thu, 25 May 2017 16:07:45 -0400
+Subject: Kill any GnuPG agent before and after the test suite.
+
+This helps to ensure that the test suite daemon is started fresh at
+every test suite run.  And it also avoids leaving a daemon running
+after the test suite, assuming the test suite manages to reach the
+end.
+
+This is considered a reasonable practice by upstream.
+---
+ t/000_setup.t   | 3 +++
+ t/zzz_cleanup.t | 2 ++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/t/000_setup.t b/t/000_setup.t
+index b183241..4dc4329 100644
+--- a/t/000_setup.t
++++ b/t/000_setup.t
+@@ -17,6 +17,9 @@ TEST
+     $agentconf->write("pinentry-program " . getcwd() . "/test/fake-pinentry.pl\n");
+     $agentconf->close();
+     copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
++    # reset the state of any long-lived gpg-agent, ignoring errors:
++    system('gpgconf', '--homedir=test/gnupghome', '--quiet', '--kill', 'gpg-agent');
++
+     reset_handles();
+ 
+     my $pid = $gnupg->import_keys(command_args => [ 'test/public_keys.pgp', 'test/secret_keys.pgp', 'test/new_secret.pgp' ],
+diff --git a/t/zzz_cleanup.t b/t/zzz_cleanup.t
+index 5c03a72..eea3a48 100644
+--- a/t/zzz_cleanup.t
++++ b/t/zzz_cleanup.t
+@@ -12,6 +12,8 @@ use File::Path qw (remove_tree);
+ TEST
+ {
+     my $err = [];
++    # kill off any long-lived gpg-agent, ignoring errors:
++    system('gpgconf', '--homedir=test/gnupghome', '--quiet', '--kill', 'gpg-agent');
+     remove_tree('test/gnupghome', {error => \$err});
+     return ! @$err;
+ };
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch
new file mode 100644
index 000000000000..457a5e74d532
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch
@@ -0,0 +1,110 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 26 May 2017 09:51:40 -0400
+Subject: Use a short temporary homedir during the test suite
+
+This avoids problems with the length of the path to the homedir as
+compared to the size limits of sockaddr_un.sun_path, particularly on
+systems where /run/user/$(id -u) is not present or available (such as
+many minimalist build environments).
+---
+ t/000_setup.t        |  9 +++++----
+ t/MyTestSpecific.pm  | 18 +++++++++++++++++-
+ t/list_secret_keys.t |  3 ++-
+ t/zzz_cleanup.t      |  6 ++++--
+ 4 files changed, 28 insertions(+), 8 deletions(-)
+
+diff --git a/t/000_setup.t b/t/000_setup.t
+index 4dc4329..82d7005 100644
+--- a/t/000_setup.t
++++ b/t/000_setup.t
+@@ -12,13 +12,14 @@ use File::Copy;
+ 
+ TEST
+ {
+-    make_path('test/gnupghome', { mode => 0700 });
+-    my $agentconf = IO::File->new( "> test/gnupghome/gpg-agent.conf" );
++    my $homedir = $gnupg->options->homedir();
++    make_path($homedir, { mode => 0700 });
++    my $agentconf = IO::File->new( "> " . $homedir . "/gpg-agent.conf" );
+     $agentconf->write("pinentry-program " . getcwd() . "/test/fake-pinentry.pl\n");
+     $agentconf->close();
+-    copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
++    copy('test/gpg.conf', $homedir . '/gpg.conf');
+     # reset the state of any long-lived gpg-agent, ignoring errors:
+-    system('gpgconf', '--homedir=test/gnupghome', '--quiet', '--kill', 'gpg-agent');
++    system('gpgconf', '--homedir', $homedir, '--quiet', '--kill', 'gpg-agent');
+ 
+     reset_handles();
+ 
+diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
+index e513c25..809d55c 100644
+--- a/t/MyTestSpecific.pm
++++ b/t/MyTestSpecific.pm
+@@ -22,6 +22,7 @@ use IO::Seekable;
+ use File::Compare;
+ use Exporter;
+ use Class::Struct;
++use File::Temp qw (tempdir);
+ 
+ use GnuPG::Interface;
+ use GnuPG::Handles;
+@@ -40,10 +41,25 @@ use vars qw( @ISA           @EXPORT
+ 
+ $gnupg = GnuPG::Interface->new( passphrase => 'test' );
+ 
++
++my $homedir;
++if (-f "test/gnupghome") {
++  my $record = IO::File->new( "< test/gnupghome" );
++  $homedir = <$record>;
++  $record->close();
++} else {
++  $homedir = tempdir( DIR => '/tmp');
++  my $record = IO::File->new( "> test/gnupghome" );
++  $record->write($homedir);
++  $record->close();
++}
++
+ my @version = split('\.', $gnupg->version());
+ $gpg_is_modern = ($version[0] > 2 || ($version[0] == 2 && $version[1] >= 1));
+ 
+-$gnupg->options->hash_init( homedir              => 'test/gnupghome',
++
++
++$gnupg->options->hash_init( homedir              => $homedir,
+                             armor                => 1,
+                             meta_interactive     => 0,
+                             meta_signing_key_id  => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
+diff --git a/t/list_secret_keys.t b/t/list_secret_keys.t
+index 7040c38..d1e3f30 100644
+--- a/t/list_secret_keys.t
++++ b/t/list_secret_keys.t
+@@ -23,8 +23,9 @@ TEST
+     $outfile = 'test/secret-keys/1.out';
+     my $out = IO::File->new( "> $outfile" )
+       or die "cannot open $outfile for writing: $ERRNO";
++    my $modern_pubring_line = $gnupg->options->homedir() . "/pubring.kbx\n";
+     while (<$stdout>) {
+-      if ($gpg_is_modern && /^\/.*\/test\/gnupghome\/pubring.kbx$/) {
++      if ($gpg_is_modern && ($_ eq $modern_pubring_line)) {
+         $out->print("test/gnupghome/pubring.kbx\n");
+       } elsif ($gpg_is_modern && /^--*$/) {
+         $out->print("--------------------------\n");
+diff --git a/t/zzz_cleanup.t b/t/zzz_cleanup.t
+index eea3a48..c3ec16f 100644
+--- a/t/zzz_cleanup.t
++++ b/t/zzz_cleanup.t
+@@ -11,9 +11,11 @@ use File::Path qw (remove_tree);
+ # this is actually no test, just cleanup.
+ TEST
+ {
++    my $homedir = $gnupg->options->homedir();
+     my $err = [];
+     # kill off any long-lived gpg-agent, ignoring errors:
+-    system('gpgconf', '--homedir=test/gnupghome', '--quiet', '--kill', 'gpg-agent');
+-    remove_tree('test/gnupghome', {error => \$err});
++    system('gpgconf', '--homedir', $homedir, '--quiet', '--kill', 'gpg-agent');
++    remove_tree($homedir, {error => \$err});
++    unlink('test/gnupghome');
+     return ! @$err;
+ };
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch
new file mode 100644
index 000000000000..ae6143190de3
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch
@@ -0,0 +1,51 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Fri, 26 May 2017 18:15:24 -0400
+Subject: Make things work with gpg1 (assuming plain 'gpg' is modern)
+
+ * avoid sending --pinentry-mode=loopback if gpg is invoked as gpg1
+ * fix up t/list_secret_keys to account for the varied output
+ * t/decrypt.t still fails two agent-only tests, but presumably folks
+   who use gpg1 are not expecting to use the agent.
+---
+ lib/GnuPG/Interface.pm | 5 ++++-
+ t/list_secret_keys.t   | 9 +++++----
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
+index 5d8b0ec..f80ead5 100644
+--- a/lib/GnuPG/Interface.pm
++++ b/lib/GnuPG/Interface.pm
+@@ -112,8 +112,11 @@ sub fork_attach_exec( $% ) {
+     # -- version 2.1.x or later.  It's not clear to me how we can
+     # safely and efficiently avoid this assumption (see
+     # https://lists.gnupg.org/pipermail/gnupg-devel/2016-October/031800.html)
++    #
++    # as a (brittle and incomplete) cleanup, we will avoid trying to
++    # send pinentry-loopback if the program is invoked as "gpg1"
+     $use_loopback_pinentry = 1
+-      if ($handles->passphrase());
++      if ($handles->passphrase() && ! ($self->call =~ m/gpg1$/));
+ 
+     # deprecation support
+     $args{commands} ||= $args{gnupg_commands};
+diff --git a/t/list_secret_keys.t b/t/list_secret_keys.t
+index d1e3f30..8e3c911 100644
+--- a/t/list_secret_keys.t
++++ b/t/list_secret_keys.t
+@@ -23,11 +23,12 @@ TEST
+     $outfile = 'test/secret-keys/1.out';
+     my $out = IO::File->new( "> $outfile" )
+       or die "cannot open $outfile for writing: $ERRNO";
+-    my $modern_pubring_line = $gnupg->options->homedir() . "/pubring.kbx\n";
++    my $seckey_file = $gpg_is_modern ? 'pubring.kbx' : 'secring.gpg';
++    my $pubring_line = $gnupg->options->homedir() . '/' . $seckey_file . "\n";
+     while (<$stdout>) {
+-      if ($gpg_is_modern && ($_ eq $modern_pubring_line)) {
+-        $out->print("test/gnupghome/pubring.kbx\n");
+-      } elsif ($gpg_is_modern && /^--*$/) {
++      if ($_ eq $pubring_line) {
++        $out->print('test/gnupghome/'.$seckey_file."\n");
++      } elsif (/^--*$/) {
+         $out->print("--------------------------\n");
+       } else {
+         $out->print( $_ );
diff --git a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
index d04c93c30295..866a52a79a1c 100644
--- a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
+++ b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generate Recursive-Descent Parsers"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test examples"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild
index 2ffbe8e70b6a..4ea201c0f635 100644
--- a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild
+++ b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Apparently run a function in a higher stack frame"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="virtual/perl-Carp"
diff --git a/dev-perl/Text-CSV/Text-CSV-1.940.0.ebuild b/dev-perl/Text-CSV/Text-CSV-1.940.0.ebuild
index 0425e0bd7f1e..4a64f863e321 100644
--- a/dev-perl/Text-CSV/Text-CSV-1.940.0.ebuild
+++ b/dev-perl/Text-CSV/Text-CSV-1.940.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Manipulate comma-separated value strings"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
 IUSE="test +xs"
 
 RDEPEND="
diff --git a/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild b/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
index 8d689c1dc9ae..ce6a91c137d0 100644
--- a/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
+++ b/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base class SAX Drivers and Filters"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.640.0.ebuild b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.640.0.ebuild
index 27c2db8c8fb8..f181d0b0b245 100644
--- a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.640.0.ebuild
+++ b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.640.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl YAML Serialization using XS and libyaml"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild b/dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild
index 3100ddaaab4b..c2db745a1ed5 100644
--- a/dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild
+++ b/dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fast, lightweight YAML loader and dumper"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-php/File_Iterator/File_Iterator-1.3.1.ebuild b/dev-php/File_Iterator/File_Iterator-1.3.1.ebuild
deleted file mode 100644
index 842252f79505..000000000000
--- a/dev-php/File_Iterator/File_Iterator-1.3.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PHP_PEAR_URI="pear.phpunit.de"
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_PN="File_Iterator"
-inherit php-pear-lib-r1
-
-DESCRIPTION="FilterIterator implementation that filters files based on a list of suffixes"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-HOMEPAGE="http://www.phpunit.de"
diff --git a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild b/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
index 03524e3b4947..46a825640e34 100644
--- a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-PHP_PEAR_URI="pear.phpunit.de"
+PHP_PEAR_DOMAIN="pear.phpunit.de"
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_PN="File_Iterator"
-inherit php-pear-lib-r1
+PHP_PEAR_PKG_NAME="File_Iterator"
+inherit php-pear-r2
 
 DESCRIPTION="FilterIterator implementation that filters files based on a list of suffixes"
 LICENSE="BSD"
@@ -14,3 +14,5 @@ SLOT="0"
 KEYWORDS="amd64 hppa x86"
 IUSE=""
 HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator"
+SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
+DOCS=( ChangeLog.markdown README.markdown )
diff --git a/dev-php/File_Iterator/Manifest b/dev-php/File_Iterator/Manifest
index 062d82a1fcca..04e56f9594c5 100644
--- a/dev-php/File_Iterator/Manifest
+++ b/dev-php/File_Iterator/Manifest
@@ -1,3 +1,2 @@
-DIST File_Iterator-1.3.1.tgz 5157 SHA256 9a35bf5247c19988bb3033e10bbc2db0e25b174d231082c48f9639b3acb6aca1 SHA512 c5204fc5e10a713d474d5d42e728c0c52b89b214bd8d98c8918bef023511be8c86267c76656667ba49ca9d6252fb9156dc08c712556f49f8e1989ec11016fe7b WHIRLPOOL 4d0187fa41a5a82f5dbb0432c53c5fd2fc3ff73bf4171a1511e5b025e9d71981991bcb892c08ca61a0f692e302a5d5652d831da9d3ce3510678f57a43b08249d
 DIST File_Iterator-1.3.4.tgz 5199 SHA256 6f4ed93fc140aac0abb9d23313fa25c98789855a7d08088256c989a037730f7f SHA512 7117e0e56a9bc533d9f93556366a8026d1e5a9a3894c05551adef6c1e6cd556c1ebf6b96bd98279cb92077b3d8f8d7b7e42f446b39895850e573d0ec511392be WHIRLPOOL 6f7e4a589642ea3b6b0abbbb17b330f504153486b49840472a98cb6bb0fdb53447bdd994d3c112666f8c94ea8737e42bcf079c0785f1564f288319485dbeb1a7
 DIST File_Iterator-1.4.2.tar.gz 4141 SHA256 138c7ba11c72e7aff3cded47b6011fc152405e7b907d28578b95d5b4b7e062a2 SHA512 295943681853c858e3e1c336c030338c61a74169bd2a619da6fca8c43611e587c6f626fa92799d614bcb0a1f86bbb39895b20f2a389107cedb9660a7e792a243 WHIRLPOOL f3ba627a5366badb60df87dc6f0c15990badb5ff9e2bf1b9889c214c6ed36308ec64f076d2442ce3669720a650e1fd3b3337befc0ecc507e4596fb30a2407f88
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.2.13.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.2.13.ebuild
index ad75c711f3ac..501117d4dfdf 100644
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.2.13.ebuild
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.2.13.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-PHP_PEAR_URI="pear.phpunit.de"
+PHP_PEAR_DOMAIN="pear.phpunit.de"
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
 
-inherit php-pear-r1
+inherit php-pear-r2
 
-DESCRIPTION="Provides collection, processing, and rendering functionality for PHP code coverage information"
+DESCRIPTION="Collection, processing, and rendering for PHP code coverage"
 HOMEPAGE="http://pear.phpunit.de"
+SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild b/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild
index fc8f24635df9..e0d5a2764c10 100644
--- a/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild
+++ b/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_URI="pear.phpunit.de"
-PHP_PEAR_PN="PHP_Timer"
+PHP_PEAR_DOMAIN="pear.phpunit.de"
+PHP_PEAR_PKG_NAME="PHP_Timer"
 
-inherit php-pear-lib-r1
+inherit php-pear-r2
 
 DESCRIPTION="Utility class for timing"
 LICENSE="BSD"
@@ -15,3 +15,4 @@ SLOT="0"
 KEYWORDS="amd64 hppa x86"
 IUSE=""
 HOMEPAGE="http://pear.phpunit.de/"
+SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild
index 13336e1b6f58..16306964ba0f 100644
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-PEAR_PV="1.1.3"
 PHP_PEAR_PKG_NAME="PHP_TokenStream"
+PHP_PEAR_DOMAIN="pear.phpunit.de"
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
 
-inherit php-pear-r1
+inherit php-pear-r2
 
 DESCRIPTION="Wrapper around PHP's tokenizer extension"
 HOMEPAGE="http://pear.phpunit.de"
@@ -17,6 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 hppa x86"
 IUSE=""
 
-DEPEND="dev-lang/php[tokenizer]
+DEPEND="dev-lang/php:*[tokenizer]
 	>=dev-php/pear-1.9.4"
 RDEPEND="${DEPEND}"
+DOCS=( README.markdown ChangeLog.markdown )
diff --git a/dev-php/Text_Template/Text_Template-1.1.1.ebuild b/dev-php/Text_Template/Text_Template-1.1.1.ebuild
index bc786224b530..e12d9f8af66a 100644
--- a/dev-php/Text_Template/Text_Template-1.1.1.ebuild
+++ b/dev-php/Text_Template/Text_Template-1.1.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_URI="pear.phpunit.de"
-PHP_PEAR_PN="Text_Template"
+PHP_PEAR_DOMAIN="pear.phpunit.de"
+PHP_PEAR_PKG_NAME="Text_Template"
 
-inherit php-pear-lib-r1
+inherit php-pear-r2
 
 HOMEPAGE="http://pear.phpunit.de"
-
+SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
 DESCRIPTION="Simple template engine"
 LICENSE="BSD"
 SLOT="0"
@@ -18,3 +18,4 @@ KEYWORDS="amd64 hppa x86"
 IUSE=""
 
 DEPEND=">=dev-php/pear-1.9.4"
+DOCS=( README.markdown ChangeLog.markdown )
diff --git a/dev-php/YAML/YAML-1.0.6-r1.ebuild b/dev-php/YAML/YAML-1.0.6-r1.ebuild
deleted file mode 100644
index f0f92a3ddf8a..000000000000
--- a/dev-php/YAML/YAML-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_URI="pear.symfony-project.com"
-PHP_PEAR_PN="YAML"
-
-inherit php-pear-lib-r1
-
-DESCRIPTION="The Symfony YAML Component"
-HOMEPAGE="http://pear.symfony-project.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
diff --git a/dev-php/YAML/YAML-1.0.6-r2.ebuild b/dev-php/YAML/YAML-1.0.6-r3.ebuild
similarity index 62%
rename from dev-php/YAML/YAML-1.0.6-r2.ebuild
rename to dev-php/YAML/YAML-1.0.6-r3.ebuild
index e0c37b93855f..c52a33ba2493 100644
--- a/dev-php/YAML/YAML-1.0.6-r2.ebuild
+++ b/dev-php/YAML/YAML-1.0.6-r3.ebuild
@@ -4,8 +4,8 @@
 EAPI=6
 
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_URI="pear.symfony-project.com"
-PHP_PEAR_PN="YAML"
+PHP_PEAR_DOMAIN="pear.symfony-project.com"
+PHP_PEAR_PKG_NAME="YAML"
 
 inherit php-pear-r2
 
@@ -15,5 +15,12 @@ SRC_URI="http://pear.symfony-project.com/get/${PEAR_P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
+
+src_install() {
+	insinto /usr/share/php/SymfonyComponents/YAML
+	doins lib/*
+	php-pear-r2_install_packagexml
+	einstalldocs
+}
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index f5107d3550ac..eac3d2f29a33 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1 +1 @@
-DIST v5.20.9.tar.gz 464257 SHA256 7948fa04e50aa8a4a228fc0d1f32bd4182c4834b7c20708fdef223d01996e19b SHA512 bc40113012c27b759ff35e7395404d1756720e9daef7df4d33147b9950e9ffd032274ccd8808fe303ba75feeaf727e2deb50fc6d79826db96ce568a70007f30f WHIRLPOOL 2175d476347f694e7d07ac0b886ed6e8d4108b9e223c84e371c963599cc7497dccceb38567c0c775ac138e6a77e126e279ae0f5811b5a4f96e03b2c9b4961b50
+DIST adodb-5.20.9.tar.gz 464257 SHA256 7948fa04e50aa8a4a228fc0d1f32bd4182c4834b7c20708fdef223d01996e19b SHA512 bc40113012c27b759ff35e7395404d1756720e9daef7df4d33147b9950e9ffd032274ccd8808fe303ba75feeaf727e2deb50fc6d79826db96ce568a70007f30f WHIRLPOOL 2175d476347f694e7d07ac0b886ed6e8d4108b9e223c84e371c963599cc7497dccceb38567c0c775ac138e6a77e126e279ae0f5811b5a4f96e03b2c9b4961b50
diff --git a/dev-php/adodb/adodb-5.20.9.ebuild b/dev-php/adodb/adodb-5.20.9.ebuild
index 49940f4b1a38..b37e311bd855 100644
--- a/dev-php/adodb/adodb-5.20.9.ebuild
+++ b/dev-php/adodb/adodb-5.20.9.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="ADOdb"
 DESCRIPTION="Database abstraction layer for PHP"
 HOMEPAGE="http://www.adodb.org/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
diff --git a/dev-php/mockery/mockery-0.9.0.ebuild b/dev-php/mockery/mockery-0.9.0-r1.ebuild
similarity index 62%
rename from dev-php/mockery/mockery-0.9.0.ebuild
rename to dev-php/mockery/mockery-0.9.0-r1.ebuild
index e71ae7d6e2e5..72490762ba9e 100644
--- a/dev-php/mockery/mockery-0.9.0.ebuild
+++ b/dev-php/mockery/mockery-0.9.0-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_PN="Mockery"
-PHP_PEAR_URI="pear.survivethedeepend.com"
-inherit php-pear-lib-r1
+PHP_PEAR_PKG_NAME="Mockery"
+PHP_PEAR_DOMAIN="pear.survivethedeepend.com"
+inherit php-pear-r2
 
 DESCRIPTION="Simple yet flexible PHP mock object framework for use in unit testing"
 HOMEPAGE="https://github.com/padraic/mockery"
+SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-php/php-codebrowser/php-codebrowser-1.0.2-r1.ebuild b/dev-php/php-codebrowser/php-codebrowser-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..2c85f0c8d57a
--- /dev/null
+++ b/dev-php/php-codebrowser/php-codebrowser-1.0.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
+PHP_PEAR_DOMAIN="pear.phpunit.de"
+PHP_PEAR_PKG_NAME="PHP_CodeBrowser"
+inherit php-pear-r2
+
+DESCRIPTION="Creates highlighted code by reading xml reports from codesniffer or phpunit"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+HOMEPAGE="http://pear.phpunit.de"
+SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
+
+RDEPEND="${RDEPEND}
+	>=dev-php/PEAR-Console_CommandLine-1.1.3
+	>=dev-php/File_Iterator-1.3.0
+	>=dev-php/PEAR-Log-1.12.1"
+
+src_prepare() {
+	sed -i	-e "s~@php_dir@~${EPREFIX}/usr/share/php~" \
+		-e "s~@data_dir@~${EPREFIX}/usr/share/php/data~" \
+		-e "s~@package_version@~${PV}~" \
+		"${S}/src/CLIController.php" || die
+	sed -i	-e "s~@php_dir@~${EPREFIX}/usr/share/php~" \
+		"${S}/bin/phpcb.php" || die
+	eapply_user
+}
+
+src_install() {
+	local DOCS=( CHANGELOG.markdown README.markdown )
+	insinto /usr/share/php/data/${PHP_PEAR_PKG_NAME}
+	doins -r templates
+	insinto /usr/share/php/${PHP_PEAR_PKG_NAME}
+	doins -r src/*
+	exeinto /usr/bin
+	newexe bin/phpcb.php phpcb
+	php-pear-r2_install_packagexml
+	einstalldocs
+}
diff --git a/dev-php/php-codebrowser/php-codebrowser-1.0.2.ebuild b/dev-php/php-codebrowser/php-codebrowser-1.0.2.ebuild
deleted file mode 100644
index 78a53c6ae836..000000000000
--- a/dev-php/php-codebrowser/php-codebrowser-1.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_URI="pear.phpunit.de"
-PHP_PEAR_PN="PHP_CodeBrowser"
-inherit php-pear-lib-r1
-
-DESCRIPTION="Generates a highlighted code browsing parsed from xml reports generated from codesniffer or phpunit"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-HOMEPAGE="http://pear.phpunit.de"
-
-RDEPEND="${RDEPEND}
-	>=dev-php/PEAR-Console_CommandLine-1.1.3
-	>=dev-php/File_Iterator-1.3.0
-	>=dev-php/PEAR-Log-1.12.1"
diff --git a/dev-php/phpDocumentor/Manifest b/dev-php/phpDocumentor/Manifest
index 53cc8e195560..43a0a605e01f 100644
--- a/dev-php/phpDocumentor/Manifest
+++ b/dev-php/phpDocumentor/Manifest
@@ -1,3 +1,2 @@
-DIST phpDocumentor-2.3.0.tgz 17137438 SHA256 1b093f41ecadb0c541a9adb6dc520d4fe06eaf0a6c74a752ffe5e7bff63b751a SHA512 74ad4329d90e71a76977a38ed39dfeff33f557d68a1393f834f2eeb5d4b5e880a4b1813ecb1f4edff638fc5633a3a4b4c7156c5c6cb15e755db283780305c435 WHIRLPOOL 1b14119cbeb21f0887401423ddf50b6afdc379a433ad09db1229d8e53f7e7312df64055d69932d21deec1b3842c3cab78afe5212f7cd6eb1c9ebd8102acc3895
 DIST phpDocumentor-2.7.0.tgz 16118916 SHA256 4d0acb78e6233990595461b70f11db66d91fd38d4e8de5616b788db104caa746 SHA512 068f2470f73ea6940077c23f5565e737d6065e881b9d1456fc617b00c285cc2358773afc16e97e3d9403b5caaaa32a9dcd360bfc91decf349f4b100fee4a9129 WHIRLPOOL 29833d4cdf28f13bb4c78d3d9cb6a6c28acb9a60a1adfa5e6d30b4768afcec157aaecb32b85a75953e987bbda98d717076ebcc723c344af67f4ec32339fe7ba1
 DIST phpDocumentor-2.8.2.phar 33079646 SHA256 1f055bd562b7a209c4f89e865e653576b10a239880e55f423df02ecba4d48c53 SHA512 ef47483147358d423595d6c771971481b99338adeed0f2742ab6856925d3a1d501d4e786aab75cba5dc2306728aef6bf8fc4cfd8ea35d5d9c903f1afa5695c2a WHIRLPOOL c5b551dc3fbcd6b347b24a77ca7378e4301bcbf738f210a0f4b1a0b18d279028787a331c6274963b7c3f7749dba9d4f1993747cebd0be4531add3bce8954f665
diff --git a/dev-php/phpDocumentor/phpDocumentor-2.3.0.ebuild b/dev-php/phpDocumentor/phpDocumentor-2.3.0.ebuild
deleted file mode 100644
index 7f4f9beb051d..000000000000
--- a/dev-php/phpDocumentor/phpDocumentor-2.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PHP_PEAR_URI="pear.phpdoc.org"
-
-inherit php-pear-r1
-
-DESCRIPTION="The phpDocumentor package provides automatic documenting of php api directly from the source"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-# block old version that provides the same binary
-DEPEND="!dev-php/PEAR-PhpDocumentor"
-RDEPEND="media-gfx/graphviz
-	dev-lang/php[iconv,intl,xslt]"
-
-src_install() {
-	php-pear-r1_src_install
-
-	# install manual, tutorial, reference material
-	use doc && dodoc -r docs/*
-}
diff --git a/dev-php/phpDocumentor/phpDocumentor-2.7.0.ebuild b/dev-php/phpDocumentor/phpDocumentor-2.7.0.ebuild
index d86ffa0d17f1..7e5b156e075d 100644
--- a/dev-php/phpDocumentor/phpDocumentor-2.7.0.ebuild
+++ b/dev-php/phpDocumentor/phpDocumentor-2.7.0.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-PHP_PEAR_URI="pear.phpdoc.org"
+PHP_PEAR_DOMAIN="pear.phpdoc.org"
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
 
-inherit php-pear-r1
-
-DESCRIPTION="The phpDocumentor package provides automatic documenting of php api directly from the source"
+inherit php-pear-r2
 
+DESCRIPTION="Automatic documenting of php api directly from the source"
+SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
 
@@ -18,11 +19,23 @@ IUSE="doc"
 # block old version that provides the same binary
 DEPEND="!dev-php/PEAR-PhpDocumentor"
 RDEPEND="media-gfx/graphviz
-	dev-lang/php[iconv,intl,xmlreader,xslt]"
+	dev-lang/php:*[iconv,intl,xmlreader,xslt]"
 
-src_install() {
-	php-pear-r1_src_install
+src_prepare() {
+	sed -i	-e "s~@php_dir@~${EPREFIX}/usr/share/php~" \
+		"${S}/bin/phpdoc" || die
+	eapply_user
+}
 
+src_install() {
+	exeinto /usr/bin
+	doexe bin/phpdoc
+	insinto /usr/share/php/${PN}
+	doins -r vendor src/* phpdoc.dist.xml bin/phpdoc.php
+	insinto /usr/share/php/data/${PN}
+	doins -r ansible data features box.json composer.json composer.lock phpmd.xml.dist wercker.yml
 	# install manual, tutorial, reference material
 	use doc && dodoc -r docs/*
+	php-pear-r2_install_packagexml
+	einstalldocs
 }
diff --git a/dev-php/phpDocumentor/phpDocumentor-2.8.2.ebuild b/dev-php/phpDocumentor/phpDocumentor-2.8.2.ebuild
index 2ad05d0b3b9f..1e4d18cd3495 100644
--- a/dev-php/phpDocumentor/phpDocumentor-2.8.2.ebuild
+++ b/dev-php/phpDocumentor/phpDocumentor-2.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-DESCRIPTION="The phpDocumentor package provides automatic documenting of php api directly from the source"
+DESCRIPTION="Automatic documenting of php api directly from the source"
 HOMEPAGE="http://phpdoc.org"
 SRC_URI="https://github.com/${PN}/${PN}2/releases/download/v${PV}/${PN}.phar -> ${P}.phar"
 
diff --git a/dev-python/audioread/audioread-1.0.1.ebuild b/dev-python/audioread/audioread-1.0.1-r1.ebuild
similarity index 55%
rename from dev-python/audioread/audioread-1.0.1.ebuild
rename to dev-python/audioread/audioread-1.0.1-r1.ebuild
index 49eaebe577dd..5c8a480f88b7 100644
--- a/dev-python/audioread/audioread-1.0.1.ebuild
+++ b/dev-python/audioread/audioread-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
@@ -17,16 +17,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| ( dev-python/gst-python:0.10[${PYTHON_USEDEP}] dev-python/pymad media-video/ffmpeg )"
+RDEPEND="|| ( dev-python/pymad media-video/ffmpeg )"
 
 PATCHES=(
 	"${FILESDIR}/0001-Use-the-print-function-instead-of-the-print-keyword.patch"
 	)
 
 pkg_postinst() {
-		elog "You might need to enable additional USE flags in backends to"
-		elog "decode some types of audio files. Priority of backends:"
-		elog "   * gstreamer"
-		elog "   * mad"
-		elog "   * ffmpeg"
+		einfo "You might need to enable additional USE flags in backends to"
+		einfo "decode some types of audio files. Priority of backends:"
+		einfo "   * mad"
+		einfo "   * ffmpeg"
 }
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index b132a5864520..dc1c6d890067 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,2 +1,3 @@
 DIST autopep8-1.0.4.tar.gz 121476 SHA256 58883a80d501f6f5d97859f100414c6b6f6131fcfc08bd88364c2ecb37a55153 SHA512 53e902dcdd654b9d67d9a31a2343503b754bec78630a7fd8d229843c53eb27d11c32fd6a4829714ac4d7cbee59b055d12e60453ae4ee01cb6131bf9c5045426f WHIRLPOOL 44748dfce6202e1e82c468862e4505500c939ee88eb474392767e606c537a66736f2788c0b6573db37b7c207f3f4608b2a6ecb0fb231bb8c3c090040d17f0642
 DIST autopep8-1.2.4.tar.gz 105273 SHA256 38e31e266e29808e8a65a307778ed8e402e1f0d87472009420d6d18146cdeaa2 SHA512 f56c143d94521487628b225d9a0464ee5c8ca69aaea0c5e43c84f1dd920a0274508c6831da429e716829c38bc7c357842bb6403b8b61c04b464240e3573e05d6 WHIRLPOOL f551f8e2cb8b71664c2e47f7458c9923b70b420c044f980d67172b17f7ea9aa328141f9af648eedb400379dfb5a6ab804671fb1f942f8cca8a3ad851a5e9b3d2
+DIST autopep8-1.3.2.tar.gz 107915 SHA256 7e82590bf366b4d891ac5c1535554c46a5f79e4400a190a8493e92e75c5037dd SHA512 cb9a5e297ce705722d5e65472dbe749e57fa12fe8dee0d4c3dc20d9e885e0d885339627667110318c89c6bf7e337203a7831c0e2217e5a5d7951edcb98d3df4f WHIRLPOOL 8e1d4a9a71e4cc790060a393f5512913d567855d886776b4e32db4ffcef0bb82c793b3af833ddec1dc0f08e585f2d9163ec1c8ee67f118f4b982740ffec89f6e
diff --git a/dev-python/autopep8/autopep8-1.3.2.ebuild b/dev-python/autopep8/autopep8-1.3.2.ebuild
new file mode 100644
index 000000000000..32c6043fa952
--- /dev/null
+++ b/dev-python/autopep8/autopep8-1.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.python.org/pypi/autopep8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pydiff-0.1.2[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Prevent UnicodeDecodeError with LANG=C
+	sed -e "/é/d" -i MANIFEST.in || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/bluelet/bluelet-0.2.0.ebuild b/dev-python/bluelet/bluelet-0.2.0.ebuild
index 8f1507daa85c..87bcd6aafa8e 100644
--- a/dev-python/bluelet/bluelet-0.2.0.ebuild
+++ b/dev-python/bluelet/bluelet-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/configclass/configclass-0.1.0.ebuild b/dev-python/configclass/configclass-0.1.0.ebuild
index e269a95967ee..39a78be31751 100644
--- a/dev-python/configclass/configclass-0.1.0.ebuild
+++ b/dev-python/configclass/configclass-0.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/cryptography/cryptography-1.8.1.ebuild b/dev-python/cryptography/cryptography-1.8.1.ebuild
index 16a98735e766..0bfc42b8acc9 100644
--- a/dev-python/cryptography/cryptography-1.8.1.ebuild
+++ b/dev-python/cryptography/cryptography-1.8.1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	libressl? ( dev-libs/libressl )
 	$(python_gen_cond_dep '>=dev-python/cffi-1.4.1:=[${PYTHON_USEDEP}]' 'python*')
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy{,3})
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
 	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
new file mode 100644
index 000000000000..456da5e87fea
--- /dev/null
+++ b/dev-python/dbusmock/Manifest
@@ -0,0 +1 @@
+DIST dbusmock-0.16.7.tar.gz 70544 SHA256 2d2ea892fa4633c3ec6ac1e912120ec493047a5c6522849b7d1c95ad755bce75 SHA512 749728b966b1e067a0a8bd61ee64c1c7ff22751ccb48e15096d041e78c6e779d787160ee191e90daa3177b92c0ee45c66af74b2dd4e4bcb570892b431ec13467 WHIRLPOOL 921c47fb0b86a6a3368c3b37c27f30b75edacefb46f1a726e39f35eb7b1ea7d0f78c3a7e04b218016c558578625ff28188bfece7cbc7aa06405effe4ab614f92
diff --git a/dev-python/dbusmock/dbusmock-0.16.7.ebuild b/dev-python/dbusmock/dbusmock-0.16.7.ebuild
new file mode 100644
index 000000000000..7eebfd8ebe4f
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.16.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-disable-pyflakes-test.patch
+)
+
+python_test() {
+	nosetests --verbose || die "tests fail under ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( NEWS README.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dbusmock/files/0.16.7-disable-pyflakes-test.patch b/dev-python/dbusmock/files/0.16.7-disable-pyflakes-test.patch
new file mode 100644
index 000000000000..160003ce5eac
--- /dev/null
+++ b/dev-python/dbusmock/files/0.16.7-disable-pyflakes-test.patch
@@ -0,0 +1,20 @@
+https://github.com/martinpitt/python-dbusmock/issues/28
+
+--- a/tests/test_code.orig
++++ b/tests/test_code.py
+@@ -17,6 +17,7 @@
+ 
+ 
+ class StaticCodeTests(unittest.TestCase):
++    """
+     @unittest.skipIf(subprocess.call(['which', 'pyflakes'],
+                                      stdout=subprocess.PIPE) != 0,
+                      'pyflakes not installed')
+@@ -25,6 +26,7 @@
+                                     universal_newlines=True)
+         (out, err) = pyflakes.communicate()
+         self.assertEqual(pyflakes.returncode, 0, out)
++    """
+ 
+     @unittest.skipIf(subprocess.call(['which', 'pep8'],
+                                      stdout=subprocess.PIPE) != 0,
diff --git a/dev-python/dbusmock/metadata.xml b/dev-python/dbusmock/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/dev-python/dbusmock/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 type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 7dd51d24c0bf..900bdce0063a 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,6 +1,4 @@
 DIST docker-py-1.10.6.tar.gz 122462 SHA256 dd1aa55dbe507538318e51e5303077d146d5176abd6b05fe9bcde24c289410bc SHA512 6360f9743472c42b3b080204195a0ba62ec85503cc3d4053dca1fb68e8dbed54bd90ed530d9b6ed0b29367aecbe3731d076c89e8d49365c133754bc38c3f15b9 WHIRLPOOL 3f42a0e597e63d0b821c1887b680b2faa8f696b65aa0851acaf00ccbc3ed2b271b1bbcc5390b99f6402b56f6a1a116fe76bf6a5f542b8beb9f8213e81df18f08
 DIST docker-py-1.2.2.tar.gz 69685 SHA256 85284a5b1a965e01a5d0a91f9f639ad5069143a276c123198fdafc3659280b38 SHA512 bf00b19e0ab56e5c0e8459234d09722ca504ecd933bfba61cb4ab4805410f53f6ad6083f2e964ef5a6eded2ea05aa01a89c27621064386bae145c7258ed996ad WHIRLPOOL bd7ff4579f924e02d18581b1aca00790dcb84afda03e4cde70b349bfdb4ad43aa2e06da2bcbe780f6074d98f9af9b14fb9d2ab4da9265e56b73288902c9ede7a
-DIST docker-py-2.0.1.tar.gz 160820 SHA256 21b37d9fb581bcf88fe5e38ed915a7e3d4bd94174ec45f654669d970da371801 SHA512 097956bbf67659702cc92762f1570c5f86c478f38c527974b9f2f9938e9baa9a8c97f0c3b5252343a92f036e0712dc09cbbc1c1d7fa893b194cef9ec02b37c5a WHIRLPOOL f3451f6a9ded054cd977c57e06608f891ad933af464254243df5be9d909883b11451620aab21e3acb535acb7aec13c077b0e62c7683166c4b4f170812e3b8759
-DIST docker-py-2.0.2.tar.gz 162030 SHA256 1d4a9f65c1e70aec5501c4d84486e3c0d9d0a0dbaa66b48e91f50a108a5c6b9c SHA512 9be455702e5dcf8d5e31fd204ea9b642a132876b1f758e7127daab56f0a8a9002af4b4fa39fd5bcf95208ade0a980d2f83bc81e9c5ba3ccdfaf5ae6ddedf4907 WHIRLPOOL 3ded3ed7177e4760566730e9fec31cde3fea25808b80b12a75294aad3648b13bf4df9ae42b5f5025376fcba022415179717664668ae9077ebb89406eefbba412
 DIST docker-py-2.1.0.tar.gz 172299 SHA256 6eb64263708846390fbd204b55287b612ed6738c3fea9315c0008a027b8edfbf SHA512 053ae0110046d83be0b2b5b33ee84718f995455c650282202d49c9d6806b1d351021344b751f22d29781ab5b2fe9411849dea1da8de231659e657fc10c4d9747 WHIRLPOOL beae0995d3d9061f997cb8a7a65a5d5d18ace3cb3fabdfee6d35826141992d14f7f7b3be8bfccbbf0c4d8480282b0c878d1c5372ce73d6b7a4a5c66eb17dd8d1
 DIST docker-py-2.2.1.tar.gz 174907 SHA256 b84cda631daeaad532143b439af0235923647ed30da5fc4427e6929a637af122 SHA512 9eda776d0055587e68a8933969d0b540c6439dd26fe4dfc13ee50c46ccf55294c130d625f235a74bb48bc58aff93e0371b79cfeb971588e9f7d745a3b6930dc5 WHIRLPOOL 3e0b80cd2af690ed47010bd6cdc68b01b6e4e0d294f49326e3e51d6ab38c0d0fd159fea3d1e44b1f8ab31f591b33c136064b68aa471dadd66a693105bba55a1a
diff --git a/dev-python/docker-py/docker-py-2.0.1.ebuild b/dev-python/docker-py/docker-py-2.0.1.ebuild
deleted file mode 100644
index c487e4411c71..000000000000
--- a/dev-python/docker-py/docker-py-2.0.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-2.0.2.ebuild b/dev-python/docker-py/docker-py-2.0.2.ebuild
deleted file mode 100644
index 127e62633989..000000000000
--- a/dev-python/docker-py/docker-py-2.0.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/doit-py/Manifest b/dev-python/doit-py/Manifest
index 71e61393f53d..b2ea6a6d3e78 100644
--- a/dev-python/doit-py/Manifest
+++ b/dev-python/doit-py/Manifest
@@ -1,2 +1 @@
-DIST doit-py-0.3.0.tar.gz 16151 SHA256 af015e61b1aade838d299a508e72b35d714b67a9b903c65c2863427f5c3883fc SHA512 c6cbb326a7635b78d0c22ff7db8a722aedf8d66b85db4017e1a2566f1d8f1f96d4e00407cfec2180d20091addaf731a916da1a3970553cb4bebec87df90fc609 WHIRLPOOL becc06fd65d0afcf2b9034f7943f5cb01362ad06dabc154051dd5c5d0bf0b4cc35b94e5ee0a54b873ac1c32c82cd122b78e274fda597252ebdda1f5b78ef09dd
 DIST doit-py-0.4.0.tar.gz 16534 SHA256 46896bbb592ecb954397de5dc525e74f46dfb578ecfb53b7c57d7f798d57e2be SHA512 72aa850928c99bf43eefd827334b361243da3b26283fa358ed3f7fba72d1916b1cbe50e581d3d62ed3b4f0efb9b5d1e7f59c3dc913b2ee27e6503bf4e47def33 WHIRLPOOL 0c9180a92e29d4bf2338c33af6e4fa3f23cfe6b5a35ee3c8eb060961a311796b8d1c342074a917bfc373f068e28a3c883fcb9bcb9be45057d44c35ef9838b6a6
diff --git a/dev-python/doit-py/doit-py-0.3.0.ebuild b/dev-python/doit-py/doit-py-0.3.0.ebuild
deleted file mode 100644
index aee896288112..000000000000
--- a/dev-python/doit-py/doit-py-0.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="doit tasks for python stuff"
-HOMEPAGE="http://pythonhosted.org/doit-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	dev-python/doit[${PYTHON_USEDEP}]
-	dev-python/configclass[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/doit-py/doit-py-0.4.0.ebuild b/dev-python/doit-py/doit-py-0.4.0.ebuild
index 16fab345355d..8d89d48a1154 100644
--- a/dev-python/doit-py/doit-py-0.4.0.ebuild
+++ b/dev-python/doit-py/doit-py-0.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 
@@ -16,7 +16,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
 		virtual/python-singledispatch[${PYTHON_USEDEP}]
 		app-text/hunspell )
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 8e27362af04e..d3660ca823ba 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,4 +1,2 @@
 DIST doit-0.23.0.tar.gz 316588 SHA256 5d0421be6e5528e3be11bd0ede5c232e0c91f2b98b55688d7db1ce0638e1efbb SHA512 f2298d76d9ce3e7ed5f356bfdeeef8d5d99ebae74571666a3d2b3843fc63f5a8f76cd6cdedcfe8fc81bc653ecf04951c11f50abd16e9aa8fc7539e3c224b0e4c WHIRLPOOL cfb09484e25cfbc9618ef5b4a750010d16281a13772a37a8da59f2f6e1ebed77bbc40c06f263062c0464e6689415aeac695c0ef9e5cfe561349efea61f8be8e3
-DIST doit-0.27.0.tar.gz 193700 SHA256 06662c8677fb3e925c262559b7d3c5d8e08a10320be3386a7d348702e8e3ed8a SHA512 afca1029873c9fca0632ef43bc75762eed0738b7e4c1b8e9babf10543b15f78c526794462a83fa2fac1b35f2ff9152afbce8660b1dfbd86ce9dd73d47c70a9f7 WHIRLPOOL 60c022977b6dfe9e3e66d206315ac23a291c4df58bc07b4f8120622f257b636b80340dc267e5615de5876d40a500cf0fbaf3f531c6f41dce53d91ebdc6d65d7e
-DIST doit-0.28.0.tar.gz 213582 SHA256 12a2febde2566728344acbdb6ad92f82417228cd548f0f467187d1e67047513f SHA512 ff1eeb1819ad8a962b98c6d96aef8173bc9793a3afd6e2086f1f80fa60eba73c71e16c1467be89f2f78c9c9516f3c780bf57d7f461df96940f2feb51afd2ad3a WHIRLPOOL cf759118284c8e7b74299bf7fa92e99bdf5302e7f1dacd86c301a14d13eca5a5611d2cd57b0411a76439df64add439627040dcc6902b2d43ffd95a3c942441da
 DIST doit-0.29.0.tar.gz 222341 SHA256 fcb479482644de3e83d6faed9b29373f1f38942b79b991a7432943a84416d5cd SHA512 a686457df31b414d0c3797789e0ae1ae5cdfa3674025236419cb59b254f342cd2db07911ef18b2cb576d8d817b44035b9372265b34b786b2779fb7074b394de1 WHIRLPOOL 64e5cedb8d3ce0b99287713c05041da477182d63f745c7abc10cb72fd3d856fee62514cfa97c4ae6a433e12dd43d70bf4dea751eff99b91430b538dbf0ab7012
diff --git a/dev-python/doit/doit-0.27.0.ebuild b/dev-python/doit/doit-0.27.0.ebuild
deleted file mode 100644
index 35b855dfc3da..000000000000
--- a/dev-python/doit/doit-0.27.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-inherit eutils distutils-r1
-
-DESCRIPTION="Automation tool"
-HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.python.org/pypi/doit"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-# Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-DOCS=( AUTHORS CHANGES README.rst TODO.txt dev_requirements.txt )
-
-python_prepare_all() {
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-	# Tests of this file fail due to setting of a tmp dir which can be fixed.
-	# This known spurious cause does not warrant halting a testsuite
-	rm -f tests/test_cmd_strace.py || die
-
-	# These 2 tests succeed on running the suite a second time, so they are NOT broken
-	# A gentoo test phase is run only once, so these unbroken tests can be safely skipped.
-	sed -e s':testInit:_&:' -e s':testLoop:_&:' \
-		-i tests/test_filewatch.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Testsuite is designed to be run by py.test, called by runtests.py
-	# https://bitbucket.org/schettino72/doit/issue/78/tests-that-fail-under-pypy
-	if [[ "${EPYTHON}" == pypy-c2.0 ]]; then
-		sed -e 's:test_corrupted_file:_&:' \
-			-e 's:test_corrupted_file_unrecognized_excep_pdep:_&:' \
-			-i tests/test_dependency.py || die
-	elif [[ "${EPYTHON}" == python2.6 ]]; then
-		rm -f tests/test___main__.py || die
-		sed -e 's:test_invalid_param_stdout:_&:' \
-			-i tests/test_action.py || die
-		sed -e 's:test_run_wait:_&:' \
-			-i tests/test_cmd_auto.py || die
-	fi
-	"${PYTHON}" runtests.py
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	dodoc -r doc
-	docompress -x /usr/share/doc/${PF}/doc
-}
diff --git a/dev-python/doit/doit-0.28.0.ebuild b/dev-python/doit/doit-0.28.0.ebuild
deleted file mode 100644
index 4bbf19b5db55..000000000000
--- a/dev-python/doit/doit-0.28.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-inherit eutils distutils-r1
-
-DESCRIPTION="Automation tool"
-HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.python.org/pypi/doit"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/doit-py-0.3.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 pypy)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-DEPEND="test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-
-# Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Disable test failing due to impact on PATH run in a sandbox
-	sed -e s':test_target:_&:' -i tests/test_cmd_strace.py || die
-
-	# Test requires connection to an absent database
-	sed -e s':testIgnoreAll:_&:' -i tests/test_cmd_ignore.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	local -x TMPDIR="${T}"
-	# disable tests where pypy's treatment of some tests' use of a db is incompatible
-
-	if [[ "${EPYTHON}" == pypy ]]; then
-		sed -e 's:test_remove_all:_&:' -i tests/test_dependency.py || die
-		sed -e 's:testForgetAll:_&:' -i tests/test_cmd_forget.py || die
-		sed -e 's:test_not_picklable:_&:' \
-			-e 's:test_task_not_picklabe_multiprocess:_&:' \
-			-i tests/test_runner.py || die
-	fi
-
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_src_install
-}
diff --git a/dev-python/doit/doit-0.29.0.ebuild b/dev-python/doit/doit-0.29.0.ebuild
index 10e7308faaa8..8e9c0cb2f559 100644
--- a/dev-python/doit/doit-0.29.0.ebuild
+++ b/dev-python/doit/doit-0.29.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit eutils distutils-r1
 
 RESTRICT="test" # can't work as it imports nonexistant modules from coverage
@@ -17,17 +17,19 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
 	dev-python/pyinotify[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/doit-py-0.3.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 pypy)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
 DEPEND="test? ( ${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pyflakes[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/cloudpickle[${PYTHON_USEDEP}] )"
+		dev-python/coverage[${PYTHON_USEDEP}] )
+"
+PDEPEND=">=dev-python/doit-py-0.3.0[${PYTHON_USEDEP}]"
 
 # Required for test phase
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild b/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild
index 84a20d3040f1..ff00a92b13ae 100644
--- a/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild
+++ b/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild b/dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild
index 603d68b5f9bd..b918a072d7ea 100644
--- a/dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild
+++ b/dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/libasyncns-python/libasyncns-python-0.7.1-r1.ebuild b/dev-python/libasyncns-python/libasyncns-python-0.7.1-r1.ebuild
index f7fb2908f436..1b8e56d00254 100644
--- a/dev-python/libasyncns-python/libasyncns-python-0.7.1-r1.ebuild
+++ b/dev-python/libasyncns-python/libasyncns-python-0.7.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/maintboot/maintboot-0.1.0.ebuild b/dev-python/maintboot/maintboot-0.1.0.ebuild
index 24e7dc8260f9..35faf8b4ac93 100644
--- a/dev-python/maintboot/maintboot-0.1.0.ebuild
+++ b/dev-python/maintboot/maintboot-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mergedict/mergedict-0.2.0.ebuild b/dev-python/mergedict/mergedict-0.2.0.ebuild
index 6838d3ec4681..050d04625093 100644
--- a/dev-python/mergedict/mergedict-0.2.0.ebuild
+++ b/dev-python/mergedict/mergedict-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_4 pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
index 5a547eb581e0..72d1f13ef3f1 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
 inherit distutils-r1
 
@@ -14,16 +14,28 @@ SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.ta
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="test"
 
-DEPEND="
+COMMON_DEPEND="
 	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
 	virtual/python-greenlet[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)
 "
 
 RDEPEND="
-	${DEPEND}
+	${COMMON_DEPEND}
 	>=app-editors/neovim-0.1.6
 "
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
 
 S="${WORKDIR}/python-client-${PV}"
+
+python_test() {
+	nosetests -d -v || die
+}
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild
index 0fe4f5488f33..cab2f121eb9e 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6.ebuild
deleted file mode 100644
index 5ed05cb7dfbf..000000000000
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-inherit distutils-r1
-
-DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
-HOMEPAGE="https://github.com/renpy/pygame_sdl2"
-SRC_URI="http://www.renpy.org/dl/${PV}/pygame_sdl2-for-renpy-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libpng:0
-	media-libs/libsdl2[video]
-	media-libs/sdl2-image[png,jpeg]
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-	virtual/jpeg:62
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/pygame-sdl2-for-renpy-${PV}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 3bbaa818e095..80dbf8742018 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,5 +1,4 @@
 DIST pytest-2.7.2.tar.gz 532836 SHA256 b30457f735420d0000d10a44bbd478cf03f8bf20e25bd77248f9bab40f4fd6a4 SHA512 5474a4fe58437a4971fb21b1b37dad3c08e18e5d154931ff23e597f881100a3515bf0cf71d06b143465594ad2a91a96f84f4836d84c39691143c8d88ca7a4360 WHIRLPOOL 6ab7371f952109ac476774222883e1381fe5ee6a54d967f2d90765f6c59c90634a16c42e8e2e1661169db6a9cb1327242ff2281cf1caeabd86a4dacd24f4bb06
-DIST pytest-3.0.2.tar.gz 727551 SHA256 64d8937626dd2a4bc15ef0edd307d26636a72a3f3f9664c424d78e40efb1e339 SHA512 38485c73f9df3c76b7b920b6957ffe4fbfd32ca0c46b73a53375a40586a482d270bf71b4457b68d48815d50ad173824b269ece255692ae0d1b13f0b1885ce54f WHIRLPOOL b6954a95e5f7d9b904c7543a09c2ef237c76c3a35bcd3e24c402a02aec3b35a19cdb952ac38af4ce43ae516cb5ac52023a0d91f2c587343265edd6d493145e8a
 DIST pytest-3.0.3.tar.gz 731934 SHA256 f213500a356800a483e8a146ff971ae14a8df3f2c0ae4145181aad96996abee7 SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af WHIRLPOOL 1883909fa23832e674cf912b1d88957dd435143dc124df5454c08ad02c8077473168f749ea94539c2c4b5cf08648a0bce7e90937bbdacd4bb69a4ccf15ecff23
 DIST pytest-3.0.6.tar.gz 748748 SHA256 643434a9f1a188271da35e20064cb8b6c5440976c5bb541dc7b5b0e3cf75d940 SHA512 0e983f1f52c18327537d20be30425f4c74037d1fbf6b4aedf2646cf21d450fa9b2b20625f26f5db759b4fe1fd28c6640cb1df88e667efaeea6642e7f02f01e06 WHIRLPOOL 708e5041135883ba31d9712880672f64bf05c0bf40a544061cb42fed4d2aec111bfdf82b63f10e8a87c2b76870e3ea364b396258f0674d2199e43fe93cf2922e
 DIST pytest-3.0.7.tar.gz 743866 SHA256 b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab SHA512 f458929614fca5bc9542b9adfe2fa5d2c5b97ec13e331d3a9caf256d2d005b3dad9c11d01b2eb62332648f90608ba297a1edc2c20b7630ec4f69114299720a2a WHIRLPOOL 2febc111fed67573296f8c4a758ea36c2a2e81bd425442beace139f7e1bd3eaab7aa2fdcf8e0280871b0692e19d70efe18d780e4dd7336c9dd5d6fb0db2df6c5
diff --git a/dev-python/pytest/pytest-3.0.2.ebuild b/dev-python/pytest/pytest-3.0.2.ebuild
deleted file mode 100644
index 233a2d7fd17f..000000000000
--- a/dev-python/pytest/pytest-3.0.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.29"
-COMMON_DEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-python/logilab-common
-"
-
-python_prepare_all() {
-	chmod o-w *egg*/* || die
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
-			--ignore=testing/BUILD_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -v testing || die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest/pytest-3.0.3.ebuild b/dev-python/pytest/pytest-3.0.3.ebuild
index 2d267397c09b..61fe2a0d9fb8 100644
--- a/dev-python/pytest/pytest-3.0.3.ebuild
+++ b/dev-python/pytest/pytest-3.0.3.ebuild
@@ -46,6 +46,9 @@ python_prepare_all() {
 	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
 	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
 
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pytest/pytest-3.0.6.ebuild b/dev-python/pytest/pytest-3.0.6.ebuild
index 310de5faf9e8..77e0facf03fb 100644
--- a/dev-python/pytest/pytest-3.0.6.ebuild
+++ b/dev-python/pytest/pytest-3.0.6.ebuild
@@ -46,6 +46,9 @@ python_prepare_all() {
 	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
 	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
 
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pytest/pytest-3.0.7.ebuild b/dev-python/pytest/pytest-3.0.7.ebuild
index 461d9ebbc842..df2c80f0735a 100644
--- a/dev-python/pytest/pytest-3.0.7.ebuild
+++ b/dev-python/pytest/pytest-3.0.7.ebuild
@@ -46,6 +46,10 @@ python_prepare_all() {
 	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
 	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
 
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pytest/pytest-9999.ebuild b/dev-python/pytest/pytest-9999.ebuild
deleted file mode 100644
index ff70a75459a1..000000000000
--- a/dev-python/pytest/pytest-9999.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/pytest-dev/pytest.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.29"
-RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
-
-# dev-python/pluggy
-# https://github.com/hpk42/pluggy
-# See https://github.com/pytest-dev/pytest/issues/944
-# for why not now
-
-#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pexpect[${PYTHON_USEDEP}] )
-	doc? (
-		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/regendoc[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Prevent un-needed d'loading
-	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir doc/en/.build || die
-		emake -C doc/en html
-	fi
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
-			--ignore=testing/BUILD_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \
-			|| die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/en/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pythonmagick/Manifest b/dev-python/pythonmagick/Manifest
index 491ed84b785d..d49a8cf4db79 100644
--- a/dev-python/pythonmagick/Manifest
+++ b/dev-python/pythonmagick/Manifest
@@ -1 +1,2 @@
 DIST PythonMagick-0.9.14.tar.xz 270488 SHA256 42fc1fc0def8a9fa0af282c1ba330831d7ba310b5d7dc7b0f03c0536a26b93ba SHA512 a09696d8ebe3c8d38a9148e6f812c149d34fbe1dbe64ecf07b43e153b3c7fd97738491818dec348072ff96e54ac0eddd17eff75c5cef8df21a8a89f58e918e98 WHIRLPOOL dcdd3b78c9b425cefbc8f05b0e3af9be9fa217c5175788ce75d44c985a86fb7c73d85d0e6b41e344685d78db2b66a9ea820b1f30a7fd8e30290e08b22fd20d71
+DIST PythonMagick-0.9.17.tar.xz 271844 SHA256 34aeaab51268432c25f68b36fbd5daca97c0d564cb61c761b018731516d0711e SHA512 e50e5e0d27f2dc8ccd1b251a0311ecca825423b34e85a257bfce42696c4a285977ffb8bade487fb8a3a4f8cad26d0a41fc067b172b733d0c48e951a27badded7 WHIRLPOOL cacbbc04ce0d6ec32ef27e9829a49e88841073ca92b16f636d8111cdd862f163aee77c3191bcaf4b18bc699514fb61e616e8b5ce9960c5a4dc78aa6f78f3711c
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.17.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.17.ebuild
new file mode 100644
index 000000000000..512531606103
--- /dev/null
+++ b/dev-python/pythonmagick/pythonmagick-0.9.17.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit libtool python-r1
+
+MY_PN="PythonMagick"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for ImageMagick"
+HOMEPAGE="http://www.imagemagick.org/script/api.php"
+SRC_URI="mirror://imagemagick/python/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
+	>=media-gfx/imagemagick-6.9.1
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	elibtoolize
+	python_copy_sources
+}
+
+src_configure() {
+	python_configure() {
+		if ! python_is_python3; then
+			local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+		fi
+		econf \
+			--disable-static \
+			--with-boost-python=boost_python-${EPYTHON#python}
+	}
+
+	python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir emake
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir emake check
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-ruby/nio4r/Manifest b/dev-ruby/nio4r/Manifest
index ec854120a496..c74345585a9e 100644
--- a/dev-ruby/nio4r/Manifest
+++ b/dev-ruby/nio4r/Manifest
@@ -1,2 +1,3 @@
 DIST nio4r-1.2.1.gem 94208 SHA256 0a5a93676c7c116c51f00366800a7c039d67393dadb4b873059375d7cfa9b6a9 SHA512 3136863955bd6f4d489955bae9baf2fb527447c0e71dade1a05402f3e7c8570bf1dd9b8335d70d7303ec4df0a236b13e4ede74ce9154be00a108afcd7c6b7f40 WHIRLPOOL acb063c6a5e9cb4df6096ecd5bebc9e5d1b2968d35899f05b7110b0037bb37862942e01c44fcbd2731bcb492f9e7fd9acd70a23aee375dae93406688ac7ff593
 DIST nio4r-2.0.0.gem 99840 SHA256 2ecc70fe1ae4c8a4638109475dbb6401249facdae5b4be12db931152864844cd SHA512 347afee015e673c8c878799b50affe155ad880608309162de2b4437c051a60feb902b44bc9f5ca5af6fb9e2f84a067410596eac68b1a39374a167205dadc1444 WHIRLPOOL fec5bdd5e2c1ffee8a73116fdf41a7716d72d7a60ed32b52647ee91f3457e1cd77bf39e2a094f2d1939c23d99a3e27294c93e94c0db272874a55573178e1ca14
+DIST nio4r-2.1.0.gem 100352 SHA256 60f9bd925cac863b1f2a6c24500d68bd539898a008a1d0c0270c46a8b8d2ecd8 SHA512 40fdc0453fb5c6ea275cdacf698b834d2ea198448cdac33dd6353780097cb4957c53c0bb1576e7d99d9362f1def596412cb3c78e0600d38664a8e8ff37018d65 WHIRLPOOL 3784ab3ee2edc676c371005199e9be18833c57397db97d3cf63eda246a964d73ee72235c61c23be78ac05377014fb40560498c002c90ce600d5698363e21c1ca
diff --git a/dev-ruby/nio4r/nio4r-2.1.0.ebuild b/dev-ruby/nio4r/nio4r-2.1.0.ebuild
new file mode 100644
index 000000000000..e8d9895d70c5
--- /dev/null
+++ b/dev-ruby/nio4r/nio4r-2.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A high performance selector API for monitoring IO objects"
+HOMEPAGE="https://github.com/socketry/nio4r"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Note that nio4r bundles a patched copy of libev, and without these
+# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-retry )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Cc]overalls/d' -e '/[Bb]undler/d' spec/spec_helper.rb || die
+	sed -e '/extension/ s:^:#:' -i Rakefile || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/${PN} extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/${PN}
+	cp ext/${PN}/*$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 2df9ac8e47c9..843d1e690591 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,3 +1,4 @@
 DIST pkg-config-1.1.7.gem 19456 SHA256 1f3cd171432f4634805ebf7cd187d1d728d732bfead3837c349f2c502d8e9252 SHA512 9f515874d3edabdfff5f4c8d624bbc91e9c5032e79c241412cd073f0a049e35a2e2a660d5503eaae9640286d74cb98510bbbb34f757c702e220f728fba1c2337 WHIRLPOOL b1eea580d1db95bd651004752f913c7ce5f821ebaa0a1742609bd2e07738c2d125b36f6d5a03dd8b6c34b126246163ee1bd59ef19143df8a0b2f01bb7b260f9b
 DIST pkg-config-1.1.9.gem 19456 SHA256 7a0e8b9b99bb6bd1c816d19d3507bffe68116bc2ed387d4233f0b079c4d6e4c5 SHA512 0b337ffbf8a18a4dcde24b96a343e7599aed3cde2bec0fb74cc96b7377492f4df4893ba595f191739ed88b4876b66d9dcc2f59296bb58adcf871a82f8e4b8862 WHIRLPOOL 1b95e7d1a7e747890ef1da12adf71322738b914b0ca8fc27147461b6c3aa8166000c987af046522f2470aa1de1ff71f0f3a75a0b65f4ab20b8010e3baa96f734
 DIST pkg-config-1.2.0.gem 19968 SHA256 8fa0d9870bcefc13fe1526f80567b21eadd35989330e553b54a48c699b70743a SHA512 b4bd1b7be6cabc4413ada62c78d8434ab77e27e7a5fcf671f623907a95b7f33cd8d331013cc73b5e8f7dfe24eef738ca047ed229c286aa392c8070892ccb3c20 WHIRLPOOL 440edd604e243640edda3b35b1daf5a5d77139e71d5a2a16f012d272644e9addfca0b23e9e5778ed812fbcfd1c6a1d12682d13418a6a704ceea8884de114e656
+DIST pkg-config-1.2.2.gem 19968 SHA256 7b76a116979fc5e721cc875c474480395acf07bc2abf4db16378f9a717e29ed2 SHA512 f7cd5cb67a813c0e5f736502027b29a59b86a62bbf845834e5fb66e36132ed7b8019ed2819f6a0ab4f6ed4931a1fa37a78b25871c88e60cf2a379586d3e17e36 WHIRLPOOL dfa3ad96977023dc7cbf521ec7de243f604b52f8f67c1b41d39e2ea3f5c8840089b628c512ebd796b8442c4c5d12c5f9a466c13c2dc02ec4d2234ce4527c3c2b
diff --git a/dev-ruby/pkg-config/pkg-config-1.2.2.ebuild b/dev-ruby/pkg-config/pkg-config-1.2.2.ebuild
new file mode 100644
index 000000000000..b6263153de87
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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 || die
+}
diff --git a/dev-ruby/rex-core/Manifest b/dev-ruby/rex-core/Manifest
index 702d5e44f559..a25044084d94 100644
--- a/dev-ruby/rex-core/Manifest
+++ b/dev-ruby/rex-core/Manifest
@@ -1 +1,2 @@
+DIST rex-core-0.1.10.gem 30720 SHA256 ce04c953ce3793f3e5d40713cc228f0c1463d86b3778226e062db1c533d5ab27 SHA512 aeb868f60680c4a023e6bc511039d5a880aeb8a318b185fbecd8cdcf9711732da892482b8361eade3066c01eb8f9098f75d9ca8facebacb4f2439c4a2d67c848 WHIRLPOOL cfd531f6f88dc9c46317f051d2d66ce71568d25bd9092a4c265ab2fb2bb5d23fb9dae07681b484837557142e1051e20c7201dc7588fcb0ba8df85fb603312a4b
 DIST rex-core-0.1.9.gem 30720 SHA256 423cef7ef1154ee3124043357bea0279c1da3c3ed57572fd9c513f6416931904 SHA512 0edbcd227575f025bce55923ae3df4ea37359bc53d2353d06a856e760f42a8f2a11573fe56647eeb26fee7499fecf453804d940c3672088e2e86af26cb87cce9 WHIRLPOOL 6b53ce10b4c3c0b4839701362d9284c143b135cf2b3a0991f0e523db22c989c293d6c0e7fb284e867c9c9b4f5a9ebefa02953af4a88786928181c40795ef96c9
diff --git a/dev-ruby/rex-core/rex-core-0.1.10.ebuild b/dev-ruby/rex-core/rex-core-0.1.10.ebuild
new file mode 100644
index 000000000000..e7a804346a5e
--- /dev/null
+++ b/dev-ruby/rex-core/rex-core-0.1.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby21 ruby22 ruby23"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Core libraries required for the Ruby Exploitation(Rex) Suite"
+HOMEPAGE="https://rubygems.org/gems/rex-core"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i '/bundler/d' Rakefile
+}
diff --git a/dev-ruby/rmagick/rmagick-2.15.4.ebuild b/dev-ruby/rmagick/rmagick-2.15.4.ebuild
index 1856fd9f22cd..d78b78eb44fc 100644
--- a/dev-ruby/rmagick/rmagick-2.15.4.ebuild
+++ b/dev-ruby/rmagick/rmagick-2.15.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/gemhome/rmagick"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos"
 IUSE="doc"
 
 RDEPEND+=" >=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6*"
diff --git a/dev-ruby/roadie/roadie-3.2.1-r2.ebuild b/dev-ruby/roadie/roadie-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..b7f0d2a9ca48
--- /dev/null
+++ b/dev-ruby/roadie/roadie-3.2.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby21 ruby22 ruby23"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
+HOMEPAGE="https://github.com/Mange/roadie"
+SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.5.0
+	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1.4*"
+ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e 's/git ls-files/find . -type f -print/' \
+		-e '/test_files/d' \
+		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
index 1337df42cc87..0052610eb3f9 100644
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index 77ca2614acb6..9e9de4d292ad 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1 +1,2 @@
 DIST ideaIU-171.4249.39.tar.gz 615812999 SHA256 7fe305e66f25029bd363d2c4bf2db70ae3423d8d99156fc62bcfe3d8c59aee05 SHA512 503990c45ca666f266aff7928b84455c46268d13ef713d04acf14f7532dd58ff8234f74858695a21d06d01a9aa74421b6ef4a5161c1e044b63b2f3372349ee3c WHIRLPOOL 520ce1f8daa2a7f7879fe486a9640df21279312cfe850084771ca13f561afefa7753ccb5435a17fb6238f8dee92fd92ad641ebd2a8caadf937ecb07efc8bd935
+DIST ideaIU-171.4424.56.tar.gz 617389249 SHA256 638db425e0896a7639b7eb6ad67d7e65502118ee9680337c44ab40502ed358bd SHA512 ca0748c653822976357627d4ecc3a2fc496daeb4e58185e2cdb26907eb2da3239b35bd22a054b4c1ffae3ff54302ef968426d57a29d44af3c496373d99b74ab7 WHIRLPOOL a0640bf6ba23fd2045769f88af02fb104f5d32bf7d7025857e6bf142c5d9e7a15050c47f6b512c3493391ac5d49800824230c7fc51b1e4014def8efbf55a7c43
diff --git a/dev-util/idea-ultimate/idea-ultimate-2017.1.3.171.4424.56.ebuild b/dev-util/idea-ultimate/idea-ultimate-2017.1.3.171.4424.56.ebuild
new file mode 100644
index 000000000000..088e87ce25bb
--- /dev/null
+++ b/dev-util/idea-ultimate/idea-ultimate-2017.1.3.171.4424.56.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils versionator
+
+SLOT="0"
+PV_STRING="$(get_version_component_range 4-6)"
+MY_PV="$(get_version_component_range 1-3)"
+MY_PN="idea"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(get_version_component_range 7)x" = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS=""
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+IUSE="-custom-jdk"
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7:*"
+S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+src_prepare() {
+	if ! use amd64; then
+		rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
+	fi
+	if ! use arm; then
+		rm bin/fsnotifier-arm || die
+		rm -r plugins/tfsIntegration/lib/native/linux/arm || die
+	fi
+	if ! use ppc; then
+		rm -r plugins/tfsIntegration/lib/native/linux/ppc || die
+	fi
+	if ! use x86; then
+		rm -r plugins/tfsIntegration/lib/native/linux/x86 || die
+	fi
+	if ! use custom-jdk; then
+		if [[ -d jre ]]; then
+			rm -r jre || die
+		fi
+	fi
+	rm -r plugins/tfsIntegration/lib/native/solaris || die
+	rm -r plugins/tfsIntegration/lib/native/hpux || die
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
+
+	if use custom-jdk; then
+		if [[ -d jre ]]; then
+		fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
+		fi
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/qbs/qbs-1.8.0-r1.ebuild b/dev-util/qbs/qbs-1.8.0-r1.ebuild
index d2cb3eae1ea4..ee6d9372bafe 100644
--- a/dev-util/qbs/qbs-1.8.0-r1.ebuild
+++ b/dev-util/qbs/qbs-1.8.0-r1.ebuild
@@ -104,7 +104,7 @@ src_install() {
 	# install documentation
 	if use doc; then
 		emake docs
-		dodoc -r doc/html
+		dodoc -r doc/qbs/html
 		dodoc doc/qbs.qch
 		docompress -x /usr/share/doc/${PF}/qbs.qch
 	fi
diff --git a/dev-util/umockdev/umockdev-0.8.11.ebuild b/dev-util/umockdev/umockdev-0.8.11.ebuild
index 13f33629b5a3..a637d862e76a 100644
--- a/dev-util/umockdev/umockdev-0.8.11.ebuild
+++ b/dev-util/umockdev/umockdev-0.8.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit python-any-r1 autotools-utils
 
diff --git a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
index cd805b4ba985..249da409f76c 100644
--- a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
+++ b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit bash-completion-r1 python-r1
 
diff --git a/dev-vcs/subversion/subversion-1.8.17.ebuild b/dev-vcs/subversion/subversion-1.8.17.ebuild
index 931a4029896c..663a46742acf 100644
--- a/dev-vcs/subversion/subversion-1.8.17.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.17.ebuild
@@ -41,7 +41,10 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	apache2? ( www-servers/apache[apache2_modules_dav] )
 	java? ( >=virtual/jre-1.5 )
-	kwallet? ( kde-apps/kwalletd:4 )
+	kwallet? ( || (
+		( >=kde-frameworks/kwallet-5.34.0-r1 )
+		( kde-apps/kwalletd:4 )
+	) )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
diff --git a/dev-vcs/subversion/subversion-1.9.5.ebuild b/dev-vcs/subversion/subversion-1.9.5.ebuild
index 7b0ad1c36f20..096932f6f69d 100644
--- a/dev-vcs/subversion/subversion-1.9.5.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.5.ebuild
@@ -41,7 +41,10 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	apache2? ( www-servers/apache[apache2_modules_dav] )
 	java? ( >=virtual/jre-1.5 )
-	kwallet? ( kde-apps/kwalletd:4 )
+	kwallet? ( || (
+		( >=kde-frameworks/kwallet-5.34.0-r1 )
+		( kde-apps/kwalletd:4 )
+	) )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 60d8f131f1ce..71839733485c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -566,17 +566,18 @@ kde5_src_prepare() {
 			pushd ${po} > /dev/null || die
 			local lang
 			for lang in *; do
-				if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then
-					rm -r ${lang} || die
+				if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
+					case ${lang} in
+						cmake_modules | \
+						CMakeLists.txt | \
+						${PN}.pot)	;;
+						*) rm -r ${lang} || die	;;
+					esac
 					if [[ -e CMakeLists.txt ]] ; then
 						cmake_comment_add_subdirectory ${lang}
 						sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" \
 							-i CMakeLists.txt || die
 					fi
-				elif [[ -f ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
-					if [[ ${lang} != CMakeLists.txt && ${lang} != ${PN}.pot ]] ; then
-						rm ${lang} || die
-					fi
 				fi
 			done
 			popd > /dev/null || die
diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass
index 7a6df75496f2..f579531a5e5c 100644
--- a/eclass/php-pear-lib-r1.eclass
+++ b/eclass/php-pear-lib-r1.eclass
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: php-pear-lib-r1.eclass
+# @DEAD
 # @MAINTAINER:
 # Gentoo PHP team <php-bugs@gentoo.org>
 # @AUTHOR:
diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass
index 48ff30355f9d..dad075686bf3 100644
--- a/eclass/php-pear-r2.eclass
+++ b/eclass/php-pear-r2.eclass
@@ -97,9 +97,10 @@ php-pear-r2_src_install() {
 php-pear-r2_pkg_postinst() {
 	# Add unknown channels
 	if [[ -f "${EROOT}usr/share/php/.packagexml/${PEAR_P}-channel.xml" ]] ; then
-		if "${EROOT}usr/bin/peardev" channel-info "${PHP_PEAR_DOMAIN}" &> /dev/null; then
+		"${EROOT}usr/bin/peardev" channel-info "${PHP_PEAR_DOMAIN}" &> /dev/null
+		if [[ $? -ne 0 ]]; then
 			"${EROOT}usr/bin/peardev" channel-add \
-				"${EROOT}usr/share/php/.packagexml/${PEAR_PN}-channel.xml" \
+				"${EROOT}usr/share/php/.packagexml/${PEAR_P}-channel.xml" \
 				|| einfo "Ignore any errors about existing channels"
 		fi
 	fi
diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass
index c4b706f42a9d..3c6a22e74dc5 100644
--- a/eclass/ruby-utils.eclass
+++ b/eclass/ruby-utils.eclass
@@ -27,10 +27,10 @@ if [[ ! ${_RUBY_UTILS} ]]; then
 # provide for a better first installation experience.
 
 # All RUBY_TARGETS
-RUBY_TARGETS_PREFERENCE="ruby21 "
+RUBY_TARGETS_PREFERENCE="ruby22 ruby21 "
 
 # All other active ruby targets
-RUBY_TARGETS_PREFERENCE+="ruby22 ruby23 ruby24"
+RUBY_TARGETS_PREFERENCE+="ruby23 ruby24"
 
 
 _ruby_implementation_depend() {
diff --git a/games-engines/gemrb/gemrb-0.8.3-r1.ebuild b/games-engines/gemrb/gemrb-0.8.3-r1.ebuild
index 6ec09ffb5278..a3851438c66c 100644
--- a/games-engines/gemrb/gemrb-0.8.3-r1.ebuild
+++ b/games-engines/gemrb/gemrb-0.8.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index 3603f1bc82ea..79cac0464ece 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,3 +1,3 @@
 DIST puzzles-20170314.eedea41.tar.gz 2897824 SHA256 57c156fa7de2605a4ae0f18e54ce20ef4e08b8faf32d26eccf5a7fa545940fa8 SHA512 ef7d12e0e20aef487a18b572a4464f3e23b226fae599cc22fdb34348f6c3baf3dcd21207c8fedef0ac3a6c4344b13e520767efef8830aaa2ad4b914285f8aa3c WHIRLPOOL 17b069ae171497212411ed6696fafd00108064f3a28ce38925a4fc6d9040e3d072a14920b024c329e597fe1fdedc9723089ea5c17d7df9226ac45ba612a1de70
-DIST puzzles-20170506.23a5372.tar.gz 2895770 SHA256 9a5167f782100b15bf0da969c8b5b6c6f343c9c2b3417615ffc640cc09b4aee9 SHA512 a807e9a8fb5ddbfc564f60da63886a6ce068f59077fbc3312bcf928a432b754d36db8878ee8aa8cabff7f12efddf51fb1e60f927b8bfc86cd5ebc16c367f64b5 WHIRLPOOL 1852267e731a21c60bca9c8d1506a21839ed65e83266d400f592106af8ff79d4a8f4c00cce2240cb92e3b071c4c1a023c0ce2453eb13cc264a317b1f76285bd1
+DIST puzzles-20170514.7bdfda8.tar.gz 2910137 SHA256 fa7e0e7d2f4bf43d4d5d91e0836ad87a133657a99f00ec5ee77504cd8bafda58 SHA512 b0acbc1cf3e2986c6c3a58a126ff4e9e8751e93ee9a4771e2fd8af6c98c01bbbe01db8ccc526fdbac1ee8bf9a4391c9b90d66e19458fdc53858a6a3724c02a4b WHIRLPOOL bae1cd85b3d4973db5e8610cb9b023a39fe5ee11386723e44d4ef7464615f9373d5b10f2d8cf325257709b3184ee40453b0262e22e427a8353f0e9c1c74adc51
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57 WHIRLPOOL 17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
index ec67b9f3b613..ccbdc036d624 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
@@ -13,13 +13,13 @@ if [[ ${PV} == "99999999" ]] ; then
 	KEYWORDS=""
 else
 	MAGIC=eedea41
-	SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
+	SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
 	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
 	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
-HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20170514.ebuild
similarity index 91%
rename from games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild
rename to games-puzzle/sgt-puzzles/sgt-puzzles-20170514.ebuild
index cf3b22e17844..483e2dc3387b 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170506.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170514.ebuild
@@ -12,14 +12,14 @@ if [[ ${PV} == "99999999" ]] ; then
 	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
 	KEYWORDS=""
 else
-	MAGIC=23a5372
-	SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
+	MAGIC=7bdfda8
+	SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
 	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
-HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 
 LICENSE="MIT"
 SLOT="0"
@@ -35,7 +35,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	virtual/pkgconfig
-	doc? ( >=app-doc/halibut-1.0 )"
+	doc? ( >=app-doc/halibut-1.2 )"
 
 PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
 
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
index cf3b22e17844..483e2dc3387b 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
@@ -12,14 +12,14 @@ if [[ ${PV} == "99999999" ]] ; then
 	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
 	KEYWORDS=""
 else
-	MAGIC=23a5372
-	SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
+	MAGIC=7bdfda8
+	SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
 	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
-HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 
 LICENSE="MIT"
 SLOT="0"
@@ -35,7 +35,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	virtual/pkgconfig
-	doc? ( >=app-doc/halibut-1.0 )"
+	doc? ( >=app-doc/halibut-1.2 )"
 
 PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
 
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild
index c0268205f73a..b748cd5fa444 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild
@@ -101,7 +101,9 @@ PATCHES=(
 )
 
 python_check_deps() {
-	use test && has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	if use test; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
 }
 
 pkg_setup() {
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild
index e6ce7e8faebc..640a918763b1 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 GNOME2_EAUTORECONF="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit gnome2 python-any-r1 systemd udev virtualx
 
@@ -22,7 +22,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linu
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.44.0:2[dbus]
-	>=x11-libs/gtk+-3.15.3:3
+	>=x11-libs/gtk+-3.15.3:3[X]
 	>=gnome-base/gnome-desktop-3.11.1:3=
 	>=gnome-base/gsettings-desktop-schemas-3.23.3
 	>=gnome-base/librsvg-2.36.2:2
@@ -76,12 +76,12 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gnome-session-3.23.2
 "
 # xproto-7.0.15 needed for power plugin
-# FIXME: tests require dbus-mock
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )
 	test? (
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
 		gnome-base/gnome-session )
 	dev-libs/libxml2:2
 	sys-devel/gettext
@@ -89,9 +89,14 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	x11-proto/inputproto
 	x11-proto/xf86miscproto
+	x11-proto/kbproto
 	>=x11-proto/xproto-7.0.15
 "
 
+# TypeErrors with python3; weird test errors with python2; all in power component that was made required now
+RESTRICT="test"
+# RESTRICT="!test? ( test )"
+
 PATCHES=(
 	# Make colord and wacom optional; requires eautoreconf
 	"${FILESDIR}"/${P}-optional.patch
@@ -100,7 +105,10 @@ PATCHES=(
 )
 
 python_check_deps() {
-	use test && has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	if use test; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+	fi
 }
 
 pkg_setup() {
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 519705b7c560..e43538085607 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,2 +1,3 @@
 DIST network-manager-applet-1.2.4.tar.xz 1321740 SHA256 dff72956c939743e899954c9d32f0ebff4f213f1307a8157adc548584a0da37a SHA512 0cf9dd2db3289b29e550f96212c425c807b4a425d6a98cf00981e44d2bd5d1eb41c482072b5b030f32ae744c27f49a7757d762f7eda17cbba90560f0b3af1a30 WHIRLPOOL e2157108be89cbfab2327ded1bbee101c2332a5b8f85d3ad4bd490b4e4bcfb07f751d87ade9ef9538c2a1004abd6c146c6741eacd5c8825ad8392d40ae9b2277
 DIST network-manager-applet-1.4.6.tar.xz 1388916 SHA256 10a6fcfe8c6206cf18ec78a522a716b5ec9d0b7ca1e7d234c638725b316fec76 SHA512 f0eab5c50739c2309fa19336e23ead6603dc953b62fff0600a91988df8d41c2f300c22ebd4d5be8654a3fd7bac38dacc23be149f1a7085f10bb55e1830d9472f WHIRLPOOL f04c5bcf0796539b37fc1b83f81151be2fa68bb078209555196840617332ac8e624cc5911c9932b1768764c2bd696c613c760681d543f8e8e28d0f7f0bc7e221
+DIST network-manager-applet-1.8.0.tar.xz 1446328 SHA256 d4de2457d27dc8bc236ece54d79e6b5ab24611b9ce7cbdd514671ebcb772d576 SHA512 5f86806cd60d740ddd7773d6f006b1fd2cefdaecdf617c97dba48732a872f0cb1d4ac0785e87f989f13cd626cdbe017b6f99ce0079aecc6031d3cc52d8d2a36d WHIRLPOOL 06e0fad89a9190e0f83ddd92cff43a8be4db658fbbb3cfaa754026e50e6c60e3f9ec0d38cf00d7dae907bbfb514f342498eeff9db1a880e502ce6ad8ccb555af
diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
index 96fdf3e479a4..7cb30b744ca5 100644
--- a/gnome-extra/nm-applet/metadata.xml
+++ b/gnome-extra/nm-applet/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
+		<flag name="gcr">Enable advanced certificate chooser, requires <pkg>app-crypt/gcr</pkg></flag>
 		<flag name="modemmanager">Enable support for mobile broadband devices
 			using <pkg>net-misc/modemmanager</pkg></flag>
 		<flag name="teamd">Enable teamd configuration editor</flag>
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.0.ebuild
new file mode 100644
index 000000000000..2a6ddf30c276
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.8.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome2
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection gcr modemmanager selinux teamd"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	app-crypt/libsecret
+	>=dev-libs/glib-2.32:2[dbus]
+	>=dev-libs/dbus-glib-0.88
+	>=sys-apps/dbus-1.4.1
+	>=sys-auth/polkit-0.96-r1
+	>=x11-libs/gtk+-3.4:3[introspection?]
+	>=x11-libs/libnotify-0.7.0
+
+	app-text/iso-codes
+	>=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
+	net-misc/mobile-broadband-provider-info
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	virtual/freedesktop-icon-theme
+	virtual/libgudev:=
+	gcr? ( >=app-crypt/gcr-3.14:= )
+	modemmanager? ( net-misc/modemmanager )
+	selinux? ( sys-libs/libselinux )
+	teamd? ( >=dev-libs/jansson-2.3 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.0
+	>=dev-util/intltool-0.50.1
+	virtual/pkgconfig
+"
+
+PDEPEND="virtual/notification-daemon" #546134
+
+src_configure() {
+	local myconf=(
+		--without-appindicator
+		--disable-lto
+		--disable-ld-gc
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		$(use_enable introspection)
+		$(use_with gcr)
+		$(use_with modemmanager wwan)
+		$(use_with selinux)
+		$(use_with teamd team)
+	)
+	gnome2_src_configure "${myconf[@]}"
+}
diff --git a/kde-apps/ark/ark-17.04.1.ebuild b/kde-apps/ark/ark-17.04.1.ebuild
index 3ba7d3c0e61d..754e10fc9aca 100644
--- a/kde-apps/ark/ark-17.04.1.ebuild
+++ b/kde-apps/ark/ark-17.04.1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	app-arch/libarchive:=[bzip2?,lzma?,zlib?]
+	>=app-arch/libarchive-3.2.0:=[bzip2?,lzma?,zlib?]
 	zip? ( >=dev-libs/libzip-1.2.0:= )
 "
 DEPEND="${RDEPEND}
diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild
index 9c924c0f7524..fb0e33016981 100644
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="kwallet nls pam"
+IUSE="kwallet nls"
 
 [[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
 
@@ -24,9 +24,9 @@ RDEPEND="
 	$(add_kdeapps_dep ktimezoned '' 16.04.3)
 	$(add_kdeapps_dep ktraderclient '' 16.04.3)
 	$(add_kdeapps_dep phonon-kde '' 16.04.3)
-	kwallet? (
+	kwallet? ( || (
+		$(add_frameworks_dep kwallet '' 5.34.0-r1)
 		$(add_kdeapps_dep kwalletd '' 16.04.3)
-		pam? ( $(add_plasma_dep kwallet-pam 'oldwallet') )
-	)
+	) )
 	nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
 "
diff --git a/kde-apps/kdebase-runtime-meta/metadata.xml b/kde-apps/kdebase-runtime-meta/metadata.xml
index 2f37d4d8ecad..080de1ce90f6 100644
--- a/kde-apps/kdebase-runtime-meta/metadata.xml
+++ b/kde-apps/kdebase-runtime-meta/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="kwallet">Install <pkg>kde-apps/kwalletd</pkg> on a minimal setup for migration purposes</flag>
+		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.34.0-r1.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.34.0-r1.ebuild
new file mode 100644
index 000000000000..e6bc126ee07c
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.34.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5 udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtnetwork)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-race-condition.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# bug: 609248
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/bluez-qt/files/bluez-qt-5.34.0-fix-race-condition.patch b/kde-frameworks/bluez-qt/files/bluez-qt-5.34.0-fix-race-condition.patch
new file mode 100644
index 000000000000..84f39a3c2b9b
--- /dev/null
+++ b/kde-frameworks/bluez-qt/files/bluez-qt-5.34.0-fix-race-condition.patch
@@ -0,0 +1,358 @@
+From c02c4806c9bfcd6dc36fab6ed9873cff86681cdd Mon Sep 17 00:00:00 2001
+From: David Rosca <nowrep@gmail.com>
+Date: Fri, 26 May 2017 13:55:44 +0200
+Subject: Fix property changes being missed immediately after an obejct is
+ added
+
+Fix race condition when property changes may be missed if the property
+is changed immediately after the object is created.
+The issue was that the connection to PropertyChanged signal was
+created only after interfacesAdded signal was fired, which may have
+already been too late.
+This fixes it with connecting to PropertyChanged signal on all paths
+in Manager::init().
+
+BUG: 377405
+
+Differential Revision: https://phabricator.kde.org/D5550
+---
+ autotests/fakebluez/devicemanager.cpp | 19 +++++++++++++++++++
+ autotests/fakebluez/devicemanager.h   |  1 +
+ autotests/managertest.cpp             | 20 ++++++++++++++++++++
+ autotests/managertest.h               |  1 +
+ src/adapter_p.cpp                     |  8 --------
+ src/device_p.cpp                      | 10 +++++-----
+ src/input.cpp                         | 10 +++-------
+ src/input_p.h                         |  4 ----
+ src/manager_p.cpp                     | 27 +++++++++++++++++++++++++++
+ src/manager_p.h                       |  4 +++-
+ src/mediaplayer_p.cpp                 |  3 ---
+ src/utils.cpp                         |  7 +++++++
+ src/utils.h                           |  1 +
+ 13 files changed, 87 insertions(+), 28 deletions(-)
+
+diff --git a/autotests/fakebluez/devicemanager.cpp b/autotests/fakebluez/devicemanager.cpp
+index 7967047..229b92a 100644
+--- a/autotests/fakebluez/devicemanager.cpp
++++ b/autotests/fakebluez/devicemanager.cpp
+@@ -43,6 +43,8 @@ void DeviceManager::runAction(const QString &actionName, const QVariantMap &prop
+         runChangeAdapterProperty(properties);
+     } else if (actionName == QLatin1String("change-device-property")) {
+         runChangeDeviceProperty(properties);
++    } else if (actionName == QLatin1String("bug377405")) {
++        runBug377405();
+     }
+ }
+ 
+@@ -103,3 +105,20 @@ void DeviceManager::runChangeDeviceProperty(const QVariantMap &properties)
+ 
+     device->changeProperty(properties.value(QStringLiteral("Name")).toString(), properties.value(QStringLiteral("Value")));
+ }
++
++void DeviceManager::runBug377405()
++{
++    QDBusObjectPath adapter1path = QDBusObjectPath(QStringLiteral("/org/bluez/hci0"));
++    QVariantMap adapterProps;
++    adapterProps[QStringLiteral("Path")] = QVariant::fromValue(adapter1path);
++    adapterProps[QStringLiteral("Powered")] = false;
++
++    runCreateAdapterAction(adapterProps);
++
++    QVariantMap properties;
++    properties[QStringLiteral("Path")] = QVariant::fromValue(adapter1path);
++    properties[QStringLiteral("Name")] = QStringLiteral("Powered");
++    properties[QStringLiteral("Value")] = true;
++
++    runChangeAdapterProperty(properties);
++}
+diff --git a/autotests/fakebluez/devicemanager.h b/autotests/fakebluez/devicemanager.h
+index f830175..163b311 100644
+--- a/autotests/fakebluez/devicemanager.h
++++ b/autotests/fakebluez/devicemanager.h
+@@ -41,6 +41,7 @@ private:
+     void runRemoveDeviceAction(const QVariantMap &properties);
+     void runChangeAdapterProperty(const QVariantMap &properties);
+     void runChangeDeviceProperty(const QVariantMap &properties);
++    void runBug377405();
+ 
+     ObjectManager *m_objectManager;
+ 
+diff --git a/autotests/managertest.cpp b/autotests/managertest.cpp
+index 3217f97..1d7ffcc 100644
+--- a/autotests/managertest.cpp
++++ b/autotests/managertest.cpp
+@@ -437,4 +437,24 @@ void ManagerTest::bug364416()
+     delete manager;
+ }
+ 
++void ManagerTest::bug377405()
++{
++    // Bug 377405: Property changes immediately after adapter is added are lost
++
++    FakeBluez::start();
++    FakeBluez::runTest(QStringLiteral("bluez-standard"));
++
++    Manager *manager = new Manager;
++
++    InitManagerJob *job = manager->init();
++    job->exec();
++
++    QVERIFY(!job->error());
++
++    FakeBluez::runAction(QStringLiteral("devicemanager"), QStringLiteral("bug377405"));
++
++    // Adapter property Powered is changed to true immediately after being added
++    QTRY_COMPARE(manager->isBluetoothOperational(), true);
++}
++
+ QTEST_MAIN(ManagerTest)
+diff --git a/autotests/managertest.h b/autotests/managertest.h
+index 654fe98..9de8ae1 100644
+--- a/autotests/managertest.h
++++ b/autotests/managertest.h
+@@ -41,6 +41,7 @@ private Q_SLOTS:
+     void deviceForAddressTest();
+     void adapterWithDevicesRemovedTest();
+     void bug364416();
++    void bug377405();
+ 
+ };
+ 
+diff --git a/src/adapter_p.cpp b/src/adapter_p.cpp
+index 786fa7d..eb5fa9f 100644
+--- a/src/adapter_p.cpp
++++ b/src/adapter_p.cpp
+@@ -48,14 +48,6 @@ void AdapterPrivate::init(const QVariantMap &properties)
+     m_dbusProperties = new DBusProperties(Strings::orgBluez(), m_bluezAdapter->path(),
+                                           DBusConnection::orgBluez(), this);
+ 
+-    // QueuedConnection is important here to be able to perform actions, that depend on
+-    // a previously set property, directly from slot connected to propertyChanged signal.
+-    // Eg. Powering on adapter and then starting discovery.
+-    //  * with DirectConnection the StartDiscovery would fail because the adapter is still
+-    //    powered off when the PropertiesChanged signal is emitted ...
+-    connect(m_dbusProperties, &DBusProperties::PropertiesChanged,
+-            this, &AdapterPrivate::propertiesChanged, Qt::QueuedConnection);
+-
+     // Init properties
+     m_address = properties.value(QStringLiteral("Address")).toString();
+     m_name = properties.value(QStringLiteral("Name")).toString();
+diff --git a/src/device_p.cpp b/src/device_p.cpp
+index 79cbb86..351162d 100644
+--- a/src/device_p.cpp
++++ b/src/device_p.cpp
+@@ -58,10 +58,6 @@ void DevicePrivate::init(const QVariantMap &properties)
+     m_dbusProperties = new DBusProperties(Strings::orgBluez(), m_bluezDevice->path(),
+                                           DBusConnection::orgBluez(), this);
+ 
+-    // QueuedConnection is important here - see AdapterPrivate::initProperties
+-    connect(m_dbusProperties, &DBusProperties::PropertiesChanged,
+-            this, &DevicePrivate::propertiesChanged, Qt::QueuedConnection);
+-
+     // Init properties
+     m_address = properties.value(QStringLiteral("Address")).toString();
+     m_name = properties.value(QStringLiteral("Name")).toString();
+@@ -136,7 +132,11 @@ QDBusPendingReply<> DevicePrivate::setDBusProperty(const QString &name, const QV
+ 
+ void DevicePrivate::propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalidated)
+ {
+-    if (interface != Strings::orgBluezDevice1()) {
++    if (interface == Strings::orgBluezInput1() && m_input) {
++        m_input->d->propertiesChanged(interface, changed, invalidated);
++    } else if (interface == Strings::orgBluezMediaPlayer1() && m_mediaPlayer) {
++        m_mediaPlayer->d->propertiesChanged(interface, changed, invalidated);
++    } else if (interface != Strings::orgBluezDevice1()) {
+         return;
+     }
+ 
+diff --git a/src/input.cpp b/src/input.cpp
+index 4cf4f03..aabb996 100644
+--- a/src/input.cpp
++++ b/src/input.cpp
+@@ -25,11 +25,11 @@
+ #include "utils.h"
+ #include "macros.h"
+ 
++#include <QVariantMap>
++
+ namespace BluezQt
+ {
+ 
+-typedef org::freedesktop::DBus::Properties DBusProperties;
+-
+ static Input::ReconnectMode stringToReconnectMode(const QString &mode)
+ {
+     if (mode == QLatin1String("none")) {
+@@ -45,11 +45,7 @@ static Input::ReconnectMode stringToReconnectMode(const QString &mode)
+ InputPrivate::InputPrivate(const QString &path, const QVariantMap &properties)
+     : QObject()
+ {
+-    m_dbusProperties = new DBusProperties(Strings::orgBluez(), path,
+-                                          DBusConnection::orgBluez(), this);
+-
+-    connect(m_dbusProperties, &DBusProperties::PropertiesChanged,
+-            this, &InputPrivate::propertiesChanged, Qt::QueuedConnection);
++    Q_UNUSED(path);
+ 
+     // Init properties
+     m_reconnectMode = stringToReconnectMode(properties.value(QStringLiteral("ReconnectMode")).toString());
+diff --git a/src/input_p.h b/src/input_p.h
+index 424179a..ce3f33d 100644
+--- a/src/input_p.h
++++ b/src/input_p.h
+@@ -26,13 +26,10 @@
+ #include <QObject>
+ 
+ #include "input.h"
+-#include "dbusproperties.h"
+ 
+ namespace BluezQt
+ {
+ 
+-typedef org::freedesktop::DBus::Properties DBusProperties;
+-
+ class InputPrivate : public QObject
+ {
+     Q_OBJECT
+@@ -43,7 +40,6 @@ public:
+     void propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalidated);
+ 
+     QWeakPointer<Input> q;
+-    DBusProperties *m_dbusProperties;
+ 
+     Input::ReconnectMode m_reconnectMode;
+ };
+diff --git a/src/manager_p.cpp b/src/manager_p.cpp
+index aaec901..105d954 100644
+--- a/src/manager_p.cpp
++++ b/src/manager_p.cpp
+@@ -82,6 +82,13 @@ void ManagerPrivate::init()
+ 
+     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(DBusConnection::orgBluez().asyncCall(call));
+     connect(watcher, &QDBusPendingCallWatcher::finished, this, &ManagerPrivate::nameHasOwnerFinished);
++
++    DBusConnection::orgBluez().connect(Strings::orgBluez(),
++                                       QString(),
++                                       Strings::orgFreedesktopDBusProperties(),
++                                       QStringLiteral("PropertiesChanged"),
++                                       this,
++                                       SLOT(propertiesChanged(QString,QVariantMap,QStringList)));
+ }
+ 
+ void ManagerPrivate::nameHasOwnerFinished(QDBusPendingCallWatcher *watcher)
+@@ -424,6 +431,26 @@ void ManagerPrivate::setUsableAdapter(const AdapterPtr &adapter)
+     }
+ }
+ 
++void ManagerPrivate::propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalidated)
++{
++    // Cut anything after device path to forward it to Device to handle
++    const QString path = message().path().section(QLatin1Char('/'), 0, 4);
++
++    QTimer::singleShot(0, this, [=]() {
++        AdapterPtr adapter = m_adapters.value(path);
++        if (adapter) {
++            adapter->d->propertiesChanged(interface, changed, invalidated);
++            return;
++        }
++        DevicePtr device = m_devices.value(path);
++        if (device) {
++            device->d->propertiesChanged(interface, changed, invalidated);
++            return;
++        }
++        qCDebug(BLUEZQT) << "Unhandled property change" << interface << changed << invalidated;
++    });
++}
++
+ void ManagerPrivate::dummy()
+ {
+ }
+diff --git a/src/manager_p.h b/src/manager_p.h
+index 0b26d1b..cc3276d 100644
+--- a/src/manager_p.h
++++ b/src/manager_p.h
+@@ -25,6 +25,7 @@
+ 
+ #include <QObject>
+ #include <QHash>
++#include <QDBusContext>
+ 
+ #include "types.h"
+ #include "rfkill.h"
+@@ -44,7 +45,7 @@ class Adapter;
+ class Device;
+ class AdapterPrivate;
+ 
+-class ManagerPrivate : public QObject
++class ManagerPrivate : public QObject, protected QDBusContext
+ {
+     Q_OBJECT
+ 
+@@ -96,6 +97,7 @@ Q_SIGNALS:
+     void initFinished();
+ 
+ private Q_SLOTS:
++    void propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalidated);
+     void dummy();
+ 
+ };
+diff --git a/src/mediaplayer_p.cpp b/src/mediaplayer_p.cpp
+index 3c4e57e..21a3ebb 100644
+--- a/src/mediaplayer_p.cpp
++++ b/src/mediaplayer_p.cpp
+@@ -92,9 +92,6 @@ void MediaPlayerPrivate::init(const QVariantMap &properties)
+     m_dbusProperties = new DBusProperties(Strings::orgBluez(), m_bluezMediaPlayer->path(),
+                                           DBusConnection::orgBluez(), this);
+ 
+-    connect(m_dbusProperties, &DBusProperties::PropertiesChanged,
+-            this, &MediaPlayerPrivate::propertiesChanged, Qt::QueuedConnection);
+-
+     // Init properties
+     m_name = properties.value(QStringLiteral("Name")).toString();
+     m_equalizer = stringToEqualizer(properties.value(QStringLiteral("Equalizer")).toString());
+diff --git a/src/utils.cpp b/src/utils.cpp
+index aed8250..9ca3d6d 100644
+--- a/src/utils.cpp
++++ b/src/utils.cpp
+@@ -39,6 +39,7 @@ public:
+ 
+     bool testRun;
+     QString orgFreedesktopDBus;
++    QString orgFreedesktopDBusProperties;
+     QString orgBluez;
+     QString orgBluezAdapter1;
+     QString orgBluezDevice1;
+@@ -59,6 +60,7 @@ GlobalData::GlobalData()
+ {
+     testRun = false;
+     orgFreedesktopDBus = QStringLiteral("org.freedesktop.DBus");
++    orgFreedesktopDBusProperties = QStringLiteral("org.freedesktop.DBus.Properties");
+     orgBluez = QStringLiteral("org.bluez");
+     orgBluezAdapter1 = QStringLiteral("org.bluez.Adapter1");
+     orgBluezDevice1 = QStringLiteral("org.bluez.Device1");
+@@ -88,6 +90,11 @@ QString Strings::orgFreedesktopDBus()
+     return globalData->orgFreedesktopDBus;
+ }
+ 
++QString Strings::orgFreedesktopDBusProperties()
++{
++    return globalData->orgFreedesktopDBusProperties;
++}
++
+ QString Strings::orgBluez()
+ {
+     return globalData->orgBluez;
+diff --git a/src/utils.h b/src/utils.h
+index fd49d8e..08cb6b9 100644
+--- a/src/utils.h
++++ b/src/utils.h
+@@ -36,6 +36,7 @@ namespace Strings
+ {
+ 
+ QString orgFreedesktopDBus();
++QString orgFreedesktopDBusProperties();
+ QString orgBluez();
+ QString orgBluezAdapter1();
+ QString orgBluezDevice1();
+-- 
+cgit v0.11.2
diff --git a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-1.patch b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-1.patch
new file mode 100644
index 000000000000..e231369e7805
--- /dev/null
+++ b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-1.patch
@@ -0,0 +1,36 @@
+From bf775a9a9fa2c8ba66bf5106969b076c68ecedca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sun, 31 May 2015 06:40:38 +0200
+Subject: [PATCH 1/5] Check for unique applicaton instance as early as possible
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Exit before KWalletD and the MigrationAgent has been initialized.
+The return value is changed, but concurrent instatiation of kwalletd is
+not a fault.
+
+Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
+---
+ src/runtime/kwalletd/main.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/runtime/kwalletd/main.cpp b/src/runtime/kwalletd/main.cpp
+index ff96208..c98c1b3 100644
+--- a/src/runtime/kwalletd/main.cpp
++++ b/src/runtime/kwalletd/main.cpp
+@@ -189,9 +189,10 @@ int main(int argc, char **argv)
+     aboutdata.addAuthor(i18n("George Staikos"), i18n("Former maintainer"), QStringLiteral("staikos@kde.org"));
+     aboutdata.addAuthor(i18n("Thiago Maceira"), i18n("D-Bus Interface"), QStringLiteral("thiago@kde.org"));
+ 
++    KDBusService dbusUniqueInstance(KDBusService::Unique);
++
+     KWalletD walletd;
+     MigrationAgent migrationAgent(&walletd, hash);
+-    KDBusService dbusUniqueInstance(KDBusService::Unique);
+ 
+     // NOTE: the command should be parsed only after KDBusService instantiation
+     QCommandLineParser cmdParser;
+-- 
+2.12.0
+
diff --git a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-2.patch b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-2.patch
new file mode 100644
index 000000000000..dd6a7833335b
--- /dev/null
+++ b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-2.patch
@@ -0,0 +1,51 @@
+From f63407a129910cac5b2f7bbf56a348932fdeb05a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sun, 31 May 2015 06:56:44 +0200
+Subject: [PATCH 2/5] Only start timer for migration agent if necessary
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
+---
+ src/runtime/kwalletd/migrationagent.cpp | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/runtime/kwalletd/migrationagent.cpp b/src/runtime/kwalletd/migrationagent.cpp
+index f3da947..110a5e0 100644
+--- a/src/runtime/kwalletd/migrationagent.cpp
++++ b/src/runtime/kwalletd/migrationagent.cpp
+@@ -41,7 +41,11 @@ MigrationAgent::MigrationAgent(KWalletD* kd, const char *hash) :
+   , _kde4_daemon(nullptr)
+   , _pam_hash(hash)
+ {
+-  QTimer::singleShot(100, this, SLOT(migrateWallets()));
++  if (isAlreadyMigrated()) {
++    qDebug() << "old wallets were already migrated";
++  } else {
++    QTimer::singleShot(100, this, SLOT(migrateWallets()));
++  }
+ }
+ 
+ void MigrationAgent::migrateWallets()
+@@ -55,7 +59,7 @@ void MigrationAgent::migrateWallets()
+   // if the migration wizard returns without error
+   // create "alreadyMigrated=true" setting
+   qDebug() << "Migration agent starting...";
+-  if (!isAlreadyMigrated()) {
++  {
+     if (connectOldDaemon()) {
+       if (!isEmptyOldWallet()) {
+         if (isMigrationWizardOk()) {
+@@ -70,8 +74,6 @@ void MigrationAgent::migrateWallets()
+     } else {
+       qDebug() << "KDE4 kwalletd not present, stopping migration agent";
+     }
+-  } else {
+-    qDebug() << "old wallets were already migrated";
+   }
+   qDebug() << "Migration agent stop.";
+ }
+-- 
+2.12.0
+
diff --git a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-3.patch b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-3.patch
new file mode 100644
index 000000000000..f993faf95cf8
--- /dev/null
+++ b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-3.patch
@@ -0,0 +1,51 @@
+From 574fdd416b5f6b0907826034916c03dddb08341a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sun, 31 May 2015 06:47:55 +0200
+Subject: [PATCH 3/5] Whitespace fixup
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
+---
+ src/runtime/kwalletd/migrationagent.cpp | 20 +++++++++-----------
+ 1 file changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/src/runtime/kwalletd/migrationagent.cpp b/src/runtime/kwalletd/migrationagent.cpp
+index 110a5e0..ec60812 100644
+--- a/src/runtime/kwalletd/migrationagent.cpp
++++ b/src/runtime/kwalletd/migrationagent.cpp
+@@ -59,21 +59,19 @@ void MigrationAgent::migrateWallets()
+   // if the migration wizard returns without error
+   // create "alreadyMigrated=true" setting
+   qDebug() << "Migration agent starting...";
+-  {
+-    if (connectOldDaemon()) {
+-      if (!isEmptyOldWallet()) {
+-        if (isMigrationWizardOk()) {
+-          setAlreadyMigrated();
+-        } else {
+-          qDebug() << "Migration wizard returned an error or has been canceled. The migration agent will resume upon next daemon start";
+-        }
+-      } else {
+-        qDebug() << "Old wallet is empty. No need to migrate.";
++  if (connectOldDaemon()) {
++    if (!isEmptyOldWallet()) {
++      if (isMigrationWizardOk()) {
+         setAlreadyMigrated();
++      } else {
++        qDebug() << "Migration wizard returned an error or has been canceled. The migration agent will resume upon next daemon start";
+       }
+     } else {
+-      qDebug() << "KDE4 kwalletd not present, stopping migration agent";
++      qDebug() << "Old wallet is empty. No need to migrate.";
++      setAlreadyMigrated();
+     }
++  } else {
++    qDebug() << "KDE4 kwalletd not present, stopping migration agent";
+   }
+   qDebug() << "Migration agent stop.";
+ }
+-- 
+2.12.0
+
diff --git a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-4.patch b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-4.patch
new file mode 100644
index 000000000000..a0cc6d73f518
--- /dev/null
+++ b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-4.patch
@@ -0,0 +1,60 @@
+From 8d5636d8185cf3a572a9b81a9b9246eb6371685b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sun, 31 May 2015 06:49:46 +0200
+Subject: [PATCH 4/5] Signal completion of migration agent
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
+---
+ src/runtime/kwalletd/migrationagent.cpp | 4 ++++
+ src/runtime/kwalletd/migrationagent.h   | 1 +
+ 2 files changed, 5 insertions(+)
+
+diff --git a/src/runtime/kwalletd/migrationagent.cpp b/src/runtime/kwalletd/migrationagent.cpp
+index ec60812..6eb6013 100644
+--- a/src/runtime/kwalletd/migrationagent.cpp
++++ b/src/runtime/kwalletd/migrationagent.cpp
+@@ -43,6 +43,7 @@ MigrationAgent::MigrationAgent(KWalletD* kd, const char *hash) :
+ {
+   if (isAlreadyMigrated()) {
+     qDebug() << "old wallets were already migrated";
++    emit migrationFinished();
+   } else {
+     QTimer::singleShot(100, this, SLOT(migrateWallets()));
+   }
+@@ -63,15 +64,18 @@ void MigrationAgent::migrateWallets()
+     if (!isEmptyOldWallet()) {
+       if (isMigrationWizardOk()) {
+         setAlreadyMigrated();
++        emit migrationFinished();
+       } else {
+         qDebug() << "Migration wizard returned an error or has been canceled. The migration agent will resume upon next daemon start";
+       }
+     } else {
+       qDebug() << "Old wallet is empty. No need to migrate.";
+       setAlreadyMigrated();
++      emit migrationFinished();
+     }
+   } else {
+     qDebug() << "KDE4 kwalletd not present, stopping migration agent";
++    emit migrationFinished();
+   }
+   qDebug() << "Migration agent stop.";
+ }
+diff --git a/src/runtime/kwalletd/migrationagent.h b/src/runtime/kwalletd/migrationagent.h
+index 0f6467c..9c974a0 100644
+--- a/src/runtime/kwalletd/migrationagent.h
++++ b/src/runtime/kwalletd/migrationagent.h
+@@ -48,6 +48,7 @@ public Q_SLOTS:
+ 
+ Q_SIGNALS:
+     void progressMessage(const QString &);
++    void migrationFinished();
+ 
+ private:
+     KWalletD		*_kf5_daemon;
+-- 
+2.12.0
+
diff --git a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-5.patch b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-5.patch
new file mode 100644
index 000000000000..21f4a3509a99
--- /dev/null
+++ b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-5.patch
@@ -0,0 +1,68 @@
+From e9d8932d04a7882471f722800b7b4603074d560d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sun, 31 May 2015 07:03:31 +0200
+Subject: [PATCH 5/5] Replace kwalletd4 after migration has finished
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+kwalletd5 can service both org.kde.kwalletd5 and org.kde.kwalletd
+
+Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
+---
+ src/runtime/kwalletd/kwalletd.cpp       | 13 +++++++++++++
+ src/runtime/kwalletd/kwalletd.h         |  1 +
+ src/runtime/kwalletd/migrationagent.cpp |  1 +
+ 3 files changed, 15 insertions(+)
+
+diff --git a/src/runtime/kwalletd/kwalletd.cpp b/src/runtime/kwalletd/kwalletd.cpp
+index 18ef9fa..da851da 100644
+--- a/src/runtime/kwalletd/kwalletd.cpp
++++ b/src/runtime/kwalletd/kwalletd.cpp
+@@ -151,6 +151,19 @@ KWalletD::KWalletD()
+         SLOT(slotServiceOwnerChanged(QString, QString, QString)));
+ }
+ 
++void KWalletD::registerKWalletd4Service()
++{
++    auto bus = QDBusConnection::sessionBus().interface();
++    auto reply = bus->registerService(QLatin1String("org.kde.kwalletd"), QDBusConnectionInterface::QueueService);
++    if (reply.isValid() && (reply.value() == QDBusConnectionInterface::ServiceQueued)) {
++      QDBusInterface _kde_kwalletd4("org.kde.kwalletd", "/MainApplication", "org.kde.KApplication");
++      if (_kde_kwalletd4.isValid()) {
++	auto qreply = _kde_kwalletd4.call("quit");
++      }
++    }
++    QDBusConnection::sessionBus().registerObject(QLatin1String("/modules/kwalletd"), this);
++}
++
+ KWalletD::~KWalletD()
+ {
+ #ifdef Q_WS_X11
+diff --git a/src/runtime/kwalletd/kwalletd.h b/src/runtime/kwalletd/kwalletd.h
+index 3571535..a862faf 100644
+--- a/src/runtime/kwalletd/kwalletd.h
++++ b/src/runtime/kwalletd/kwalletd.h
+@@ -182,6 +182,7 @@ private Q_SLOTS:
+     void notifyFailures();
+     void processTransactions();
+     void activatePasswordDialog();
++    void registerKWalletd4Service();
+ #ifdef Q_WS_X11
+     void connectToScreenSaver();
+ #endif
+diff --git a/src/runtime/kwalletd/migrationagent.cpp b/src/runtime/kwalletd/migrationagent.cpp
+index 6eb6013..639ee8d 100644
+--- a/src/runtime/kwalletd/migrationagent.cpp
++++ b/src/runtime/kwalletd/migrationagent.cpp
+@@ -41,6 +41,7 @@ MigrationAgent::MigrationAgent(KWalletD* kd, const char *hash) :
+   , _kde4_daemon(nullptr)
+   , _pam_hash(hash)
+ {
++  connect(this, &MigrationAgent::migrationFinished, _kf5_daemon, &KWalletD::registerKWalletd4Service);
+   if (isAlreadyMigrated()) {
+     qDebug() << "old wallets were already migrated";
+     emit migrationFinished();
+-- 
+2.12.0
+
diff --git a/kde-frameworks/kwallet/kwallet-5.34.0-r1.ebuild b/kde-frameworks/kwallet/kwallet-5.34.0-r1.ebuild
new file mode 100644
index 000000000000..e3a6046953ba
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.34.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gpg +man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libgcrypt:0=
+	gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.34.0-kwalletd4-{1,2,3,4,5}.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gpg Gpgmepp)
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then
+		elog
+		elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login."
+		elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
+		elog
+	fi
+	if has_version "kde-apps/kwalletd"; then
+		elog "Starting with 5.34.0-r1, ${PN} is able to serve applications"
+		elog "that still require old kwalletd4. After migration has finished,"
+		elog "kde-apps/kwalletd can be removed."
+	fi
+}
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.34.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.34.0.ebuild
index 6a47ad15d97d..d38f296a57e8 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.34.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.34.0.ebuild
@@ -25,3 +25,10 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!net-libs/libnm-qt:5
 "
+
+src_test() {
+	# bug: 619984
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 79c50578eb78..1831e86ab3f5 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,3 +1,2 @@
-DIST kio-gdrive-1.0.5.tar.xz 23148 SHA256 ada2327a3cbb02a9e9941190c240e50a1a484f5e3f56a1fe596b1445458c014f SHA512 d35c5d6bda967ec93b29ea29323b46a6f37d5478ffa6b719f4fd13e480d7785746e81bec9155b2c80db9d192aece867d67b3f96bc855453dda0098bfc8375798 WHIRLPOOL da5d14310ae54dabb1a1a7dfffdea118036a50ebbe74440422d3915c3461a43b4e874f5c70441ab4e69787b193412b2a3d7a7039dd6108fdec43731c7a1394b5
-DIST kio-gdrive-1.1.0.tar.xz 23924 SHA256 90162c9e82f885d6198046f2e25e579d05e813fbab37757b9b8f5fbe1b0e6972 SHA512 a58e56a5fff16776c1e6d948b2d1c776eb6097bf686e2865a52ae22eb21e9c05a0e7c0daf6e19077c5876e351b75ad31ad8e75e5e1c3a58190bc8b224daee42a WHIRLPOOL c5c97f77d54d94f4fabc1f31feb8acb06c0cd76c885f5ade690c68f72e2e50ab897f4e1797cc4cf72e9500f5159a7aa053f6f80803c2058276ee980c5f91446c
 DIST kio-gdrive-1.1.1.tar.xz 24096 SHA256 c840151e844f9c135ff575771c09ac78bd9c939b853af72b568c76aa1db540ea SHA512 9377167a8f12731b27adc816790f50b73685dbfccf416e4ca927f08d52a85adb2cc6d769c111fc66fd24fe9646217321d7392946dbc6f05c9eb8a3e6aeb929ba WHIRLPOOL 2096961eb41738a319cc8e9589a0c6b14df6c55a365344c8dd484ed2b329aae2f19db12c7e9c8f8ef0417241406ea81a607cb03008d53207f2c84705482941fd
+DIST kio-gdrive-1.2.0.tar.xz 33780 SHA256 c3b0eb54efc92daa636c8eb81113bf8f196cd2e3af0ba8c37660bfa3a7dd9274 SHA512 244d4eb3ec17451400b8e68eb554f5bf8708c797085dc8606be095d1c39f367e9f5c8633d68834cfdbd25032e1726372d3fead131610d3ae9daf25f555924d29 WHIRLPOOL 2e66b8706604e1ea1aed1af817f18fb4f901ff2fa7b52fd28ee6807b1e309b9362fd10d4fd0bbd2dd3b75c91bc00fa0ca18a0e94be3391dc2f12bd838eeab388
diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.0-tests-optional.patch b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.0-tests-optional.patch
new file mode 100644
index 000000000000..f72b0963e3fb
--- /dev/null
+++ b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.0-tests-optional.patch
@@ -0,0 +1,21 @@
+commit e9ddacb58dcf011bc2a877c11b026cab94031e65
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sat May 27 15:58:32 2017 +0200
+
+    If tests are optional, autotests subdir must be conditional
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0c1b691..a2a771c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -61,7 +61,9 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+ add_definitions(-DQT_STRICT_ITERATORS)
+ add_definitions(-DTRANSLATION_DOMAIN=\"kio5_gdrive\")
+ 
+-add_subdirectory(autotests)
++if(BUILD_TESTING)
++    add_subdirectory(autotests)
++endif()
+ add_subdirectory(desktop)
+ add_subdirectory(doc)
+ add_subdirectory(src)
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.1.0.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.1.0.ebuild
deleted file mode 100644
index a0b96aa6f40c..000000000000
--- a/kde-misc/kio-gdrive/kio-gdrive-1.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-KDE_TEST="optional"
-inherit kde5
-
-DESCRIPTION="KIO Slave for Google Drive service"
-HOMEPAGE="https://phabricator.kde.org/project/profile/72/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-DOCS=( README.md )
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep libkgapi '' 5.3.1)
-	$(add_qt_dep qtwidgets)
-	dev-libs/qtkeychain:=[qt5]
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-"
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.0.5.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.0.ebuild
similarity index 58%
rename from kde-misc/kio-gdrive/kio-gdrive-1.0.5.ebuild
rename to kde-misc/kio-gdrive/kio-gdrive-1.2.0.ebuild
index 635ba87ce3bd..7842a1f824b8 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-1.0.5.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-1.2.0.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=6
 
+KDE_APPS_MINIMAL="17.04.0"
 KDE_HANDBOOK="true"
+KDE_TEST="optional"
 inherit kde5
 
 DESCRIPTION="KIO Slave for Google Drive service"
@@ -14,37 +16,30 @@ if [[ ${KDE_BUILD_TYPE} != live ]] ; then
 	KEYWORDS="~amd64"
 fi
 
-IUSE="+dolphin"
+IUSE="+kaccounts"
 
-DOCS=( README.md )
-
-COMMON_DEPEND="
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep libkgapi '' 5.3.1)
+	$(add_frameworks_dep knotifications)
+	$(add_kdeapps_dep libkgapi)
 	$(add_qt_dep qtwidgets)
-	dev-libs/qtkeychain:=[qt5]
+	kaccounts? ( $(add_kdeapps_dep kaccounts-integration) )
+	!kaccounts? ( dev-libs/qtkeychain:=[qt5] )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
 "
-RDEPEND="${COMMON_DEPEND}
-	dolphin? ( $(add_kdeapps_dep dolphin) )
-"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		-DDOLPHIN_INTEGRATION=$(usex dolphin)
+		$(cmake-utils_use_find_package kaccounts KAccounts)
 	)
-
 	kde5_src_configure
 }
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	einfo
-	einfo "Either click on 'Google Drive File Manager' in the application"
-	einfo "launcher or type 'gdrive:/' in dolphin's location bar."
-	einfo
-}
diff --git a/kde-misc/kio-gdrive/metadata.xml b/kde-misc/kio-gdrive/metadata.xml
index 27b684666306..c902b8a994ed 100644
--- a/kde-misc/kio-gdrive/metadata.xml
+++ b/kde-misc/kio-gdrive/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="dolphin">Enable integration with <pkg>kde-apps/dolphin</pkg></flag>
+		<flag name="kaccounts">Use <pkg>kde-apps/kaccounts-integration</pkg> backend (default) instead of <pkg>dev-libs/qtkeychain</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-misc/rsibreak/Manifest b/kde-misc/rsibreak/Manifest
index 7f1ec3023676..9218842103b9 100644
--- a/kde-misc/rsibreak/Manifest
+++ b/kde-misc/rsibreak/Manifest
@@ -1 +1,2 @@
 DIST rsibreak-0.12.6.tar.xz 395300 SHA256 e9597d0d3eea7c71c750247016ee213f1f3e1847b94bab78bddd1cc4177dbfcf SHA512 7ee065e50fd2f350aec609616732eb99aaaf61a687348611afbb5f4efce3339921b5bcdf0e6df6629a6598cf74b76db773397006e1c45c63bea77ee5ce4207b6 WHIRLPOOL 4be6bf4e1a94461f5906dc19e4c902ed75cf889a2e99a03a874ecf0088766cda99a5385de0ff1c282e5312cb83c57e0b258dcf6b314aff2aa34b69b5e0732296
+DIST rsibreak-0.12.7.tar.xz 396000 SHA256 c9f33f56214ff572c76049cc7b2acc8c58585444017762596190d89826103942 SHA512 77da791a705549da159dee18ff160e051a79184e909af7ac9efcdbc2bcad66f6fc4994af71e0ccdf0033596cccc93c8d4642ae578846dc2aa38223c1a462008f WHIRLPOOL 50a0d4bc52cd02dde18376e0097aa84645b444a20f90ac248a08ed7b01f1d666e723ff550427edb2daebe3fac9ed77eda0871f007b56d90a749e55fe5d526713
diff --git a/kde-misc/rsibreak/rsibreak-0.12.7.ebuild b/kde-misc/rsibreak/rsibreak-0.12.7.ebuild
new file mode 100644
index 000000000000..839528dd49e7
--- /dev/null
+++ b/kde-misc/rsibreak/rsibreak-0.12.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5 versionator
+
+DESCRIPTION="Small utility which bothers you at certain intervals"
+HOMEPAGE="https://userbase.kde.org/RSIBreak"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+# bug 587170 for frameworkintegration
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep frameworkintegration)
+	!kde-misc/rsibreak:4
+"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.7.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.6-r1.ebuild
similarity index 95%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.8.7.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.8.6-r1.ebuild
index 36c47b693e2c..2540eb1dea9e 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.7.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.6-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+FRAMEWORKS_MINIMAL="5.34.0"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
@@ -131,6 +132,11 @@ src_prepare() {
 
 	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
 		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+
+	# https://phabricator.kde.org/D4690
+	sed -e "/add_subdirectory(remote)/ s/^/#DONT/" -i kioslave/CMakeLists.txt || die
+	rm -r kioslave/remote || die
+	find po -name "kio_remote.po" -delete || die
 }
 
 src_configure() {
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.9.5.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.7-r1.ebuild
similarity index 92%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.9.5.1.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.8.7-r1.ebuild
index 0ceac64cde58..2540eb1dea9e 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.9.5.1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.7-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+FRAMEWORKS_MINIMAL="5.34.0"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
@@ -66,6 +67,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
 	$(add_qt_dep qtxml)
+	dev-libs/libdbusmenu-qt[qt5]
 	media-libs/phonon[qt5]
 	sys-libs/zlib
 	x11-libs/libICE
@@ -117,7 +119,11 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	# master
+	"${FILESDIR}/${PN}-5.7.90-baloo-optional.patch"
+)
 
 RESTRICT+=" test"
 
@@ -126,6 +132,11 @@ src_prepare() {
 
 	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
 		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+
+	# https://phabricator.kde.org/D4690
+	sed -e "/add_subdirectory(remote)/ s/^/#DONT/" -i kioslave/CMakeLists.txt || die
+	rm -r kioslave/remote || die
+	find po -name "kio_remote.po" -delete || die
 }
 
 src_configure() {
diff --git a/mail-mta/nullmailer/nullmailer-2.0-r2.ebuild b/mail-mta/nullmailer/nullmailer-2.0-r2.ebuild
new file mode 100644
index 000000000000..8da57096407f
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-2.0-r2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic multilib systemd user
+
+DESCRIPTION="Simple relay-only local mail transport agent"
+HOMEPAGE="http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer"
+SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ssl test"
+
+DEPEND="
+	sys-apps/groff
+	ssl? ( net-libs/gnutls:0= )
+	test? ( sys-apps/ucspi-tcp[ipv6] sys-process/daemontools )"
+RDEPEND="
+	virtual/logger
+	virtual/shadow
+	ssl? ( net-libs/gnutls:0= )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/netqmail
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp"
+
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail
+}
+
+src_prepare() {
+	default
+	sed -i.orig \
+		-e '/\$(localstatedir)\/trigger/d' \
+		"${S}"/Makefile.am || die "Sed failed"
+	sed \
+		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
+		-i configure.ac || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	sed \
+		-e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" \
+		-e 's:/usr/etc/:/etc/:g' \
+		-i doc/nullmailer-send.8 || die
+	eautoreconf
+}
+
+src_configure() {
+	# https://github.com/bruceg/nullmailer/pull/31/commits
+	append-lfs-flags #471102
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable ssl tls)
+}
+
+src_install() {
+	default
+
+	# A small bit of sample config
+	insinto /etc/nullmailer
+	newins "${FILESDIR}"/remotes.sample-${PV} remotes
+
+	# This contains passwords, so should be secure
+	fperms 0640 /etc/nullmailer/remotes
+	fowners root:nullmail /etc/nullmailer/remotes
+
+	# daemontools stuff
+	dodir /var/spool/nullmailer/service{,/log}
+
+	insinto /var/spool/nullmailer/service
+	newins scripts/nullmailer.run run
+	fperms 700 /var/spool/nullmailer/service/run
+
+	insinto /var/spool/nullmailer/service/log
+	newins scripts/nullmailer-log.run run
+	fperms 700 /var/spool/nullmailer/service/log/run
+
+	# usability
+	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail
+
+	# permissions stuff
+	keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
+	fperms 770 /var/log/nullmailer
+	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
+
+	newinitd "${FILESDIR}"/init.d-nullmailer-r6 nullmailer
+	systemd_dounit scripts/${PN}.service
+}
+
+pkg_postinst() {
+	if [ ! -e "${EROOT}var/spool/nullmailer/trigger" ]; then
+		mkfifo "${EROOT}var/spool/nullmailer/trigger" || die
+	fi
+	chown nullmail:nullmail \
+		"${EROOT}"var/log/nullmailer \
+		"${EROOT}"var/spool/nullmailer/{tmp,queue,trigger} || die
+	chmod 770 \
+		"${EROOT}"var/log/nullmailer \
+		"${EROOT}"var/spool/nullmailer/{tmp,queue} || die
+	chmod 660 "${EROOT}"var/spool/nullmailer/trigger || die
+
+	# This contains passwords, so should be secure
+	chmod 0640 "${EROOT}"etc/nullmailer/remotes || die
+	chown root:nullmail "${EROOT}"etc/nullmailer/remotes || die
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To create an initial setup, please do:"
+		elog "emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}var/spool/nullmailer/trigger" ]]; then
+		rm "${EROOT}var/spool/nullmailer/trigger" || die
+	fi
+}
+
+pkg_config() {
+	if [ ! -s "${EROOT}etc/nullmailer/me" ]; then
+		einfo "Setting /etc/nullmailer/me"
+		hostname --fqdn > "${EROOT}etc/nullmailer/me"
+	fi
+	if [ ! -s "${EROOT}etc/nullmailer/defaultdomain" ]; then
+		einfo "Setting /etc/nullmailer/defaultdomain"
+		hostname --domain > "${EROOT}etc/nullmailer/defaultdomain"
+	fi
+}
diff --git a/media-gfx/darktable/darktable-2.2.3.ebuild b/media-gfx/darktable/darktable-2.2.3.ebuild
index 4f9cdaa981eb..fb0fe222ff1c 100644
--- a/media-gfx/darktable/darktable-2.2.3.ebuild
+++ b/media-gfx/darktable/darktable-2.2.3.ebuild
@@ -57,7 +57,10 @@ CDEPEND="
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kwallet? ( kde-apps/kwalletd:4 )"
+	kwallet? ( || (
+		>=kde-frameworks/kwallet-5.34.0-r1
+		kde-apps/kwalletd:4
+	) )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
diff --git a/media-gfx/darktable/darktable-2.2.4.ebuild b/media-gfx/darktable/darktable-2.2.4.ebuild
index 1f70dacf6afb..ce3aaad04efb 100644
--- a/media-gfx/darktable/darktable-2.2.4.ebuild
+++ b/media-gfx/darktable/darktable-2.2.4.ebuild
@@ -57,7 +57,10 @@ CDEPEND="
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kwallet? ( kde-apps/kwalletd:4 )"
+	kwallet? ( || (
+		>=kde-frameworks/kwallet-5.34.0-r1
+		kde-apps/kwalletd:4
+	) )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 0c100715307a..245e18c4c66d 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -53,7 +53,10 @@ CDEPEND="
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kwallet? ( kde-apps/kwalletd:4 )"
+	kwallet? ( || (
+		>=kde-frameworks/kwallet-5.34.0-r1
+		kde-apps/kwalletd:4
+	) )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
diff --git a/media-gfx/exiv2/exiv2-0.25-r2.ebuild b/media-gfx/exiv2/exiv2-0.25-r2.ebuild
index 5429666560d1..5f2ca76c7da1 100644
--- a/media-gfx/exiv2/exiv2-0.25-r2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.25-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit eutils cmake-multilib python-any-r1
 
diff --git a/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild b/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild
index 560d094119c6..0d619345ead1 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/qrencode-python/Manifest b/media-gfx/qrencode-python/Manifest
index ad69a6dd31f9..2916cd14889b 100644
--- a/media-gfx/qrencode-python/Manifest
+++ b/media-gfx/qrencode-python/Manifest
@@ -1,2 +1 @@
-DIST qrencode-python-1.01.tar.gz 2456 SHA256 fd8cdabd743e2db7a1ad332d4f0fe037e5a7807cb2f1d32da3e39439088bb610 SHA512 fc0514038dc78556335744872ad94d48eb68991118f204a6547f2979d62694441d28c5eb67a8a34a096cd686a9ae10ce5f95753a0e3f676f6ad53b3792f6946c WHIRLPOOL d9a0e833437cf1640d6cfb4f84debef936898d88c0c3f5565499a4ef848be45a5c5b1eeeaf2cc8a098c4898183395db688152154d93314c1db693eaccaa285ce
 DIST qrencode-python-1.02_pre140921.tar.gz 2084 SHA256 8c3d5d2c5479f10aa1462a9bf95390b78b47043bf56e0f581ed61a3eb9507ccf SHA512 231c61f98f064d282611d14194de7b3c0a18faff0ed856722e39a6cc25f744442d77bd43418aec117c6e39ddd78a6ea770edee8992aa4e3cfce50254ac6526aa WHIRLPOOL 44009c565bff4c330a416653e7c3863a33b25290a71e4a800f920240b11428fa945ae1c854af5f5c9b5d1d508a915f97bfdbd7c15eee791b27628912f0edd452
diff --git a/media-gfx/qrencode-python/files/qrencode-python-1.01-PIL.patch b/media-gfx/qrencode-python/files/qrencode-python-1.01-PIL.patch
deleted file mode 100644
index 0f0b2d4912e0..000000000000
--- a/media-gfx/qrencode-python/files/qrencode-python-1.01-PIL.patch
+++ /dev/null
@@ -1,14 +0,0 @@
- qrencode/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qrencode/__init__.py b/qrencode/__init__.py
-index 4ca5396..ba0c15e 100644
---- a/qrencode/__init__.py
-+++ b/qrencode/__init__.py
-@@ -1,5 +1,5 @@
- from qr_encode import encode as _encode
--import Image
-+from PIL import Image
- 
- 
- QR_ECLEVEL_L = 0
diff --git a/media-gfx/qrencode-python/qrencode-python-1.01-r1.ebuild b/media-gfx/qrencode-python/qrencode-python-1.01-r1.ebuild
deleted file mode 100644
index 272d44ff7636..000000000000
--- a/media-gfx/qrencode-python/qrencode-python-1.01-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple wrapper for the C qrencode library"
-HOMEPAGE="https://pypi.python.org/pypi/qrencode/ https://github.com/Arachnid/pyqrencode/"
-SRC_URI="mirror://pypi/q/qrencode/qrencode-${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="Apache-2.0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-gfx/qrencode"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/qrencode-${PV}
-
-PATCHES=( "${FILESDIR}"/${P}-PIL.patch )
diff --git a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
index dcc068f04776..10d25c6326d6 100644
--- a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
+++ b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/media-libs/lensfun/lensfun-0.3.2.ebuild b/media-libs/lensfun/lensfun-0.3.2.ebuild
index 2b755ccd7498..a6aff26cf5ad 100644
--- a/media-libs/lensfun/lensfun-0.3.2.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit multilib python-single-r1 cmake-utils
 
@@ -34,7 +34,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
 		-DLIBDIR="${EPREFIX}"/usr/$(get_libdir)
-		-DSETUP_PY_INSTALL_PREFIX="${ED}"/$(python_get_sitedir)
+		-DSETUP_PY_INSTALL_PREFIX="${ED}"/usr
 		-DBUILD_AUXFUN=ON
 		-DBUILD_DOC=$(usex doc ON OFF)
 		-DBUILD_FOR_SSE=$(usex cpu_flags_x86_sse ON OFF)
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 68f541c65cec..44ba06c4f718 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,3 +2,4 @@ DIST mesa-13.0.5.tar.xz 9171480 SHA256 bfcea7e2c801525a60895c8aff11aa68457ee9aa3
 DIST mesa-13.0.6.tar.xz 9179236 SHA256 29ef104a7fc082d352b1599bd6cb1d040be424ccd22f5e0eb7ee9b0e9acd3597 SHA512 2455e044647f674c2f1dd524143b61b8630713fa929bbf6fe1c981436a9c08dc933553d638a22b32d2799afb77be746355b48b1b20af172141c5b63891e94441 WHIRLPOOL 1fdaaf29de96225cf41a3bdeb559a35cf20fda524f80985b2bfdc52095dcb7f6b320704b7ccf754a6f80555925a6a80dfa2b1115a4bdd9bdc1ebb672f115208a
 DIST mesa-17.0.6.tar.xz 9494872 SHA256 89ecf3bcd0f18dcca5aaa42bf36bb52a2df33be89889f94aaaad91f7a504a69d SHA512 537d28aa694c2d48811d2467e33b3adc841067d5f1cdb7e0809ba100f71869090285bbb246e57e5f0177401a539b44cc32b1ccfcb32a1855c14b011b92d32eaf WHIRLPOOL f3ee87377e87cbd23bd9009d840e6c0ae50ccbbb30cfa7be61f3023cbe9519f5b50f22c59dbcc207a106a6e357d77074fcaee63916ee091b920cbc3d511ec2ab
 DIST mesa-17.1.0.tar.xz 9849580 SHA256 cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17 SHA512 9730e989ec2731e9b1df7515104d585af3fb7234f40fa13e8974910784db24c25e06d0c546af85de6a9c562212b6784932510c607f5f4b8061194a6429a64af3 WHIRLPOOL f7ed68bd0888f58012aa9505cf078d0670e90aa3983e45cc3c60dc55594a19096edead339872d5a2111d563b195f11aba99caba60197a7b02bec58f0ff23d754
+DIST mesa-17.1.1.tar.xz 9854480 SHA256 aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef SHA512 4679b8c1a957e515e9f7a6658f2264d4c458379a37fa8f64c9ef03e817857a683fc527a8172d3ae68ca5ebc84a1a78264e18807704c5130c95efdf0431502bc7 WHIRLPOOL e34aef05bc9f6256a717de1d47f445fedbe5981836724b31e6d0ee801a26b23da9c70acdbfc86d2b676f494ba2c47bf24d8ed0c5c8fb3774fba28443d47578d4
diff --git a/media-libs/mesa/mesa-17.1.1.ebuild b/media-libs/mesa/mesa-17.1.1.ebuild
new file mode 100644
index 000000000000..ef15690a3722
--- /dev/null
+++ b/media-libs/mesa/mesa-17.1.1.ebuild
@@ -0,0 +1,502 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+
+if [[ ${PV} = 9999 ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/"
+
+if [[ $PV == 9999 ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+INTEL_CARDS="i915 i965 intel"
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
+	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
+	vdpau vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 gallium )
+	llvm?   ( gallium )
+	opencl? ( gallium llvm )
+	openmax? ( gallium )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vaapi? ( gallium )
+	vdpau? ( gallium )
+	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+	          video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	xa?  ( gallium )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( 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_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
+# 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
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${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}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+			vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		>=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+	vaapi? (
+		>=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}]
+		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,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
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
+# LLVM < 3.9 is out of the game
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	llvm? (
+		video_cards_radeonsi? ( || (
+			sys-devel/llvm[llvm_targets_AMDGPU]
+			sys-devel/llvm[video_cards_radeon]
+		) )
+	)
+	opencl? (
+				>=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
+				>=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
+				>=sys-devel/gcc-4.6
+	)
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	>=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}]
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+pkg_setup() {
+	# 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
+
+	if use llvm || use opencl; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+	eapply_user
+}
+
+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 d3d9 nine)
+			$(use_enable llvm)
+			$(use_enable openmax omx)
+			$(use_enable vaapi va)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+		gallium_enable swrast
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		gallium_enable video_cards_imx imx
+		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-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi radeon
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	if use gallium; then
+		myconf+=" $(use_enable osmesa gallium-osmesa)"
+	else
+		myconf+=" $(use_enable osmesa)"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(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 unwind libunwind) \
+		--enable-valgrind=$(usex valgrind auto no) \
+		--enable-llvm-shared-libs \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		--with-vulkan-drivers=${VULKAN_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() {
+	find "${ED}" -name '*.la' -delete
+	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
+
+	if ! 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
+}
+
+vulkan_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			VULKAN_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					VULKAN_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-libs/tiff/tiff-4.0.8.ebuild b/media-libs/tiff/tiff-4.0.8.ebuild
index 5ca79345bf24..d84ec1096b0d 100644
--- a/media-libs/tiff/tiff-4.0.8.ebuild
+++ b/media-libs/tiff/tiff-4.0.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 4821afb8f2d7..50b40ca2c3f7 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,2 +1,3 @@
 DIST vulkan-loader-1.0.42.0.tar.gz 3699030 SHA256 305d3070f559a3f5ad332aff285a3ea0618f9d0696cde81a58765fcb5c7c4e42 SHA512 2c35aecffc60992023184e499d036d99a3c39b3b3856341f341fc9c5b2b0c71cc49a4658634165f4d5218a7202f4c2ddfb95107ba95f2c8a9870e375cff7a15b WHIRLPOOL f1f9bc0c7f1b78c37776d8143d110853333cc8015348d30e98cad2cd28b82fabb9b0405d536310421df4f41bad283e0cad0e0d8e24e15d2d37db3e33cf1baa93
 DIST vulkan-loader-1.0.42.2.tar.gz 3701608 SHA256 bc09a5e667c4a34c0a2969c8169e55bbabf9f57a76166ce43fd6e50c8e249725 SHA512 6f591bcb69edde516cf170936e23a3f19f2f57a22b65d19683c10528ed6559501d3dae29ee1d3e820a81a5cd6e608f5710ba15f7c9bc050ea0eaceef2cf82d37 WHIRLPOOL ab5b1cc3a65414c389ab216aba9bb12018969ec6559cfc381881137aa865d8cc79c06221f903f9a3db001fed75dbaea789bc7b17dacbab545ce8fa78f3e968a7
+DIST vulkan-loader-1.0.46.0.tar.gz 3732605 SHA256 439db567f03448f57d7899c4a78986669dc4d930af9699986a85bf2fc3d3acb8 SHA512 dc0728c00e017a2ed0b1e34a500a6335f6dee5dd77c7801d7d450c68c6e8c7cd5dec640be6dec1dea28941d927764a636b82a628e0260ca724163afa4152d8b6 WHIRLPOOL aa2424939b3a6c80909efd1f50d668c83aaf828ef490f13cd02391098e018e8ed33c6949ea47caaa4be0b258ba351447654c814c4bc2aa572e53ca582d7143a0
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.0.46.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.46.0.ebuild
new file mode 100644
index 000000000000..4ab7f86d5494
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.0.46.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+RDEPEND=""
+DEPEND="${PYTHON_DEPS}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_TESTS=False
+		-DBUILD_LAYERS=False
+		-DBUILD_DEMOS=False
+		-DBUILD_VKJSON=False
+		-DBUILD_LOADER=True
+		-DBUILD_WSI_MIR_SUPPORT=False
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	default
+}
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 2f966c0ca5ce..7792748b8dec 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.10.5.tar.gz 8394804 SHA256 dd50b4b4e42d5f107356ecd637015b3cbf6c7ce3cdfc450d0995a8e785a95e02 SHA512 b44bfb79ecf51419c0d234f5ff70f4571a9ee3fe323ef6f1df9a8388a24294766153c60615f318dad20097d759a3d64a66fce4643aebdf0dbda24ed20dd8aa69 WHIRLPOOL 847ddb134e8f7ef597a1b6679ba7c4d4720895326088ef22ab7f525160f6c4c9d0a69c419e421e9b0ce049f35e566e6ed7027dc9d540f5523e09d909c0e6c97b
-DIST makemkv-oss-1.10.5.tar.gz 4569597 SHA256 4aed3caa587dc206529a2cc00a25bf33e006d7f4854ac2282f5627002b90564d SHA512 b102d211a94078d1b5c6b5b37ca7993935b7e1d784437fd9a56738a7ce8cd8f24debce976a42a5d2e3cf3cbe3deb0bb4a22696f3e47c35d92e20cba30539b9b0 WHIRLPOOL 8e54c4f8a112eddd7aaf8325543debf92d20b20c7277de05e86f887f3125fd5b27bcf27d68ec24b2a4c7142016c8a998da713d164f09c45d3f970dbba7218724
+DIST makemkv-bin-1.10.6.tar.gz 8414683 SHA256 99d68e4e0166c9a4e2dce6638e19cbe312b5981f6e1811ed0987578ceefac3e3 SHA512 a598d1b21fdccc6a6999e0f42fffb8388fbec8cbcf428e19a333b7d1793977a1e6728cd253f28ece38de4b55767612d0c521734aa8a746082921e605b6185ec8 WHIRLPOOL 314e58e4bdc049dc9a538868d729330ffc45c64a853ea53bf9d5baec8311c6f4299de39cf9ee6c402ebd2c63000453f5f0cc402ee7cf28127f0e0a4c290e5d8e
+DIST makemkv-oss-1.10.6.tar.gz 4569611 SHA256 ab028ba05364f2d899b76e6a7392c9ef555379de2ef4732e1de27c23fd78d235 SHA512 41519de6a3bc3b0ca531ae7f0527db867a2ca4b9720e9a886b9b06ec91f1c11478243d0c7247f4bf36b65ce33c07dd6c35fc805dd87132e872024f1405896644 WHIRLPOOL d7d94db83f0dc935b0333951f694a55df04d751a63beecdf323f4f7b9b1080878efd1c9c6347ada185f6d5e71ee2a87a8e4be366425a4e5b29952bbde4fe1821
diff --git a/media-video/makemkv/makemkv-1.10.5.ebuild b/media-video/makemkv/makemkv-1.10.6.ebuild
similarity index 99%
rename from media-video/makemkv/makemkv-1.10.5.ebuild
rename to media-video/makemkv/makemkv-1.10.6.ebuild
index e7eeb0b8c6be..f01bbdb662fc 100644
--- a/media-video/makemkv/makemkv-1.10.5.ebuild
+++ b/media-video/makemkv/makemkv-1.10.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 
 LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="libav multilib qt4 qt5"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7345383e6d74..f22a66875eb1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 27 May 2017 10:39:44 +0000
+Mon, 29 May 2017 06:08:45 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7345383e6d74..7bc9b99cf98d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 27 May 2017 10:39:44 +0000
+Mon, 29 May 2017 06:08:46 +0000
diff --git a/metadata/md5-cache/app-admin/calamares-2.4.6 b/metadata/md5-cache/app-admin/calamares-2.4.6
index da1c1c412124..286c831b18e9 100644
--- a/metadata/md5-cache/app-admin/calamares-2.4.6
+++ b/metadata/md5-cache/app-admin/calamares-2.4.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v2.4.6/calamares-2.4.6.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=368a2b68223e0765a012842dc9a66d12
diff --git a/metadata/md5-cache/app-admin/calamares-3.0.1 b/metadata/md5-cache/app-admin/calamares-3.0.1
index 57bf81cce386..53a4479dc2bf 100644
--- a/metadata/md5-cache/app-admin/calamares-3.0.1
+++ b/metadata/md5-cache/app-admin/calamares-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v3.0.1/calamares-3.0.1.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=48acfd6c6e8d877524b736602f6f8b37
diff --git a/metadata/md5-cache/app-admin/calamares-3.1.0 b/metadata/md5-cache/app-admin/calamares-3.1.0
index 6ecc956d2967..da7b3c9aee33 100644
--- a/metadata/md5-cache/app-admin/calamares-3.1.0
+++ b/metadata/md5-cache/app-admin/calamares-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v3.1/calamares-3.1.0.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=60ff638f336d40fed42b31f8d88046e4
diff --git a/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.6-r1 b/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.6-r1
index f81d97b9e5d8..b90e1c575106 100644
--- a/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.6-r1
+++ b/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.6-r1
@@ -8,5 +8,5 @@ LICENSE=Amazon || ( Ruby GPL-2 )
 RDEPEND=|| ( dev-lang/ruby:2.1 ) virtual/rubygems virtual/ruby-ssl net-misc/rsync net-misc/curl
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools-1.5.6.zip
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=064a646f17316d86c77aaea69adad903
diff --git a/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7 b/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
index cf915bb0a3c9..f4a81078ce51 100644
--- a/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
+++ b/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88
 KEYWORDS=~amd64 ~x86
 LICENSE=Amazon || ( Ruby GPL-2 )
-RDEPEND=|| ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) virtual/rubygems virtual/ruby-ssl net-misc/rsync net-misc/curl
+RDEPEND=|| ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) virtual/rubygems virtual/ruby-ssl net-misc/rsync net-misc/curl
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools-1.5.7.zip
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=98dedb2e1f5fcbee7339c0f97a8146f4
diff --git a/metadata/md5-cache/app-admin/mcollective-2.10.1 b/metadata/md5-cache/app-admin/mcollective-2.10.1
index 912c3f8c589a..de8c8af27c54 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.10.1
+++ b/metadata/md5-cache/app-admin/mcollective-2.10.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ruby/stomp ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.10.1.tar.gz -> mcollective-2.10.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b39929c9f653e12c3956aa1cf050b2a2
diff --git a/metadata/md5-cache/app-admin/mcollective-2.10.3 b/metadata/md5-cache/app-admin/mcollective-2.10.3
index fc0d49f4621d..47f274c7b0ce 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.10.3
+++ b/metadata/md5-cache/app-admin/mcollective-2.10.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ruby/stomp ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.10.3.tar.gz -> mcollective-2.10.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b39929c9f653e12c3956aa1cf050b2a2
diff --git a/metadata/md5-cache/app-admin/mcollective-2.9.1 b/metadata/md5-cache/app-admin/mcollective-2.9.1
index a7570810d418..10f3bb9287a8 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.9.1
+++ b/metadata/md5-cache/app-admin/mcollective-2.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ruby/stomp ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.9.1.tar.gz -> mcollective-2.9.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3118ddc2d54a7d3b52c4987567bcc0d7
diff --git a/metadata/md5-cache/app-admin/puppet-3.8.7-r1 b/metadata/md5-cache/app-admin/puppet-3.8.7-r1
index 74d3a4e3eae8..6d2f9e451f3a 100644
--- a/metadata/md5-cache/app-admin/puppet-3.8.7-r1
+++ b/metadata/md5-cache/app-admin/puppet-3.8.7-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.8.7.tar.gz
-_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
+_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
 _md5_=3874be48efba26d374604c8ef1b1201e
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.1 b/metadata/md5-cache/app-admin/puppet-4.10.1
index cf0331de7409..f9d7e9266b01 100644
--- a/metadata/md5-cache/app-admin/puppet-4.10.1
+++ b/metadata/md5-cache/app-admin/puppet-4.10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.1.tar.gz
-_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
+_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
 _md5_=5a9b3878344cc807ee664693a1fb16a5
diff --git a/metadata/md5-cache/app-admin/puppet-4.8.1 b/metadata/md5-cache/app-admin/puppet-4.8.1
index 204d885b65dc..bb68bac01f22 100644
--- a/metadata/md5-cache/app-admin/puppet-4.8.1
+++ b/metadata/md5-cache/app-admin/puppet-4.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.8.1.tar.gz
-_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
+_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
 _md5_=eeeddd296f71b3b2abe2f8d83f78ec4d
diff --git a/metadata/md5-cache/app-admin/puppet-4.9.1-r2 b/metadata/md5-cache/app-admin/puppet-4.9.1-r2
index 92883253b8f1..cad377fc3e41 100644
--- a/metadata/md5-cache/app-admin/puppet-4.9.1-r2
+++ b/metadata/md5-cache/app-admin/puppet-4.9.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.9.1.tar.gz
-_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
+_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
 _md5_=bd68c5e0abbfad7d5bff134ed380c2e8
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.0.2 b/metadata/md5-cache/app-admin/puppet-lint-2.0.2
index 0528cadb5a07..4260c6657d07 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.0.2
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/puppet-lint-2.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f07968f96c08f5b0365371c03f446bab
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.1.0 b/metadata/md5-cache/app-admin/puppet-lint-2.1.0
index b46947c09fe8..8d7bf47f3c2b 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.1.0
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/puppet-lint-2.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2aa3bdfd004ccef65138246957a5fabf
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.1.1 b/metadata/md5-cache/app-admin/puppet-lint-2.1.1
index 991a85c04af5..ee3d0691e7d9 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.1.1
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/puppet-lint-2.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=67a39ea785beea1c142c5ecbe137150a
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.2.1 b/metadata/md5-cache/app-admin/puppet-lint-2.2.1
index 90c712554624..0fdcfd91247a 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.2.1
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/puppet-lint-2.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=67a39ea785beea1c142c5ecbe137150a
diff --git a/metadata/md5-cache/app-admin/r10k-1.1.3-r1 b/metadata/md5-cache/app-admin/r10k-1.1.3-r1
index baef0fa0aab2..fdd5b36838df 100644
--- a/metadata/md5-cache/app-admin/r10k-1.1.3-r1
+++ b/metadata/md5-cache/app-admin/r10k-1.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] =dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/r10k-1.1.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7d3a0889b9cadd3f4fcc244794553b56
diff --git a/metadata/md5-cache/app-admin/r10k-1.5.1 b/metadata/md5-cache/app-admin/r10k-1.5.1
index 05c8d18c59ad..b42343ac9e75 100644
--- a/metadata/md5-cache/app-admin/r10k-1.5.1
+++ b/metadata/md5-cache/app-admin/r10k-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] =dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/r10k-1.5.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e483efc8c21c643c6928c43077d75183
diff --git a/metadata/md5-cache/app-admin/systemdgenie-0.99.0 b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
index 47ab945ae33c..dfe77e19ed09 100644
--- a/metadata/md5-cache/app-admin/systemdgenie-0.99.0
+++ b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-apps/systemd >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/systemdgenie/systemdgenie-0.99.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=97be443413edb83c2e757af010023e96
diff --git a/metadata/md5-cache/app-backup/buttersink-0.6.8 b/metadata/md5-cache/app-backup/buttersink-0.6.8
new file mode 100644
index 000000000000..e25fc483b0f3
--- /dev/null
+++ b/metadata/md5-cache/app-backup/buttersink-0.6.8
@@ -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/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/crcmod[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flake8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-fs/btrfs-progs 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=rsync-like utility for btrfs snapshots
+EAPI=6
+HOMEPAGE=https://github.com/AmesCornish/buttersink
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+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/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/crcmod[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flake8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-fs/btrfs-progs 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=https://github.com/AmesCornish/buttersink/archive/0.6.8.tar.gz -> buttersink-0.6.8.tar.gz
+_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=f7ea28e25e8e3eff15eba150b1d94667
diff --git a/metadata/md5-cache/app-backup/buttersink-9999 b/metadata/md5-cache/app-backup/buttersink-9999
new file mode 100644
index 000000000000..6112b0ba66d3
--- /dev/null
+++ b/metadata/md5-cache/app-backup/buttersink-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+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/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/crcmod[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flake8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-fs/btrfs-progs 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-vcs/git-1.8.2.1
+DESCRIPTION=rsync-like utility for btrfs snapshots
+EAPI=6
+HOMEPAGE=https://github.com/AmesCornish/buttersink
+IUSE=python_targets_python2_7
+LICENSE=GPL-3
+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/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/crcmod[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flake8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-fs/btrfs-progs 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
+_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	git-r3	cbafa3261c37c7e3af44bb16a34ea390	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=f7ea28e25e8e3eff15eba150b1d94667
diff --git a/metadata/md5-cache/app-backup/kbackup-1.0 b/metadata/md5-cache/app-backup/kbackup-1.0
index 00316e0baa63..007539bf6578 100644
--- a/metadata/md5-cache/app-backup/kbackup-1.0
+++ b/metadata/md5-cache/app-backup/kbackup-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=http://members.aon.at/m.koller/kbackup-1.0.tar.bz2
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=63377b5696100d8e15fd5821a8c1ef08
diff --git a/metadata/md5-cache/app-backup/kfoldersync-3.4.1 b/metadata/md5-cache/app-backup/kfoldersync-3.4.1
index b82da817dca2..8639d1d7e4f8 100644
--- a/metadata/md5-cache/app-backup/kfoldersync-3.4.1
+++ b/metadata/md5-cache/app-backup/kfoldersync-3.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1485353737/kfoldersync-3.4.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=385cf950f892f1ef07dbe0557526c425
diff --git a/metadata/md5-cache/app-cdr/kcdemu-0.7.2 b/metadata/md5-cache/app-cdr/kcdemu-0.7.2
index 3d1501a40fc5..08be5ae56a22 100644
--- a/metadata/md5-cache/app-cdr/kcdemu-0.7.2
+++ b/metadata/md5-cache/app-cdr/kcdemu-0.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-cdr/cdemu-2.0.0[cdemu-daemon] !app-cdr/kcdemu:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1481242372/kde_cdemu-0.7.2.tar.bz2 -> kcdemu-0.7.2.tar.bz2
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=dbdbdd49b9d5072e2d3840475d87d785
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.27 b/metadata/md5-cache/app-crypt/ccid-1.4.27
new file mode 100644
index 000000000000..943dccc0c656
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.27
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 ) kernel_linux? ( virtual/pkgconfig ) virtual/pkgconfig
+DESCRIPTION=CCID free software driver
+EAPI=6
+HOMEPAGE=http://pcsclite.alioth.debian.org/ccid.html
+IUSE=twinserial kobil-midentity +usb
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
+SLOT=0
+SRC_URI=http://alioth.debian.org/frs/download.php/file/4218/ccid-1.4.27.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182
+_md5_=045787320d1d9d07b71f2c3f65c631d7
diff --git a/metadata/md5-cache/app-crypt/stoken-0.90 b/metadata/md5-cache/app-crypt/stoken-0.90
index 4ba54358b4a6..063c71ae1c25 100644
--- a/metadata/md5-cache/app-crypt/stoken-0.90
+++ b/metadata/md5-cache/app-crypt/stoken-0.90
@@ -8,6 +8,6 @@ KEYWORDS=amd64 arm ~arm64 ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=|| ( dev-libs/nettle dev-libs/libtomcrypt ) gtk? ( >=x11-libs/gtk+-3.12:3 )
 SLOT=0
-SRC_URI=https://github.com/cernekee/stoken/archive/v0.90.tar.gz
+SRC_URI=https://github.com/cernekee/stoken/archive/v0.90.tar.gz -> stoken-0.90.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=7c258b729e18695175d6293dc9f86584
+_md5_=f0de1b6cbcdd5cfb63da8e2c1a95482d
diff --git a/metadata/md5-cache/app-crypt/stoken-0.91 b/metadata/md5-cache/app-crypt/stoken-0.91
new file mode 100644
index 000000000000..ec5fd4b87911
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/stoken-0.91
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=|| ( dev-libs/nettle dev-libs/libtomcrypt ) gtk? ( >=x11-libs/gtk+-3.12:3 ) >=app-portage/elt-patches-20170317 !<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=Software Token for Linux/UNIX
+EAPI=6
+HOMEPAGE=https://github.com/cernekee/stoken
+IUSE=gtk
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=|| ( dev-libs/nettle dev-libs/libtomcrypt ) gtk? ( >=x11-libs/gtk+-3.12:3 )
+SLOT=0
+SRC_URI=https://github.com/cernekee/stoken/archive/v0.91.tar.gz -> stoken-0.91.tar.gz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=0d80c6aae011154d51bb398ca847b02a
diff --git a/metadata/md5-cache/app-dicts/dikt-2s b/metadata/md5-cache/app-dicts/dikt-2s
index 55d3b2fc42f1..63d2959514b1 100644
--- a/metadata/md5-cache/app-dicts/dikt-2s
+++ b/metadata/md5-cache/app-dicts/dikt-2s
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !app-dicts/dikt:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://bitbucket.org/dikt/code/downloads/dikt-2s.txz -> dikt-2s.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e8f5ebea4b879305371fc6cc65614e49
diff --git a/metadata/md5-cache/app-dicts/dikt-2s_p1 b/metadata/md5-cache/app-dicts/dikt-2s_p1
index b59582b31687..8af989938676 100644
--- a/metadata/md5-cache/app-dicts/dikt-2s_p1
+++ b/metadata/md5-cache/app-dicts/dikt-2s_p1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !app-dicts/dikt:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://bitbucket.org/dikt/code/downloads/dikt-2s1.txz -> dikt-2s1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d4efbd95f33a9395d2ab4da70f8b13e7
diff --git a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3 b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
index 9d2bab5cbe10..b6365a17fdad 100644
--- a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
+++ b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=http://prime.sourceforge.jp/src/prime-dict-1.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=baf1b2d12409cba74c5bf15d9bd0dd32
diff --git a/metadata/md5-cache/app-editors/diakonos-0.9.4 b/metadata/md5-cache/app-editors/diakonos-0.9.4
index 672bdb185d4a..72ae3067c58e 100644
--- a/metadata/md5-cache/app-editors/diakonos-0.9.4
+++ b/metadata/md5-cache/app-editors/diakonos-0.9.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/curses[ruby_targets_ruby21] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=http://diakonos.pist0s.ca/archives/diakonos-0.9.4.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=576d156efd2d7e65a461f27779b17e9f
diff --git a/metadata/md5-cache/app-editors/emacs-25.2 b/metadata/md5-cache/app-editors/emacs-25.2
index e0a16a87d5d0..1e098d840ca9 100644
--- a/metadata/md5-cache/app-editors/emacs-25.2
+++ b/metadata/md5-cache/app-editors/emacs-25.2
@@ -4,11 +4,11 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-25.2
 REQUIRED_USE=?? ( aqua X )
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.2.tar.xz
 _eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=d557f0f856972666f3ce4f4bd255da5a
+_md5_=c64b464bfa710540fe26705c17093cc4
diff --git a/metadata/md5-cache/app-editors/gvim-8.0.0386-r1 b/metadata/md5-cache/app-editors/gvim-8.0.0386-r1
new file mode 100644
index 000000000000..0415f3397ea2
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gvim-8.0.0386-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-8.0.0386 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=6
+HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
+IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-8.0.0386 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.0386.tar.gz -> vim-8.0.0386.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=98f185e10101c76c9549b3ca15288e06
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index a10deab57a50..b440bfc92f55 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) python_targets_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=6
 HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
-IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=vim
-RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) python_targets_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=30d3aab174d7079c112e3e6e79017889
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=98f185e10101c76c9549b3ca15288e06
diff --git a/metadata/md5-cache/app-editors/vim-8.0.0386-r1 b/metadata/md5-cache/app-editors/vim-8.0.0386-r1
new file mode 100644
index 000000000000..68d6b8cd7efe
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-8.0.0386-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.0386 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=6
+HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.0386 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.0386.tar.gz -> vim-8.0.0386.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=af9b1d5c5cbfc4e1c9e546d71d0249cb
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index c8679592b2e0..27cdc1869d69 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) python_targets_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
-IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=vim
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) python_targets_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
-REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=16e07d542f8c3c73e554148254b92b50
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=a3514f00fd2d6c62b31dd4f0881c237b
diff --git a/metadata/md5-cache/app-emacs/ddskk-16.1 b/metadata/md5-cache/app-emacs/ddskk-16.1
index 2acaafabe3c9..848ce103b6de 100644
--- a/metadata/md5-cache/app-emacs/ddskk-16.1
+++ b/metadata/md5-cache/app-emacs/ddskk-16.1
@@ -6,8 +6,8 @@ HOMEPAGE=http://openlab.ring.gr.jp/skk/
 IUSE=ruby
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) virtual/rubygems ) >=virtual/emacs-24
+RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.3 ) virtual/rubygems ) >=virtual/emacs-24
 SLOT=0
 SRC_URI=http://openlab.ring.gr.jp/skk/maintrunk/ddskk-16.1.tar.gz
-_eclasses_=elisp	571fd9c6c9d8b71c8461bb9f33e135ab	elisp-common	19ff54b35acd0bf2a14831a308a57753	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3
+_eclasses_=elisp	571fd9c6c9d8b71c8461bb9f33e135ab	elisp-common	19ff54b35acd0bf2a14831a308a57753	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62
 _md5_=89638b7ff1ddba50eb8b5d61e1fbf9d4
diff --git a/metadata/md5-cache/app-emulation/vagrant-1.9.3 b/metadata/md5-cache/app-emulation/vagrant-1.9.3
index 452848036caf..f756841f219d 100644
--- a/metadata/md5-cache/app-emulation/vagrant-1.9.3
+++ b/metadata/md5-cache/app-emulation/vagrant-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=app-arch/libarchive net-misc/curl virtualbox? ( || ( app-emulation/virtu
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/mitchellh/vagrant/archive/v1.9.3.tar.gz -> vagrant-1.9.3.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e95a6ad029aebc6e12ced4241f66d9e3
diff --git a/metadata/md5-cache/app-emulation/vagrant-1.9.5 b/metadata/md5-cache/app-emulation/vagrant-1.9.5
index a9ad900e8e6a..c9ca279f2f72 100644
--- a/metadata/md5-cache/app-emulation/vagrant-1.9.5
+++ b/metadata/md5-cache/app-emulation/vagrant-1.9.5
@@ -10,5 +10,5 @@ RDEPEND=app-arch/libarchive net-misc/curl virtualbox? ( || ( app-emulation/virtu
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/mitchellh/vagrant/archive/v1.9.5.tar.gz -> vagrant-1.9.5.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0bd1c3054f328f3f68dd2a28421191fb
diff --git a/metadata/md5-cache/app-forensics/aide-0.15.1 b/metadata/md5-cache/app-forensics/aide-0.15.1
deleted file mode 100644
index 061b4d2da7e0..000000000000
--- a/metadata/md5-cache/app-forensics/aide-0.15.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt:0 ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql ) prelink? ( sys-devel/prelink ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex >=app-portage/elt-patches-20170317 !<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=AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire
-EAPI=3
-HOMEPAGE=http://aide.sourceforge.net/
-IUSE=acl audit curl mhash nls postgres prelink selinux static xattr zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!static? ( acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt:0 ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql ) prelink? ( sys-devel/prelink ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) ) selinux? ( sec-policy/selinux-aide )
-SLOT=0
-SRC_URI=mirror://sourceforge/aide/aide-0.15.1.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	confutils	22a248dca0998dd98347fd19c58aa30d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=628a15599475a85a8e0b764eccc57bef
diff --git a/metadata/md5-cache/app-forensics/aide-0.16 b/metadata/md5-cache/app-forensics/aide-0.16
new file mode 100644
index 000000000000..2bacd50135e0
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/aide-0.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=!mhash? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) mhash? ( app-crypt/mhash ) dev-libs/libpcre acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) e2fs? ( sys-fs/e2fsprogs ) postgres? ( dev-db/postgresql:= ) prelink? ( dev-libs/elfutils ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) sys-devel/bison sys-devel/flex virtual/pkgconfig static? ( !mhash? ( dev-libs/libgcrypt:0[static-libs] dev-libs/libgpg-error[static-libs] ) mhash? ( app-crypt/mhash[static-libs] ) dev-libs/libpcre[static-libs] acl? ( virtual/acl[static-libs] ) e2fs? ( sys-fs/e2fsprogs[static-libs] ) prelink? ( dev-libs/elfutils[static-libs] ) selinux? ( sys-libs/libselinux[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) zlib? ( sys-libs/zlib[static-libs] ) ) >=app-portage/elt-patches-20170317 !<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=AIDE (Advanced Intrusion Detection Environment) is a file integrity checker
+EAPI=6
+HOMEPAGE=http://aide.sourceforge.net/
+IUSE=acl audit curl e2fs mhash postgres prelink selinux static xattr zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!static? ( !mhash? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) mhash? ( app-crypt/mhash ) dev-libs/libpcre acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) e2fs? ( sys-fs/e2fsprogs ) postgres? ( dev-db/postgresql:= ) prelink? ( dev-libs/elfutils ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) ) prelink? ( sys-devel/prelink ) selinux? ( sec-policy/selinux-aide )
+REQUIRED_USE=postgres? ( !mhash ) static? ( !audit !curl !postgres )
+SLOT=0
+SRC_URI=mirror://sourceforge/aide/aide-0.16.tar.gz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=1e52946e30252992786865887beb6212
diff --git a/metadata/md5-cache/app-forensics/foremost-1.5.7-r1 b/metadata/md5-cache/app-forensics/foremost-1.5.7-r3
similarity index 87%
rename from metadata/md5-cache/app-forensics/foremost-1.5.7-r1
rename to metadata/md5-cache/app-forensics/foremost-1.5.7-r3
index 3f829f1e4c72..6c5fc1028f7f 100644
--- a/metadata/md5-cache/app-forensics/foremost-1.5.7-r1
+++ b/metadata/md5-cache/app-forensics/foremost-1.5.7-r3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=A console program to recover files based on their headers and footers
-EAPI=4
+EAPI=6
 HOMEPAGE=http://foremost.sourceforge.net/
-KEYWORDS=amd64 ppc x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://foremost.sourceforge.net/pkg/foremost-1.5.7.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=4db381c2b3013df31001f6bb49c36a69
+_md5_=034645399b434b5ee92499f3f5ac8655
diff --git a/metadata/md5-cache/app-i18n/skk-jisyo-999999 b/metadata/md5-cache/app-i18n/skk-jisyo-999999
index 7e7cdc44de0e..bf02d228cc5c 100644
--- a/metadata/md5-cache/app-i18n/skk-jisyo-999999
+++ b/metadata/md5-cache/app-i18n/skk-jisyo-999999
@@ -6,5 +6,5 @@ HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
 IUSE=cdb
 LICENSE=GPL-2 freedist public-domain
 SLOT=0
-_eclasses_=cvs	c57fc648b829862b38ad2a8b8c1c02e8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_eclasses_=cvs	c57fc648b829862b38ad2a8b8c1c02e8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
 _md5_=0f61b87f429412424d990ff7dc145c66
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.11-r1 b/metadata/md5-cache/app-misc/hivex-1.3.11-r1
index f05ddf742054..ad89cb9c0596 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.11-r1
+++ b/metadata/md5-cache/app-misc/hivex-1.3.11-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oc
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.11.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d572f7a879a32330809637b3d4eaa627
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.14 b/metadata/md5-cache/app-misc/hivex-1.3.14
index 3e96400608b6..9b7aa6cb38da 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.14
+++ b/metadata/md5-cache/app-misc/hivex-1.3.14
@@ -10,5 +10,5 @@ RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oc
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) ruby? ( || ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ) )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.14.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=75946812c6bd86d3029451547d3d8744
diff --git a/metadata/md5-cache/app-misc/mosquitto-1.4.11 b/metadata/md5-cache/app-misc/mosquitto-1.4.11
new file mode 100644
index 000000000000..219af0490369
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mosquitto-1.4.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) srv? ( net-dns/c-ares ) websockets? ( net-libs/libwebsockets ) virtual/pkgconfig
+DESCRIPTION=An Open Source MQTT v3 Broker
+EAPI=5
+HOMEPAGE=http://mosquitto.org/
+IUSE=bridge examples +persistence +srv ssl tcpd websockets
+KEYWORDS=~amd64 ~x86 ~arm
+LICENSE=EPL-1.0
+RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=http://mosquitto.org/files/source/mosquitto-1.4.11.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=5d3f413b7a9080ede84a9620ba531bc9
diff --git a/metadata/md5-cache/app-misc/xmind-3.4.1.201401221918 b/metadata/md5-cache/app-misc/xmind-3.4.1.201401221918
deleted file mode 100644
index 4d09211c0b18..000000000000
--- a/metadata/md5-cache/app-misc/xmind-3.4.1.201401221918
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A brainstorming and mind mapping software tool
-EAPI=5
-HOMEPAGE=http://www.xmind.net
-KEYWORDS=amd64 x86
-LICENSE=EPL-1.0 LGPL-3
-RDEPEND=>=virtual/jre-1.5 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-portable-3.4.1.201401221918.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f80028251219a84e4522865cac8a2b72
diff --git a/metadata/md5-cache/app-misc/xmind-3.5.1.201411201906 b/metadata/md5-cache/app-misc/xmind-3.5.1.201411201906
deleted file mode 100644
index b8d8b1becddb..000000000000
--- a/metadata/md5-cache/app-misc/xmind-3.5.1.201411201906
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A brainstorming and mind mapping software tool
-EAPI=5
-HOMEPAGE=http://www.xmind.net
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0 LGPL-3
-RDEPEND=>=virtual/jre-1.5 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-portable-3.5.1.201411201906.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a36dd4e1880e5258b979a04bcbf02bd7
diff --git a/metadata/md5-cache/app-misc/xmind-3.6.1-r1 b/metadata/md5-cache/app-misc/xmind-3.6.1-r1
deleted file mode 100644
index a06f07d57c7d..000000000000
--- a/metadata/md5-cache/app-misc/xmind-3.6.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A brainstorming and mind mapping software tool
-EAPI=6
-HOMEPAGE=http://www.xmind.net
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0 LGPL-3
-RDEPEND=>=virtual/jre-1.5 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-7-update1-portable.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=37420cb8c018d612d6dbabb188bd2336
diff --git a/metadata/md5-cache/app-misc/xmind-3.7.0 b/metadata/md5-cache/app-misc/xmind-3.7.2
similarity index 80%
rename from metadata/md5-cache/app-misc/xmind-3.7.0
rename to metadata/md5-cache/app-misc/xmind-3.7.2
index d329f5de7073..8022840bd0d8 100644
--- a/metadata/md5-cache/app-misc/xmind-3.7.0
+++ b/metadata/md5-cache/app-misc/xmind-3.7.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8 x11-libs/gtk+:2
 SLOT=0
-SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
+SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update2-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=aa3e1d3b96ef11e10fb495fa650cc184
+_md5_=d416d8d0a9f1269a9386e44d3cce1d7d
diff --git a/metadata/md5-cache/app-office/calligra-3.0.1 b/metadata/md5-cache/app-office/calligra-3.0.1
index 4e53e14ccef3..d752c2974291 100644
--- a/metadata/md5-cache/app-office/calligra-3.0.1
+++ b/metadata/md5-cache/app-office/calligra-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/calligra/3.0.1/calligra-3.0.1.tar.xz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=34028b68d07c4eb51a1c76a08ba95cec
diff --git a/metadata/md5-cache/app-office/kexi-3.0.0 b/metadata/md5-cache/app-office/kexi-3.0.0
index 561f5d5c2b98..791073d50f71 100644
--- a/metadata/md5-cache/app-office/kexi-3.0.0
+++ b/metadata/md5-cache/app-office/kexi-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-db/kdb[mysql?,postgres?,sqlite?] dev-libs/kproperty dev-libs/kreport marble? ( >=kde-apps/marble-14.12.0:5 ) mdb? ( dev-libs/glib:2 ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.6.1:5 ) >=kde-frameworks/breeze-icons-rcc-5.29.0:5 !app-office/calligra:4[calligra_features_kexi] !app-office/calligra-l10n:4[calligra_features_kexi(+)] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kexi/src/kexi-3.0.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=36fa659934363a5f40b88bde6a8a77c2
diff --git a/metadata/md5-cache/app-office/kexi-3.0.1 b/metadata/md5-cache/app-office/kexi-3.0.1
index d44141157014..7cb559783afc 100644
--- a/metadata/md5-cache/app-office/kexi-3.0.1
+++ b/metadata/md5-cache/app-office/kexi-3.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-db/kdb[mysql?,postgres?,sqlite?] dev-libs/kproperty dev-libs/kreport marble? ( >=kde-apps/marble-14.12.0:5 ) mdb? ( dev-libs/glib:2 ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.6.1:5 ) >=kde-frameworks/breeze-icons-rcc-5.29.0:5 !app-office/calligra:4[calligra_features_kexi] !app-office/calligra-l10n:4[calligra_features_kexi(+)] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kexi/src/kexi-3.0.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f2d5d5b41ccd730650018dc83a983b9f
diff --git a/metadata/md5-cache/app-office/kmymoney-4.7.2 b/metadata/md5-cache/app-office/kmymoney-4.7.2
deleted file mode 100644
index 3937d6dbaa62..000000000000
--- a/metadata/md5-cache/app-office/kmymoney-4.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/gpgme >=app-office/libalkimia-4.3.2 dev-libs/gmp:0 dev-libs/libgpg-error >=kde-apps/kdepimlibs-4.4:4[aqua=] x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.0.1 >=sys-libs/gwenhywfar-4.0.1[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4
-DESCRIPTION=Personal finance manager for KDE
-EAPI=5
-HOMEPAGE=http://kmymoney2.sourceforge.net/
-IUSE=debug calendar doc hbci ofx quotes l10n_bs l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_el l10n_en-GB l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_hu l10n_it l10n_kk l10n_nds l10n_nl l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW test +handbook aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/gpgme >=app-office/libalkimia-4.3.2 dev-libs/gmp:0 dev-libs/libgpg-error >=kde-apps/kdepimlibs-4.4:4[aqua=] x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.0.1 >=sys-libs/gwenhywfar-4.0.1[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) !~kde-apps/kdepimlibs-4.14.10_p20160611 !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3 quotes? ( dev-perl/Finance-Quote ) kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4
-SLOT=4
-SRC_URI=mirror://kde/stable/kmymoney/4.7.2/src/kmymoney-4.7.2.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde4-base	51fd9f83640ac82e2c195c3958677fe7	kde4-functions	388bbabf76d84194e7d234ba7c7afee2	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d3924d800263f6863888bd70c09bc8b7
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-5.2.7.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-5.2.7.2-r1
new file mode 100644
index 000000000000..1fd4cac7b375
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-5.2.7.2-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/xdelta:3 >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite. Binary package
+EAPI=6
+HOMEPAGE=http://www.libreoffice.org
+IUSE=gnome java kde aqua kde elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+PDEPEND==app-office/libreoffice-l10n-5.2.7.2*
+RDEPEND=app-text/hunspell:0/1.6 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.62.0 dev-libs/icu:0/58.2 >=media-gfx/graphite2-1.2.0 media-libs/glew:0/1.13 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-5.4.0-r3 >=sys-libs/glibc-2.23 virtual/jpeg:62 kde? ( >=kde-frameworks/kdelibs-4.14.32:4 >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtgui-4.8.7:4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.55:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= =dev-libs/liborcus-0.11* dev-libs/librevenge dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.0d:0 >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/opengl net-print/cups dev-libs/dbus-glib gnome? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) gnome? ( gnome-base/dconf ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 gnome? ( dev-libs/glib:2 dev-libs/gobject-introspection >=x11-libs/gtk+-3.8:3 ) !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-5.2.7.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-5.2.7.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-5.2.7.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-5.2.7.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-5.2.7.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-5.2.7.2-r1.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-5.2.7.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-5.2.7.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-5.2.7.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-5.2.7.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-5.2.7.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-5.2.7.2-r1.xd3 ) ) ) )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	kde4-base	51fd9f83640ac82e2c195c3958677fe7	kde4-functions	388bbabf76d84194e7d234ba7c7afee2	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=fe1a499662b18f22803f46f4a1dc2720
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-5.2.7.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-debug-5.2.7.2-r1
new file mode 100644
index 000000000000..d67de118574c
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-5.2.7.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=dev-util/xdelta:3
+DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
+EAPI=6
+HOMEPAGE=http://www.libreoffice.org
+IUSE=gnome java kde
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND==app-office/libreoffice-bin-5.2.7.2-r1[gnome=,java=,kde=]
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-5.2.7.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-5.2.7.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-java-5.2.7.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-5.2.7.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-java-5.2.7.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-java-5.2.7.2-r1.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-5.2.7.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-5.2.7.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-java-5.2.7.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-5.2.7.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-java-5.2.7.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-java-5.2.7.2-r1.xd3 ) ) ) )
+_md5_=8fc6cd4bc4edb93c351bbfc6e7e5d831
diff --git a/metadata/md5-cache/app-office/skrooge-2.5.0 b/metadata/md5-cache/app-office/skrooge-2.5.0
index 30b834d1f8bc..f3675accf8ec 100644
--- a/metadata/md5-cache/app-office/skrooge-2.5.0
+++ b/metadata/md5-cache/app-office/skrooge-2.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( designer )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.5.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9d72635c0d515838db028511c71b5ce9
diff --git a/metadata/md5-cache/app-office/skrooge-2.8.1 b/metadata/md5-cache/app-office/skrooge-2.8.1
index b7da33217151..35a5e7a9cfad 100644
--- a/metadata/md5-cache/app-office/skrooge-2.8.1
+++ b/metadata/md5-cache/app-office/skrooge-2.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( designer )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.8.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d1c2d593162004d9498b3ebe487b057c
diff --git a/metadata/md5-cache/app-portage/repoman-9999 b/metadata/md5-cache/app-portage/repoman-9999
index 65cbb75b3588..ea29ff5cd3fd 100644
--- a/metadata/md5-cache/app-portage/repoman-9999
+++ b/metadata/md5-cache/app-portage/repoman-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	git-r3	cbafa3261c37c7e3af44bb16a34ea390	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f32e9472591c22f8abfa5e42b93e127e
+_md5_=9f386a96604df921e02559d5b79865f5
diff --git a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r1 b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r1
index 913eb721c357..4842370ec2a4 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r1
+++ b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r1
@@ -5,9 +5,9 @@ HOMEPAGE=http://wiki.docbook.org/DocBookXslStylesheets
 IUSE=ruby
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) virtual/rubygems )
+RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.3 ) virtual/rubygems )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.79.1.tar.bz2
-_eclasses_=ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3
+_eclasses_=ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62
 _md5_=8d41a94c1ac9dec1814564ee70dba3e6
diff --git a/metadata/md5-cache/app-text/glark-1.10.5-r1 b/metadata/md5-cache/app-text/glark-1.10.5-r1
index d233db084bbc..817191c4261e 100644
--- a/metadata/md5-cache/app-text/glark-1.10.5-r1
+++ b/metadata/md5-cache/app-text/glark-1.10.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby21] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jpace/glark/archive/v1.10.5.tar.gz -> glark-git-1.10.5.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b81737bdd182f5e713e0ca4684f2c9d5
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.13 b/metadata/md5-cache/app-text/hyperestraier-1.4.13
index 455b8f2b29f7..d13bda1cbdcf 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( 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_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=76e15e82538576d06e91a8ed9b99dc8e
diff --git a/metadata/md5-cache/app-text/jist-1.5.1 b/metadata/md5-cache/app-text/jist-1.5.1
index 19bbdce2cf46..ca54ca2e21ed 100644
--- a/metadata/md5-cache/app-text/jist-1.5.1
+++ b/metadata/md5-cache/app-text/jist-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/jist-1.5.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ec01c438394d0655e4e19217b66180f7
diff --git a/metadata/md5-cache/app-text/jist-1.5.1-r1 b/metadata/md5-cache/app-text/jist-1.5.1-r1
index 8350cc8b66a9..ae6e74c6d4af 100644
--- a/metadata/md5-cache/app-text/jist-1.5.1-r1
+++ b/metadata/md5-cache/app-text/jist-1.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/json:*[ruby_targets_ruby21] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/jist-1.5.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1d473228d53b27ff2017dad2009f6690
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r3 b/metadata/md5-cache/app-text/ronn-0.7.3-r3
index 73dce09c4032..ee52a6c8040b 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r3
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby21] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ronn-0.7.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5626569464b09f768ef42db7e1390dd1
diff --git a/metadata/md5-cache/app-text/webgen-1.4.0 b/metadata/md5-cache/app-text/webgen-1.4.0
index 11c4395a7055..7390943f81b4 100644
--- a/metadata/md5-cache/app-text/webgen-1.4.0
+++ b/metadata/md5-cache/app-text/webgen-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/webgen-1.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ae84a4d8488f690704a42c0ea288a5b9
diff --git a/metadata/md5-cache/app-text/xmlformat-1.04 b/metadata/md5-cache/app-text/xmlformat-1.04
index 1f6a3864b91f..ae261f36f6ab 100644
--- a/metadata/md5-cache/app-text/xmlformat-1.04
+++ b/metadata/md5-cache/app-text/xmlformat-1.04
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install test
-DEPEND=ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
+DEPEND=ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.3 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
 DESCRIPTION=Reformat XML documents to your custom style
 EAPI=5
 HOMEPAGE=http://www.kitebird.com/software/xmlformat/
 IUSE=ruby doc
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=xmlformat
-RDEPEND=ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
+RDEPEND=ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.3 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
 SLOT=0
 SRC_URI=http://www.kitebird.com/software/xmlformat/xmlformat-1.04.tar.gz
-_eclasses_=ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3
+_eclasses_=ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62
 _md5_=a7cb59d61a972e14a77abfdc0e65a4b1
diff --git a/metadata/md5-cache/app-vim/colorv-3.0.2-r1 b/metadata/md5-cache/app-vim/colorv-3.0.2-r1
new file mode 100644
index 000000000000..861429be7eee
--- /dev/null
+++ b/metadata/md5-cache/app-vim/colorv-3.0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: a color tool for vim
+EAPI=6
+HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ( app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://gentoo/colorv-3.0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/colorv-3.0.2.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_md5_=54fab8de10fb9845a9715d91b1227a9f
diff --git a/metadata/md5-cache/app-vim/command-t-4.0 b/metadata/md5-cache/app-vim/command-t-4.0
index 09b186b1d07f..e225fc99bfd8 100644
--- a/metadata/md5-cache/app-vim/command-t-4.0
+++ b/metadata/md5-cache/app-vim/command-t-4.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/v
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/wincent/command-t/archive/4.0.tar.gz -> command-t-4.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
 _md5_=52e8b1b64fa20cc3f36226da69bc0dfa
diff --git a/metadata/md5-cache/app-vim/editorconfig-vim-0.3.3-r2 b/metadata/md5-cache/app-vim/editorconfig-vim-0.3.3-r2
index 5e9d9ede630e..49dcaade106f 100644
--- a/metadata/md5-cache/app-vim/editorconfig-vim-0.3.3-r2
+++ b/metadata/md5-cache/app-vim/editorconfig-vim-0.3.3-r2
@@ -1,14 +1,14 @@
-DEFINED_PHASES=install postinst postrm prepare
-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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/editorconfig-core-py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-editors/gvim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/editorconfig-core-py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Support EditorConfig files
 EAPI=6
 HOMEPAGE=http://editorconfig.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/editorconfig-core-py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-editors/gvim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/editorconfig-core-py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-vim/archive/v0.3.3.tar.gz -> editorconfig-vim-0.3.3.tar.gz
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
-_md5_=452ffd5c4253f01a6f79d76885105272
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_md5_=abe9d507d9b6be9e27a4cb40ee88f619
diff --git a/metadata/md5-cache/app-vim/gundo-2.6.1 b/metadata/md5-cache/app-vim/gundo-2.6.1
index 58b2f2897441..954d52dddf1a 100644
--- a/metadata/md5-cache/app-vim/gundo-2.6.1
+++ b/metadata/md5-cache/app-vim/gundo-2.6.1
@@ -2,13 +2,13 @@ DEFINED_PHASES=install postinst postrm prepare setup
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: visualize your vim undo tree
 EAPI=5
-HOMEPAGE=https://sjl.bitbucket.org/gundo.vim/
+HOMEPAGE=https://sjl.bitbucket.io/gundo.vim/
 IUSE=python_targets_python2_7
 KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=GPL-2+
-RDEPEND=|| ( app-editors/vim[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-editors/gvim[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/sjl/gundo.vim/archive/v2.6.1.tar.gz -> gundo-2.6.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
-_md5_=c0b8dc9438925b510e1558bffa3c57ad
+_md5_=c1b276b90a3dda1cb0d709cc2de195d4
diff --git a/metadata/md5-cache/app-vim/gundo-2.6.2 b/metadata/md5-cache/app-vim/gundo-2.6.2
new file mode 100644
index 000000000000..b24ff4dab907
--- /dev/null
+++ b/metadata/md5-cache/app-vim/gundo-2.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: visualize your vim undo tree
+EAPI=6
+HOMEPAGE=https://sjl.bitbucket.io/gundo.vim/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://bitbucket.org/sjl/gundo.vim/get/v2.6.2.tar.bz2 -> gundo-2.6.2.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_md5_=68b5eb07a5041ace6160f369aed73a05
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.1 b/metadata/md5-cache/app-vim/pyclewn-2.1
deleted file mode 100644
index cc97401f3b13..000000000000
--- a/metadata/md5-cache/app-vim/pyclewn-2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=|| ( >=app-editors/vim-7.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=app-editors/gvim-7.3[netbeans,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(-)] ) app-arch/vimball || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) 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=Pyclewn allows using vim as a front end to a debugger (pdb or gdb)
-EAPI=5
-HOMEPAGE=http://pyclewn.sourceforge.net/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=app-editors/gvim-7.3[netbeans,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(-)] ) app-arch/vimball python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyclewn/pyclewn-2.1.tar.gz
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0631fc3be495850733f77f7b98c89259
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.1-r1 b/metadata/md5-cache/app-vim/pyclewn-2.1-r1
new file mode 100644
index 000000000000..db81a01b9d35
--- /dev/null
+++ b/metadata/md5-cache/app-vim/pyclewn-2.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3[netbeans] ) app-arch/vimball || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) 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=Pyclewn allows using vim as a front end to a debugger (pdb or gdb)
+EAPI=5
+HOMEPAGE=http://pyclewn.sourceforge.net/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3[netbeans] ) app-arch/vimball python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyclewn/pyclewn-2.1.tar.gz
+_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=7f26a57391140157f282928b15d64d9b
diff --git a/metadata/md5-cache/app-vim/python-mode-0.6.18-r4 b/metadata/md5-cache/app-vim/python-mode-0.6.18-r4
new file mode 100644
index 000000000000..7be20c2d5fc2
--- /dev/null
+++ b/metadata/md5-cache/app-vim/python-mode-0.6.18-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=Provide python code looking for bugs, refactoring and other useful things
+EAPI=6
+HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/astng[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/autopep8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyflakes[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pylint[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/rope[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/ropemode[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/klen/python-mode/archive/0.6.18.tar.gz -> python-mode-0.6.18.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_md5_=ea4213b458378a0fa7b51b3293131c00
diff --git a/metadata/md5-cache/app-vim/splice-1.1.0 b/metadata/md5-cache/app-vim/splice-1.1.0
index 2fe66c1330a5..c7662aba4051 100644
--- a/metadata/md5-cache/app-vim/splice-1.1.0
+++ b/metadata/md5-cache/app-vim/splice-1.1.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://bitbucket.org/sjl/splice.vim http://vim.sourceforge.net/scripts
 IUSE=python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=MIT
-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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://bitbucket.org/sjl/splice.vim/get/v1.1.0.tar.gz -> splice-1.1.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
-_md5_=e36791ab23f1d4f3c0e8676764d4eda0
+_md5_=896e74d2c7eed37d4ac512402844f8eb
diff --git a/metadata/md5-cache/app-vim/vim-latex-1.8.23.20141116 b/metadata/md5-cache/app-vim/vim-latex-1.8.23.20141116
index bf6268ebf2f4..4c4af6b1feae 100644
--- a/metadata/md5-cache/app-vim/vim-latex-1.8.23.20141116
+++ b/metadata/md5-cache/app-vim/vim-latex-1.8.23.20141116
@@ -3,12 +3,12 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=A comprehensive set of tools to view, edit and compile LaTeX documents
 EAPI=5
 HOMEPAGE=http://vim-latex.sourceforge.net/
-IUSE=html python python_targets_python2_7
+IUSE=html python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=vim
-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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( app-editors/vim[python?] app-editors/gvim[python?] ) virtual/latex-base !app-vim/vimtex || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) virtual/latex-base !app-vim/vimtex || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/vim-latex/vim-latex-1.8.23-20141116.812-gitd0f31c9.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
-_md5_=a72e2ee9718bd946b334d82e14abfbcd
+_md5_=2d16aa93e24f6b50952ccda0cfbb4a26
diff --git a/metadata/md5-cache/app-vim/vimpress-3.2.0 b/metadata/md5-cache/app-vim/vimpress-3.2.0
index a19bc09cc73a..aa6c20d03559 100644
--- a/metadata/md5-cache/app-vim/vimpress-3.2.0
+++ b/metadata/md5-cache/app-vim/vimpress-3.2.0
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3510
 IUSE=python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=vim
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/markdown || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gentoo/vimpress-3.2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpress-3.2.0.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
-_md5_=4a37f277a45c333c44e31e38d588f48c
+_md5_=99ef02dfb1d9fa6e9a1e60f2bba258e8
diff --git a/metadata/md5-cache/app-vim/voom-5.1-r1 b/metadata/md5-cache/app-vim/voom-5.1-r1
new file mode 100644
index 000000000000..0aca39a53152
--- /dev/null
+++ b/metadata/md5-cache/app-vim/voom-5.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: emulates a two-pane text outliner
+EAPI=6
+HOMEPAGE=https://vim-voom.github.com/ http://www.vim.org/scripts/script.php?script_id=2657
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=CC0-1.0
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://gentoo/voom-5.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/voom-5.1.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_md5_=10baeb1cb170201a9e15f8f6bc636998
diff --git a/metadata/md5-cache/dev-db/firebird-3.0.2.32703.0-r1 b/metadata/md5-cache/dev-db/firebird-3.0.2.32703.0-r2
similarity index 97%
rename from metadata/md5-cache/dev-db/firebird-3.0.2.32703.0-r1
rename to metadata/md5-cache/dev-db/firebird-3.0.2.32703.0-r2
index 797d2912bb78..d05413e1b263 100644
--- a/metadata/md5-cache/dev-db/firebird-3.0.2.32703.0-r1
+++ b/metadata/md5-cache/dev-db/firebird-3.0.2.32703.0-r2
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libtommath dev-libs/icu:= dev-libs/libedit xinetd? ( virtual/in
 SLOT=0
 SRC_URI=mirror://sourceforge/firebird/Firebird-3.0.2.32703-0.tar.bz2 doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=37ac782e9d0b05f86ce46a7ad29da866
+_md5_=3413ff4eb465b94fe2b4cdc52e628560
diff --git a/metadata/md5-cache/dev-db/kdb-3.0.0 b/metadata/md5-cache/dev-db/kdb-3.0.0
index bcd8b8069c4d..a70fe417db76 100644
--- a/metadata/md5-cache/dev-db/kdb-3.0.0
+++ b/metadata/md5-cache/dev-db/kdb-3.0.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/icu:= mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdb/src/kdb-3.0.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8a92e7dfcd2f612f91f0c41a2cc51087
diff --git a/metadata/md5-cache/dev-db/kdb-3.0.1 b/metadata/md5-cache/dev-db/kdb-3.0.1
index 17bb89355657..d98cbefdb5fa 100644
--- a/metadata/md5-cache/dev-db/kdb-3.0.1
+++ b/metadata/md5-cache/dev-db/kdb-3.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/icu:= mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdb/src/kdb-3.0.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=78d6d34ec80100c1d302d9f29e02aec1
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 6f37a155aa41..644b1d7a2c0c 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
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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 dev-lang/swig virtual/jre virtual/pkgconfig >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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[cxx] >=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 dev-lang/swig virtual/jre virtual/pkgconfig >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=MySQL Workbench
 EAPI=5
 HOMEPAGE=http://dev.mysql.com/workbench/
 IUSE=debug doc gnome-keyring python_targets_python2_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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[cxx] >=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
 REQUIRED_USE=python_targets_python2_7
 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	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=15b3b56cd9d03360ee530b8c007a02c7
+_md5_=ca05143a23b904a79c4babd4113bfc5a
diff --git a/metadata/md5-cache/dev-db/pgbadger-9.1 b/metadata/md5-cache/dev-db/pgbadger-9.1-r1
similarity index 78%
rename from metadata/md5-cache/dev-db/pgbadger-9.1
rename to metadata/md5-cache/dev-db/pgbadger-9.1-r1
index 6f1dfe0b868a..77ae370d7f7d 100644
--- a/metadata/md5-cache/dev-db/pgbadger-9.1
+++ b/metadata/md5-cache/dev-db/pgbadger-9.1-r1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-perl/JSON-XS dev-perl/Text-CSV_XS dev-lang/perl:=
 SLOT=0
-SRC_URI=https://github.com/dalibo/pgbadger/archive/v9.1.tar.gz
+SRC_URI=https://github.com/dalibo/pgbadger/archive/v9.1.tar.gz -> pgbadger-9.1.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=d788dff359644736f39b03ac718923ed
+_md5_=62f81bca357641d0f61479f7003be849
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
index 3258573fb109..9aab52b09847 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( 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_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0f3d281c6e5781a8dc90a7c6e06d08e4
diff --git a/metadata/md5-cache/dev-erlang/p1_pam-1.0.0 b/metadata/md5-cache/dev-erlang/epam-1.0.0
similarity index 88%
rename from metadata/md5-cache/dev-erlang/p1_pam-1.0.0
rename to metadata/md5-cache/dev-erlang/epam-1.0.0
index d1ff0f787d35..7eb3f405f890 100644
--- a/metadata/md5-cache/dev-erlang/p1_pam-1.0.0
+++ b/metadata/md5-cache/dev-erlang/epam-1.0.0
@@ -7,6 +7,6 @@ KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang
 SLOT=0
-SRC_URI=https://github.com/processone/epam/archive/1.0.0.tar.gz -> p1_pam-1.0.0.tar.gz
+SRC_URI=https://github.com/processone/epam/archive/1.0.0.tar.gz -> epam-1.0.0.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=b4886fda1f73a040ce4d3395b7c97087
+_md5_=1b23b4a109566910f64bb6362717f397
diff --git a/metadata/md5-cache/dev-erlang/epam-1.0.0-r1 b/metadata/md5-cache/dev-erlang/epam-1.0.0-r1
new file mode 100644
index 000000000000..75fecefed1a3
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/epam-1.0.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test
+DEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=epam for ejabberd to help with PAM authentication support
+EAPI=6
+HOMEPAGE=https://github.com/processone/epam
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/epam/archive/1.0.0.tar.gz -> epam-1.0.0.tar.gz
+_eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=50eff1df7f36ec104a3527afc8eb1e7b
diff --git a/metadata/md5-cache/dev-erlang/epam-1.0.2 b/metadata/md5-cache/dev-erlang/epam-1.0.2
new file mode 100644
index 000000000000..fb3087ab55db
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/epam-1.0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test
+DEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=epam for ejabberd to help with PAM authentication support
+EAPI=6
+HOMEPAGE=https://github.com/processone/epam
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/epam/archive/1.0.2.tar.gz -> epam-1.0.2.tar.gz
+_eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=3a626a8e4ed60c75ebbee7a6e47e6ea4
diff --git a/metadata/md5-cache/dev-erlang/jiffy-0.14.11 b/metadata/md5-cache/dev-erlang/jiffy-0.14.11
new file mode 100644
index 000000000000..ad89fb41463f
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/jiffy-0.14.11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=JSON NIFs for Erlang
+EAPI=6
+HOMEPAGE=https://github.com/davisp/jiffy
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=MIT BSD
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/davisp/jiffy/archive/0.14.11.tar.gz -> jiffy-0.14.11.tar.gz
+_eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
+_md5_=586010ad9b0a0dfca6a7c710a46e248f
diff --git a/metadata/md5-cache/dev-erlang/p1_utils-1.0.8 b/metadata/md5-cache/dev-erlang/p1_utils-1.0.8
new file mode 100644
index 000000000000..1c74ef1bf55d
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/p1_utils-1.0.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Erlang utility modules from ProcessOne
+EAPI=6
+HOMEPAGE=https://github.com/processone/p1_utils
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/p1_utils/archive/1.0.8.tar.gz -> p1_utils-1.0.8.tar.gz
+_eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
+_md5_=c5d3b68fd181f466df0ac79fb0dce2a3
diff --git a/metadata/md5-cache/dev-haskell/annotated-wl-pprint-0.7.0 b/metadata/md5-cache/dev-haskell/annotated-wl-pprint-0.7.0
new file mode 100644
index 000000000000..bda4c7dc8853
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/annotated-wl-pprint-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.10.2:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The Wadler/Leijen Pretty Printer, with annotation support
+EAPI=6
+HOMEPAGE=https://github.com/david-christiansen/annotated-wl-pprint
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.10.2:=
+SLOT=0/0.7.0
+SRC_URI=mirror://hackage/packages/archive/annotated-wl-pprint/0.7.0/annotated-wl-pprint-0.7.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2217242a59ec9dbea7e74765188cad7c
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-0.13.1.0 b/metadata/md5-cache/dev-haskell/attoparsec-0.13.1.0
new file mode 100644
index 000000000000..d999c4b92014
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/attoparsec-0.13.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.7 dev-haskell/quickcheck-unicode >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-quickcheck-0.8 dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast combinator parsing for bytestrings and text
+EAPI=6
+HOMEPAGE=https://github.com/bos/attoparsec
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.13.1.0
+SRC_URI=mirror://hackage/packages/archive/attoparsec/0.13.1.0/attoparsec-0.13.1.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9761b0514d0a3f0779d1deaaff236040
diff --git a/metadata/md5-cache/dev-haskell/base-prelude-1.0.1.1 b/metadata/md5-cache/dev-haskell/base-prelude-1.0.1.1
new file mode 100644
index 000000000000..22d399f2efff
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/base-prelude-1.0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The most complete prelude formed solely from the "base" package
+EAPI=6
+HOMEPAGE=https://github.com/nikita-volkov/base-prelude
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.6.1:=
+SLOT=0/1.0.1.1
+SRC_URI=mirror://hackage/packages/archive/base-prelude/1.0.1.1/base-prelude-1.0.1.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=88b26c59bfa1311c582010d85a1e833d
diff --git a/metadata/md5-cache/dev-haskell/binary-orphans-0.1.6.0-r1 b/metadata/md5-cache/dev-haskell/binary-orphans-0.1.6.0-r1
new file mode 100644
index 000000000000..f90965937a06
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/binary-orphans-0.1.6.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.2.1:=[profile?] >=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3.3.8:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.2.2:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.8.6:=[profile?] >=dev-haskell/text-1.2.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-binary-0.1.0:=[profile?] <dev-haskell/text-binary-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1.0:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?] >=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9.3 >=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.3.13 >=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Orphan instances for binary
+EAPI=6
+HOMEPAGE=https://github.com/phadej/binary-orphans#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.2.1:=[profile?] >=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3.3.8:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.2.2:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.8.6:=[profile?] >=dev-haskell/text-1.2.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-binary-0.1.0:=[profile?] <dev-haskell/text-binary-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1.0:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?] >=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.6.2:=
+SLOT=0/0.1.6.0
+SRC_URI=mirror://hackage/packages/archive/binary-orphans/0.1.6.0/binary-orphans-0.1.6.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3717002b488ed3ba34dc3a64a64b5e07
diff --git a/metadata/md5-cache/dev-haskell/binary-tagged-0.1.4.2-r1 b/metadata/md5-cache/dev-haskell/binary-tagged-0.1.4.2-r1
new file mode 100644
index 000000000000..7ef7a7eff1f3
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/binary-tagged-0.1.4.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/generics-sop-0.1:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/bifunctors >=dev-haskell/binary-orphans-0.1.1 dev-haskell/quickcheck-instances dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Tagged binary serialisation
+EAPI=6
+HOMEPAGE=https://github.com/phadej/binary-tagged#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/generics-sop-0.1:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.4.2
+SRC_URI=mirror://hackage/packages/archive/binary-tagged/0.1.4.2/binary-tagged-0.1.4.2.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=51393c294a05d21ec16dcbadafb567e1
diff --git a/metadata/md5-cache/dev-haskell/bitarray-0.0.1.1 b/metadata/md5-cache/dev-haskell/bitarray-0.0.1.1
new file mode 100644
index 000000000000..848af8238440
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/bitarray-0.0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Mutable and immutable bit arrays
+EAPI=6
+HOMEPAGE=http://code.haskell.org/~bkomuves/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.1.1
+SRC_URI=mirror://hackage/packages/archive/bitarray/0.0.1.1/bitarray-0.0.1.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8b7346ea6f3106802cce3a3cb5ddcc3a
diff --git a/metadata/md5-cache/dev-haskell/bytedump-1.0 b/metadata/md5-cache/dev-haskell/bytedump-1.0
new file mode 100644
index 000000000000..87ee4ed405ab
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/bytedump-1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Flexible byte dump helpers for human readers
+EAPI=6
+HOMEPAGE=https://github.com/vincenthz/hs-bytedump
+IUSE=executable doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0
+SRC_URI=mirror://hackage/packages/archive/bytedump/1.0/bytedump-1.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f2ca1b08a9838d03cb2c55a67faf76fe
diff --git a/metadata/md5-cache/dev-haskell/cereal-vector-0.2.0.1 b/metadata/md5-cache/dev-haskell/cereal-vector-0.2.0.1
new file mode 100644
index 000000000000..7f4c51603d29
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cereal-vector-0.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Serialize instances for Data.Vector types
+EAPI=6
+HOMEPAGE=https://github.com/acfoltzer/cereal-vector
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0.1
+SRC_URI=mirror://hackage/packages/archive/cereal-vector/0.2.0.1/cereal-vector-0.2.0.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6913cbd4a164a564eb0cd5eb84f13be7
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-0.11.9 b/metadata/md5-cache/dev-haskell/cryptohash-0.11.9
new file mode 100644
index 000000000000..6baec559d42c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cryptohash-0.11.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=collection of crypto hashes, fast, pure and practical
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cryptohash
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.11.9
+SRC_URI=mirror://hackage/packages/archive/cryptohash/0.11.9/cryptohash-0.11.9.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f68de14aad84f2671e91928a983e5851
diff --git a/metadata/md5-cache/dev-haskell/filelock-0.1.0.1 b/metadata/md5-cache/dev-haskell/filelock-0.1.0.1
new file mode 100644
index 000000000000..6eba96c1698c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/filelock-0.1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.2:= >=dev-haskell/cabal-1.14.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable interface to file locking (flock / LockFileEx)
+EAPI=6
+HOMEPAGE=https://github.com/takano-akio/filelock
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=>=dev-lang/ghc-7.4.2:=
+SLOT=0/0.1.0.1
+SRC_URI=mirror://hackage/packages/archive/filelock/0.1.0.1/filelock-0.1.0.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=503b1a0d4f14c675029454df6837f2ba
diff --git a/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.1 b/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.1
new file mode 100644
index 000000000000..e85b399bdf08
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-compat-0.8:=[profile?] dev-haskell/base-orphans:=[profile?] >=dev-haskell/generics-sop-0.1:=[profile?] <dev-haskell/generics-sop-0.4:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2.1.8 dev-haskell/quickcheck dev-haskell/safe dev-haskell/silently ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Create command line interfaces with ease
+EAPI=6
+HOMEPAGE=https://github.com/soenkehahn/getopt-generics#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-compat-0.8:=[profile?] dev-haskell/base-orphans:=[profile?] >=dev-haskell/generics-sop-0.1:=[profile?] <dev-haskell/generics-sop-0.4:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.13.0.1
+SRC_URI=mirror://hackage/packages/archive/getopt-generics/0.13.0.1/getopt-generics-0.13.0.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3c9f2ee9a197c0c44bdc1b864801ca47
diff --git a/metadata/md5-cache/dev-haskell/hit-0.6.3 b/metadata/md5-cache/dev-haskell/hit-0.6.3
new file mode 100644
index 000000000000..33e25f936ade
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hit-0.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/cryptohash:=[profile?] >=dev-haskell/hourglass-0.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/patience:=[profile?] dev-haskell/random:=[profile?] dev-haskell/system-fileio:=[profile?] dev-haskell/system-filepath:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/zlib:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( >=dev-haskell/hashable-1.2:=[profile?] dev-haskell/hashtables:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/bytedump-1.0 dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Git operations in haskell
+EAPI=6
+HOMEPAGE=https://github.com/vincenthz/hit
+IUSE=debug executable doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/cryptohash:=[profile?] >=dev-haskell/hourglass-0.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/patience:=[profile?] dev-haskell/random:=[profile?] dev-haskell/system-fileio:=[profile?] dev-haskell/system-filepath:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/zlib:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( >=dev-haskell/hashable-1.2:=[profile?] dev-haskell/hashtables:=[profile?] )
+SLOT=0/0.6.3
+SRC_URI=mirror://hackage/packages/archive/hit/0.6.3/hit-0.6.3.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a228cd379a2dfc3c91464b1e8205c5c8
diff --git a/metadata/md5-cache/dev-haskell/hpack-0.14.1 b/metadata/md5-cache/dev-haskell/hpack-0.14.1
new file mode 100644
index 000000000000..14dd3d7926fe
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hpack-0.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/base-compat-0.8:=[profile?] dev-haskell/glob:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/aeson-0.10 dev-haskell/aeson-qq >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/interpolate >=dev-haskell/mockery-0.3 dev-haskell/quickcheck dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An alternative format for Haskell packages
+EAPI=6
+HOMEPAGE=https://github.com/sol/hpack#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/base-compat-0.8:=[profile?] dev-haskell/glob:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.14.1
+SRC_URI=mirror://hackage/packages/archive/hpack/0.14.1/hpack-0.14.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=40a259ce4d53492db5d2cde871563c83
diff --git a/metadata/md5-cache/dev-haskell/hspec-smallcheck-0.4.1 b/metadata/md5-cache/dev-haskell/hspec-smallcheck-0.4.1
new file mode 100644
index 000000000000..ae6a30724f8f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hspec-smallcheck-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=SmallCheck support for the Hspec testing framework
+EAPI=6
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.1
+SRC_URI=mirror://hackage/packages/archive/hspec-smallcheck/0.4.1/hspec-smallcheck-0.4.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4f6c3003cce52668d696071b36fd5b46
diff --git a/metadata/md5-cache/dev-haskell/interpolate-0.1.0 b/metadata/md5-cache/dev-haskell/interpolate-0.1.0
new file mode 100644
index 000000000000..f2378e493a1c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/interpolate-0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/haskell-src-meta:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.5 dev-haskell/quickcheck dev-haskell/quickcheck-instances dev-haskell/text ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=String interpolation done right
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/interpolate
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/haskell-src-meta:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0
+SRC_URI=mirror://hackage/packages/archive/interpolate/0.1.0/interpolate-0.1.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=75470624156cf0a53ccbd2dbb41d4009
diff --git a/metadata/md5-cache/dev-haskell/lifted-async-0.9.1.1-r1 b/metadata/md5-cache/dev-haskell/lifted-async-0.9.1.1-r1
new file mode 100644
index 000000000000..6de3844b760e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/lifted-async-0.9.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.10:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] ) !monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/mtl dev-haskell/tasty >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 dev-haskell/tasty-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run lifted IO operations asynchronously and wait for their results
+EAPI=6
+HOMEPAGE=https://github.com/maoe/lifted-async
+IUSE=+monad-control-1 doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.10:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] ) !monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
+SLOT=0/0.9.1.1
+SRC_URI=mirror://hackage/packages/archive/lifted-async/0.9.1.1/lifted-async-0.9.1.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8f2a9d483b01bfca9f4f8ac2401495eb
diff --git a/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.10 b/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.10
new file mode 100644
index 000000000000..4df767d324c1
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.5 >=dev-haskell/monad-control-1.0.0.3 <dev-haskell/monad-control-1.1 >=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6 >=dev-haskell/transformers-base-0.4.4 <dev-haskell/transformers-base-0.5 >=dev-haskell/transformers-compat-0.3 <dev-haskell/transformers-compat-0.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=lifted IO operations from the base library
+EAPI=6
+HOMEPAGE=https://github.com/basvandijk/lifted-base
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.3.10
+SRC_URI=mirror://hackage/packages/archive/lifted-base/0.2.3.10/lifted-base-0.2.3.10.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0d9b70a6d665532cd22d5e7c09eae2a5
diff --git a/metadata/md5-cache/dev-haskell/microlens-0.4.8.0 b/metadata/md5-cache/dev-haskell/microlens-0.4.8.0
new file mode 100644
index 000000000000..e9098d4e81ec
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/microlens-0.4.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A tiny lens library with no dependencies
+EAPI=6
+HOMEPAGE=https://github.com/aelve/microlens
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+SLOT=0/0.4.8.0
+SRC_URI=mirror://hackage/packages/archive/microlens/0.4.8.0/microlens-0.4.8.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e9ca2d46722ef92345abad1e3bfcae99
diff --git a/metadata/md5-cache/dev-haskell/neat-interpolation-0.3.2.1 b/metadata/md5-cache/dev-haskell/neat-interpolation-0.3.2.1
new file mode 100644
index 000000000000..8c207ae90899
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/neat-interpolation-0.3.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/htf-0.11 <dev-haskell/htf-0.14 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A quasiquoter for neat and simple multiline text interpolation
+EAPI=6
+HOMEPAGE=https://github.com/nikita-volkov/neat-interpolation
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=<dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.3.2.1
+SRC_URI=mirror://hackage/packages/archive/neat-interpolation/0.3.2.1/neat-interpolation-0.3.2.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e9c8a6967fe57495f7e7b80b2f0bcf4d
diff --git a/metadata/md5-cache/dev-haskell/open-browser-0.2.1.0-r1 b/metadata/md5-cache/dev-haskell/open-browser-0.2.1.0-r1
new file mode 100644
index 000000000000..650ed761d361
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/open-browser-0.2.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Open a web browser from Haskell
+EAPI=6
+HOMEPAGE=https://github.com/rightfold/open-browser
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.1.0
+SRC_URI=mirror://hackage/packages/archive/open-browser/0.2.1.0/open-browser-0.2.1.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c7bd3aed94ffbb946c286b9449206315
diff --git a/metadata/md5-cache/dev-haskell/optparse-simple-0.0.3 b/metadata/md5-cache/dev-haskell/optparse-simple-0.0.3
new file mode 100644
index 000000000000..b15418ef82df
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/optparse-simple-0.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/either:=[profile?] dev-haskell/gitrev:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple interface to optparse-applicative
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/optparse-simple
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/either:=[profile?] dev-haskell/gitrev:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.0.3
+SRC_URI=mirror://hackage/packages/archive/optparse-simple/0.0.3/optparse-simple-0.0.3.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d47f38f4bb76fdd4f197ca1903e17877
diff --git a/metadata/md5-cache/dev-haskell/path-0.5.13 b/metadata/md5-cache/dev-haskell/path-0.5.13
new file mode 100644
index 000000000000..8fe7eceb6534
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/path-0.5.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3 >=dev-haskell/mtl-2.0 <dev-haskell/mtl-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support for well-typed paths
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/path
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.5.13
+SRC_URI=mirror://hackage/packages/archive/path/0.5.13/path-0.5.13.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4ac8a20269c8c05034481468c4e1760d
diff --git a/metadata/md5-cache/dev-haskell/path-io-1.2.2 b/metadata/md5-cache/dev-haskell/path-io-1.2.2
new file mode 100644
index 000000000000..822736acaddb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/path-io-1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/path-0.5:=[profile?] <dev-haskell/path-0.6:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Interface to 'directory' package for users of 'path'
+EAPI=6
+HOMEPAGE=https://github.com/mrkkrp/path-io
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/path-0.5:=[profile?] <dev-haskell/path-0.6:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/1.2.2
+SRC_URI=mirror://hackage/packages/archive/path-io/1.2.2/path-io-1.2.2.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fbfe377f0ec3c01c6092e48a2052fd7f
diff --git a/metadata/md5-cache/dev-haskell/pid1-0.1.0.1 b/metadata/md5-cache/dev-haskell/pid1-0.1.0.1
new file mode 100644
index 000000000000..a14c672654fd
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/pid1-0.1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Do signal handling and orphan reaping for Unix PID1 init processes
+EAPI=6
+HOMEPAGE=https://github.com/fpco/pid1#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.0.1
+SRC_URI=mirror://hackage/packages/archive/pid1/0.1.0.1/pid1-0.1.0.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=429faf34f93d3ae97aaa2676d41b690c
diff --git a/metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1 b/metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1
new file mode 100644
index 000000000000..dfa9d957c1ec
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/regex-applicative-0.3:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=regex-applicative on text
+EAPI=6
+HOMEPAGE=https://github.com/phadej/regex-applicative-text#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/regex-applicative-0.3:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.1
+SRC_URI=mirror://hackage/packages/archive/regex-applicative-text/0.1.0.1/regex-applicative-text-0.1.0.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=161f9a622f97d2c8199b1b498b24e939
diff --git a/metadata/md5-cache/dev-haskell/resourcet-1.1.9 b/metadata/md5-cache/dev-haskell/resourcet-1.1.9
new file mode 100644
index 000000000000..65712645e777
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/resourcet-1.1.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Deterministic allocation and freeing of scarce resources
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.1.9
+SRC_URI=mirror://hackage/packages/archive/resourcet/1.1.9/resourcet-1.1.9.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a19120b4a1848e65194b47837f6f24d6
diff --git a/metadata/md5-cache/dev-haskell/retry-0.7.4.2 b/metadata/md5-cache/dev-haskell/retry-0.7.4.2
new file mode 100644
index 000000000000..acb7d88da32a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/retry-0.7.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-default-class:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.9 >=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.6 dev-haskell/mtl >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10 dev-haskell/stm ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Retry combinators for monadic actions that may fail
+EAPI=6
+HOMEPAGE=https://github.com/Soostone/retry
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.7.4.2
+SRC_URI=mirror://hackage/packages/archive/retry/0.7.4.2/retry-0.7.4.2.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0562b35ba0e40b8f33faadf25f0720e7
diff --git a/metadata/md5-cache/dev-haskell/stack-1.3.2 b/metadata/md5-cache/dev-haskell/stack-1.3.2
new file mode 100644
index 000000000000..2279447a5d8c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/stack-1.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?] <dev-haskell/annotated-wl-pprint-0.8:=[profile?] >=dev-haskell/ansi-terminal-0.6.2.3:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.12.1.5:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base-compat-0.6:=[profile?] <dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-tagged-0.1.1:=[profile?] <dev-haskell/binary-tagged-0.2:=[profile?] >=dev-haskell/blaze-builder-0.4.0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/cabal-1.18.1.5:=[profile?] <dev-haskell/cabal-1.25:=[profile?] >=dev-haskell/clock-0.7.2:=[profile?] <dev-haskell/clock-0.8:=[profile?] >=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.7.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?] >=dev-haskell/cryptohash-0.11.6:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/cryptohash-conduit-0.1.1:=[profile?] <dev-haskell/cryptohash-conduit-0.2:=[profile?] >=dev-haskell/either-4.4.1.1:=[profile?] <dev-haskell/either-4.5:=[profile?] >=dev-haskell/errors-2.1.2:=[profile?] <dev-haskell/errors-2.2:=[profile?] >=dev-haskell/exceptions-0.8.0.2:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/extra-1.4.10:=[profile?] <dev-haskell/extra-1.6:=[profile?] >=dev-haskell/fast-logger-2.3.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] >=dev-haskell/file-embed-0.0.10:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/filelock-0.1.0.1:=[profile?] <dev-haskell/filelock-0.2:=[profile?] >=dev-haskell/fsnotify-0.2.1:=[profile?] <dev-haskell/fsnotify-0.3:=[profile?] >=dev-haskell/generic-deriving-1.10.5:=[profile?] <dev-haskell/generic-deriving-1.12:=[profile?] >=dev-haskell/gitrev-1.1:=[profile?] <dev-haskell/gitrev-1.3:=[profile?] >=dev-haskell/hashable-1.2.3.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/hastache-0.6.1:=[profile?] <dev-haskell/hastache-0.7:=[profile?] >=dev-haskell/hit-0.6.3:=[profile?] <dev-haskell/hit-0.7:=[profile?] >=dev-haskell/hpack-0.14.0:=[profile?] <dev-haskell/hpack-0.16:=[profile?] >=dev-haskell/http-client-0.5.3.3:=[profile?] <dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.3.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.2.3:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?] >=dev-haskell/http-types-0.8.6:=[profile?] <dev-haskell/http-types-0.10:=[profile?] >=dev-haskell/lifted-async-0.9.0:=[profile?] <dev-haskell/lifted-async-0.10:=[profile?] >=dev-haskell/lifted-base-0.2.3.8:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/microlens-0.3.0.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/monad-control-1.0.1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-logger-0.3.13.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/monad-unlift-0.2.0:=[profile?] <dev-haskell/monad-unlift-0.3:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/open-browser-0.2.1:=[profile?] <dev-haskell/open-browser-0.3:=[profile?] >=dev-haskell/optparse-applicative-0.13:=[profile?] <dev-haskell/optparse-applicative-0.14:=[profile?] >=dev-haskell/optparse-simple-0.0.3:=[profile?] <dev-haskell/optparse-simple-0.1:=[profile?] >=dev-haskell/path-0.5.9:=[profile?] <dev-haskell/path-0.6:=[profile?] >=dev-haskell/path-io-1.1.0:=[profile?] <dev-haskell/path-io-2.0.0:=[profile?] >=dev-haskell/persistent-2.1.2:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/persistent-template-2.1.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?] >=dev-haskell/pid1-0.1:=[profile?] <dev-haskell/pid1-0.2:=[profile?] >=dev-haskell/project-template-0.2:=[profile?] <dev-haskell/project-template-0.3:=[profile?] >=dev-haskell/regex-applicative-text-0.1.0.1:=[profile?] <dev-haskell/regex-applicative-text-0.2:=[profile?] >=dev-haskell/resourcet-1.1.4.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/retry-0.6:=[profile?] <dev-haskell/retry-0.8:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/safe-exceptions-0.1.4.0:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?] >=dev-haskell/semigroups-0.5:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/split-0.2.3.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.4:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/store-0.2.1.0:=[profile?] <dev-haskell/store-0.4:=[profile?] >=dev-haskell/streaming-commons-0.1.10.0:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/tar-0.5.0.3:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/temporary-1.2.0.3:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-binary-0.2.1.1:=[profile?] <dev-haskell/text-binary-0.3:=[profile?] >=dev-haskell/text-metrics-0.1:=[profile?] <dev-haskell/text-metrics-0.3:=[profile?] >=dev-haskell/tls-1.3.8:=[profile?] <dev-haskell/tls-1.4:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/unicode-transforms-0.1:=[profile?] <dev-haskell/unicode-transforms-0.3:=[profile?] >=dev-haskell/unix-compat-0.4.1.4:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/vector-binary-instances-0.2.3.2:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?] >=dev-haskell/yaml-0.8.20:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.7:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.2:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.10.1:= >dev-haskell/persistent-sqlite-2.5.0.1:=[profile?] <dev-haskell/persistent-sqlite-2.7:=[profile?] >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/attoparsec-0.13.1.0 <dev-haskell/attoparsec-0.14 >=dev-haskell/conduit-extra-1.1.14 <dev-haskell/conduit-extra-1.2 >=dev-haskell/cryptohash-0.11.9 <dev-haskell/cryptohash-0.12 >=dev-haskell/exceptions-0.8.3 <dev-haskell/exceptions-0.9 >=dev-haskell/hspec-2.2 <dev-haskell/hspec-2.4 >=dev-haskell/monad-logger-0.3.20.1 <dev-haskell/monad-logger-0.4 >=dev-haskell/mono-traversable-0.10.2 <dev-haskell/mono-traversable-0.11 >=dev-haskell/neat-interpolation-0.3 <dev-haskell/neat-interpolation-0.4 >=dev-haskell/quickcheck-2.8.2 <dev-haskell/quickcheck-2.10 >=dev-haskell/resourcet-1.1.8.1 <dev-haskell/resourcet-1.2 >=dev-haskell/smallcheck-1.1.1 <dev-haskell/smallcheck-1.2 >=dev-haskell/temporary-1.2.0.4 <dev-haskell/temporary-1.3 >=dev-haskell/text-1.2.2.1 <dev-haskell/text-1.3 >=dev-haskell/th-reify-many-0.1.6 <dev-haskell/th-reify-many-0.2 >=dev-haskell/vector-0.11.0.0 <dev-haskell/vector-0.12 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The Haskell Tool Stack
+EAPI=6
+HOMEPAGE=http://haskellstack.org
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?] <dev-haskell/annotated-wl-pprint-0.8:=[profile?] >=dev-haskell/ansi-terminal-0.6.2.3:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.12.1.5:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base-compat-0.6:=[profile?] <dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-tagged-0.1.1:=[profile?] <dev-haskell/binary-tagged-0.2:=[profile?] >=dev-haskell/blaze-builder-0.4.0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/cabal-1.18.1.5:=[profile?] <dev-haskell/cabal-1.25:=[profile?] >=dev-haskell/clock-0.7.2:=[profile?] <dev-haskell/clock-0.8:=[profile?] >=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.7.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?] >=dev-haskell/cryptohash-0.11.6:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/cryptohash-conduit-0.1.1:=[profile?] <dev-haskell/cryptohash-conduit-0.2:=[profile?] >=dev-haskell/either-4.4.1.1:=[profile?] <dev-haskell/either-4.5:=[profile?] >=dev-haskell/errors-2.1.2:=[profile?] <dev-haskell/errors-2.2:=[profile?] >=dev-haskell/exceptions-0.8.0.2:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/extra-1.4.10:=[profile?] <dev-haskell/extra-1.6:=[profile?] >=dev-haskell/fast-logger-2.3.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] >=dev-haskell/file-embed-0.0.10:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/filelock-0.1.0.1:=[profile?] <dev-haskell/filelock-0.2:=[profile?] >=dev-haskell/fsnotify-0.2.1:=[profile?] <dev-haskell/fsnotify-0.3:=[profile?] >=dev-haskell/generic-deriving-1.10.5:=[profile?] <dev-haskell/generic-deriving-1.12:=[profile?] >=dev-haskell/gitrev-1.1:=[profile?] <dev-haskell/gitrev-1.3:=[profile?] >=dev-haskell/hashable-1.2.3.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/hastache-0.6.1:=[profile?] <dev-haskell/hastache-0.7:=[profile?] >=dev-haskell/hit-0.6.3:=[profile?] <dev-haskell/hit-0.7:=[profile?] >=dev-haskell/hpack-0.14.0:=[profile?] <dev-haskell/hpack-0.16:=[profile?] >=dev-haskell/http-client-0.5.3.3:=[profile?] <dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.3.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.2.3:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?] >=dev-haskell/http-types-0.8.6:=[profile?] <dev-haskell/http-types-0.10:=[profile?] >=dev-haskell/lifted-async-0.9.0:=[profile?] <dev-haskell/lifted-async-0.10:=[profile?] >=dev-haskell/lifted-base-0.2.3.8:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/microlens-0.3.0.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/monad-control-1.0.1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-logger-0.3.13.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/monad-unlift-0.2.0:=[profile?] <dev-haskell/monad-unlift-0.3:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/open-browser-0.2.1:=[profile?] <dev-haskell/open-browser-0.3:=[profile?] >=dev-haskell/optparse-applicative-0.13:=[profile?] <dev-haskell/optparse-applicative-0.14:=[profile?] >=dev-haskell/optparse-simple-0.0.3:=[profile?] <dev-haskell/optparse-simple-0.1:=[profile?] >=dev-haskell/path-0.5.9:=[profile?] <dev-haskell/path-0.6:=[profile?] >=dev-haskell/path-io-1.1.0:=[profile?] <dev-haskell/path-io-2.0.0:=[profile?] >=dev-haskell/persistent-2.1.2:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/persistent-template-2.1.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?] >=dev-haskell/pid1-0.1:=[profile?] <dev-haskell/pid1-0.2:=[profile?] >=dev-haskell/project-template-0.2:=[profile?] <dev-haskell/project-template-0.3:=[profile?] >=dev-haskell/regex-applicative-text-0.1.0.1:=[profile?] <dev-haskell/regex-applicative-text-0.2:=[profile?] >=dev-haskell/resourcet-1.1.4.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/retry-0.6:=[profile?] <dev-haskell/retry-0.8:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/safe-exceptions-0.1.4.0:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?] >=dev-haskell/semigroups-0.5:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/split-0.2.3.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.4:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/store-0.2.1.0:=[profile?] <dev-haskell/store-0.4:=[profile?] >=dev-haskell/streaming-commons-0.1.10.0:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/tar-0.5.0.3:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/temporary-1.2.0.3:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-binary-0.2.1.1:=[profile?] <dev-haskell/text-binary-0.3:=[profile?] >=dev-haskell/text-metrics-0.1:=[profile?] <dev-haskell/text-metrics-0.3:=[profile?] >=dev-haskell/tls-1.3.8:=[profile?] <dev-haskell/tls-1.4:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/unicode-transforms-0.1:=[profile?] <dev-haskell/unicode-transforms-0.3:=[profile?] >=dev-haskell/unix-compat-0.4.1.4:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/vector-binary-instances-0.2.3.2:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?] >=dev-haskell/yaml-0.8.20:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.7:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.2:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.10.1:= >dev-haskell/persistent-sqlite-2.5.0.1:=[profile?] <dev-haskell/persistent-sqlite-2.7:=[profile?]
+RESTRICT=test
+SLOT=0/1.3.2
+SRC_URI=mirror://hackage/packages/archive/stack/1.3.2/stack-1.3.2.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=74a86c957c095e0b0ee17d338a167f86
diff --git a/metadata/md5-cache/dev-haskell/store-0.3.1 b/metadata/md5-cache/dev-haskell/store-0.3.1
new file mode 100644
index 000000000000..dfff60519c78
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/store-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0.2:=[profile?] >=dev-haskell/base-orphans-0.4.3:=[profile?] >=dev-haskell/base64-bytestring-0.1.1:=[profile?] >=dev-haskell/conduit-1.2.3.1:=[profile?] >=dev-haskell/contravariant-1.3:=[profile?] >=dev-haskell/cryptohash-0.11.6:=[profile?] >=dev-haskell/free-4.11:=[profile?] >=dev-haskell/hashable-1.2.3.1:=[profile?] >=dev-haskell/hspec-2.1.2:=[profile?] >=dev-haskell/hspec-smallcheck-0.3.0:=[profile?] >=dev-haskell/lifted-base-0.2.3.3:=[profile?] >=dev-haskell/monad-control-0.3.3.0:=[profile?] >=dev-haskell/mono-traversable-0.7.0:=[profile?] >=dev-haskell/network-2.6.0.2:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/resourcet-1.1.3.3:=[profile?] >=dev-haskell/safe-0.3.8:=[profile?] >=dev-haskell/semigroups-0.8:=[profile?] >=dev-haskell/smallcheck-1.1.1:=[profile?] >=dev-haskell/store-core-0.3:=[profile?] <dev-haskell/store-core-0.4:=[profile?] >=dev-haskell/streaming-commons-0.1.10.0:=[profile?] >=dev-haskell/syb-0.4.4:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] >=dev-haskell/th-lift-instances-0.1.4:=[profile?] >=dev-haskell/th-orphans-0.12.2:=[profile?] >=dev-haskell/th-reify-many-0.1.6:=[profile?] >=dev-haskell/th-utilities-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] >=dev-haskell/void-0.5.11:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/cereal dev-haskell/cereal-vector dev-haskell/criterion dev-haskell/vector-binary-instances dev-haskell/weigh ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast binary serialization
+EAPI=6
+HOMEPAGE=https://github.com/fpco/store#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/async-2.0.2:=[profile?] >=dev-haskell/base-orphans-0.4.3:=[profile?] >=dev-haskell/base64-bytestring-0.1.1:=[profile?] >=dev-haskell/conduit-1.2.3.1:=[profile?] >=dev-haskell/contravariant-1.3:=[profile?] >=dev-haskell/cryptohash-0.11.6:=[profile?] >=dev-haskell/free-4.11:=[profile?] >=dev-haskell/hashable-1.2.3.1:=[profile?] >=dev-haskell/hspec-2.1.2:=[profile?] >=dev-haskell/hspec-smallcheck-0.3.0:=[profile?] >=dev-haskell/lifted-base-0.2.3.3:=[profile?] >=dev-haskell/monad-control-0.3.3.0:=[profile?] >=dev-haskell/mono-traversable-0.7.0:=[profile?] >=dev-haskell/network-2.6.0.2:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/resourcet-1.1.3.3:=[profile?] >=dev-haskell/safe-0.3.8:=[profile?] >=dev-haskell/semigroups-0.8:=[profile?] >=dev-haskell/smallcheck-1.1.1:=[profile?] >=dev-haskell/store-core-0.3:=[profile?] <dev-haskell/store-core-0.4:=[profile?] >=dev-haskell/streaming-commons-0.1.10.0:=[profile?] >=dev-haskell/syb-0.4.4:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] >=dev-haskell/th-lift-instances-0.1.4:=[profile?] >=dev-haskell/th-orphans-0.12.2:=[profile?] >=dev-haskell/th-reify-many-0.1.6:=[profile?] >=dev-haskell/th-utilities-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] >=dev-haskell/void-0.5.11:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.3.1
+SRC_URI=mirror://hackage/packages/archive/store/0.3.1/store-0.3.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b7c9b2808d0372378435a5493b06a8d7
diff --git a/metadata/md5-cache/dev-haskell/store-core-0.3 b/metadata/md5-cache/dev-haskell/store-core-0.3
new file mode 100644
index 000000000000..4c63d3146c4d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/store-core-0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-1.0:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-2.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast and lightweight binary serialization
+EAPI=6
+HOMEPAGE=https://github.com/fpco/store#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-1.0:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-2.0:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.3
+SRC_URI=mirror://hackage/packages/archive/store-core/0.3/store-core-0.3.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0c142b70daadc211f3dd217515521824
diff --git a/metadata/md5-cache/dev-haskell/text-binary-0.2.1.1 b/metadata/md5-cache/dev-haskell/text-binary-0.2.1.1
new file mode 100644
index 000000000000..0565264d20b8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/text-binary-0.2.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binary instances for text types
+EAPI=6
+HOMEPAGE=https://github.com/kawu/text-binary
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.1.1
+SRC_URI=mirror://hackage/packages/archive/text-binary/0.2.1.1/text-binary-0.2.1.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=abff658d88b570d454a4144d8e23acb5
diff --git a/metadata/md5-cache/dev-haskell/text-metrics-0.2.0 b/metadata/md5-cache/dev-haskell/text-metrics-0.2.0
new file mode 100644
index 000000000000..3a3e74a86134
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/text-metrics-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-3.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Calculate various string metrics efficiently
+EAPI=6
+HOMEPAGE=https://github.com/mrkkrp/text-metrics
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.2.0
+SRC_URI=mirror://hackage/packages/archive/text-metrics/0.2.0/text-metrics-0.2.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d3a882d965264c7813fcfb59c9f4fa20
diff --git a/metadata/md5-cache/dev-haskell/th-lift-0.7.7 b/metadata/md5-cache/dev-haskell/th-lift-0.7.7
new file mode 100644
index 000000000000..608cf065c0e8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/th-lift-0.7.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Derive Template Haskell's Lift class for datatypes
+EAPI=6
+HOMEPAGE=https://github.com/mboes/th-lift
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.7
+SRC_URI=mirror://hackage/packages/archive/th-lift/0.7.7/th-lift-0.7.7.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=eab88b2ef3b00aaa3fffcdc21c40587a
diff --git a/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.11 b/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.11
new file mode 100644
index 000000000000..ae665c16e0dc
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-haskell/vector-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lift instances for template-haskell for common data types
+EAPI=6
+HOMEPAGE=https://github.com/bennofs/th-lift-instances/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-haskell/vector-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.11
+SRC_URI=mirror://hackage/packages/archive/th-lift-instances/0.1.11/th-lift-instances-0.1.11.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=eed395b579dfb2e592c4a4dcb0101301
diff --git a/metadata/md5-cache/dev-haskell/th-orphans-0.13.3 b/metadata/md5-cache/dev-haskell/th-orphans-0.13.3
new file mode 100644
index 000000000000..071f8f9d9b7b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/th-orphans-0.13.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/generic-deriving-1.9:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] dev-haskell/th-lift-instances:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Orphan instances for TH datatypes
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/th-orphans
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/generic-deriving-1.9:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] dev-haskell/th-lift-instances:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.13.3
+SRC_URI=mirror://hackage/packages/archive/th-orphans/0.13.3/th-orphans-0.13.3.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=430e2df7db1487aba13101f60b584ce2
diff --git a/metadata/md5-cache/dev-haskell/th-utilities-0.2.0.1 b/metadata/md5-cache/dev-haskell/th-utilities-0.2.0.1
new file mode 100644
index 000000000000..645005d4d44c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/th-utilities-0.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-orphans:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Collection of useful functions for use with Template Haskell
+EAPI=6
+HOMEPAGE=https://github.com/fpco/th-utilities#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-orphans:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.2.0.1
+SRC_URI=mirror://hackage/packages/archive/th-utilities/0.2.0.1/th-utilities-0.2.0.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=512093bd57b64bc2fa03bc53358c5e99
diff --git a/metadata/md5-cache/dev-haskell/unicode-transforms-0.2.1 b/metadata/md5-cache/dev-haskell/unicode-transforms-0.2.1
new file mode 100644
index 000000000000..4d4b793f4426
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/unicode-transforms-0.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bitarray-0.0.1:=[profile?] <dev-haskell/bitarray-0.1:=[profile?] >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14 >=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.10 >=dev-haskell/split-0.1 <dev-haskell/split-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unicode normalization
+EAPI=6
+HOMEPAGE=https://github.com/harendra-kumar/unicode-transforms
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bitarray-0.0.1:=[profile?] <dev-haskell/bitarray-0.1:=[profile?] >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.2.1
+SRC_URI=mirror://hackage/packages/archive/unicode-transforms/0.2.1/unicode-transforms-0.2.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a8f1db145fe9350f4382bd9a3f8b59fd
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.6.9 b/metadata/md5-cache/dev-java/icedtea-7.2.6.10
similarity index 78%
rename from metadata/md5-cache/dev-java/icedtea-7.2.6.9
rename to metadata/md5-cache/dev-java/icedtea-7.2.6.10
index 167c0ce837cc..5ea3e57c989a 100644
--- a/metadata/md5-cache/dev-java/icedtea-7.2.6.9
+++ b/metadata/md5-cache/dev-java/icedtea-7.2.6.10
@@ -10,6 +10,6 @@ PDEPEND=webstart? ( dev-java/icedtea-web:0[icedtea7(+)] ) nsplugin? ( dev-java/i
 RDEPEND=app-misc/mime-types >=dev-libs/glib-2.26:2 >=dev-util/systemtap-1 media-libs/fontconfig >=media-libs/freetype-2.5.3:2= >=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 x11-libs/libXcomposite ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
 REQUIRED_USE=gtk? ( !headless-awt )
 SLOT=7
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.6.9.tar.xz http://icedtea.classpath.org/download/drops/icedtea7/2.6.9/openjdk.tar.bz2 -> icedtea-2.6-openjdk-2dd04ef37829.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.9/corba.tar.bz2 -> icedtea-2.6-corba-737fd3fbf139.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.9/jaxp.tar.bz2 -> icedtea-2.6-jaxp-aa1c302a99fb.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.9/jaxws.tar.bz2 -> icedtea-2.6-jaxws-ea96df8beff4.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.9/jdk.tar.bz2 -> icedtea-2.6-jdk-ce87b1399385.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.9/hotspot.tar.bz2 -> icedtea-2.6-hotspot-9fc0d63c2a74.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.9/langtools.tar.bz2 -> icedtea-2.6-langtools-dd8e22d986c8.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
+SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.6.10.tar.xz http://icedtea.classpath.org/download/drops/icedtea7/2.6.10/openjdk.tar.bz2 -> icedtea-2.6-openjdk-b3f98f0d4549.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.10/corba.tar.bz2 -> icedtea-2.6-corba-4d807b58849e.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.10/jaxp.tar.bz2 -> icedtea-2.6-jaxp-4099d8cf255f.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.10/jaxws.tar.bz2 -> icedtea-2.6-jaxws-bc4f48c1ccba.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.10/jdk.tar.bz2 -> icedtea-2.6-jdk-11e15e507828.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.10/hotspot.tar.bz2 -> icedtea-2.6-hotspot-8edec8d2933a.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.10/langtools.tar.bz2 -> icedtea-2.6-langtools-6e30439005f6.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	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=39d49767b4b6b116e122309d979a9ae5
+_md5_=d0af93d391c1c363dd65de8c38f4730d
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.3.0-r1 b/metadata/md5-cache/dev-java/icedtea-bin-3.3.0-r1
deleted file mode 100644
index a2e192ff0b2a..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.3.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
-EAPI=6
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 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 ~arm ppc64 x86
-LICENSE=GPL-2-with-classpath-exception
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
-RDEPEND=>=sys-devel/gcc-4.9.4[multilib?] >=sys-libs/glibc-2.22[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.42:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.11: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(-)?] >=media-libs/freetype-2.5.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.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(-)?] >=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/jpeg:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-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(-)?] ) cups? ( >=net-print/cups-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(-)?] ) gtk? ( >=dev-libs/atk-2.16.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-libs/cairo-1.14.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/gdk-pixbuf: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/gtk+-2.24: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/pango-1.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib: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(-)?] =media-libs/libpng-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(-)?] >=x11-libs/libX11-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(-)?] >=x11-libs/libXcomposite-0.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/libXext-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/libXi-1.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(-)?] >=x11-libs/libXrender-0.9.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/libXtst-1.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(-)?] ) ) !multilib? ( >=dev-libs/glib-2.42:2 >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.6:2 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) 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 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
-RESTRICT=preserve-libs strip
-SLOT=8
-SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-3.3.0.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-3.3.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.3.0-x86.tar.xz https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-sunec-3.3.0-x86.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.3.0-amd64.tar.xz https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-sunec-3.3.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.3.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.3.0-arm.tar.xz https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-sunec-3.3.0-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.3.0-arm.tar.xz ) ) ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.3.0-ppc64.tar.xz https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-sunec-3.3.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.3.0-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.3.0-x86.tar.xz https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-sunec-3.3.0-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.3.0-x86.tar.xz ) )
-_eclasses_=fdo-mime	21ef5adf81836863efa968f2a25cff64	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=cc0154b85c24f732fd93fb3373a50232
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.10 b/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.10
new file mode 100644
index 000000000000..3615cd908645
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.10
@@ -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-r3 >=app-eselect/eselect-java-0.2.0
+DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
+EAPI=6
+HOMEPAGE=http://icedtea.classpath.org
+IUSE=+alsa cjk +cups doc examples +gtk headless-awt multilib nsplugin nss pulseaudio selinux source +webstart abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2-with-classpath-exception
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
+RDEPEND=>=gnome-base/gsettings-desktop-schemas-3.12.2 media-fonts/dejavu >=sys-devel/gcc-4.9.3[multilib?] >=sys-libs/glibc-2.22[multilib?] cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.42:2[abi_x86_32(-)?,abi_x86_64(-)?] >=media-libs/fontconfig-2.11:1.0[abi_x86_32(-)?,abi_x86_64(-)?] >=media-libs/freetype-2.5.5:2[abi_x86_32(-)?,abi_x86_64(-)?] >=media-libs/lcms-2.6:2[abi_x86_32(-)?,abi_x86_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?] virtual/jpeg:62[abi_x86_32(-)?,abi_x86_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?] ) gtk? ( >=dev-libs/atk-2.16.0[abi_x86_32(-)?,abi_x86_64(-)?] >=x11-libs/cairo-1.14.2[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?] >=x11-libs/pango-1.36[abi_x86_32(-)?,abi_x86_64(-)?] ) !headless-awt? ( >=media-libs/giflib-4.1.6-r1[abi_x86_32(-)?,abi_x86_64(-)?] =media-libs/libpng-1.6*[abi_x86_32(-)?,abi_x86_64(-)?] >=x11-libs/libX11-1.6[abi_x86_32(-)?,abi_x86_64(-)?] >=x11-libs/libXcomposite-0.4[abi_x86_32(-)?,abi_x86_64(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?] >=x11-libs/libXi-1.7[abi_x86_32(-)?,abi_x86_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?] ) nss? ( >=dev-libs/nss-3.16.1-r1[abi_x86_32(-)?,abi_x86_64(-)?] >=dev-libs/nspr-4.10[abi_x86_32(-)?,abi_x86_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.42:2 >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.6:2 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) 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 ) !headless-awt? ( >=media-libs/giflib-4.1.6-r1 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) nss? ( >=dev-libs/nss-3.16.1-r1 >=dev-libs/nspr-4.10 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
+REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt ) || ( abi_x86_32 abi_x86_64 )
+RESTRICT=preserve-libs strip
+SLOT=7
+SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-7.2.6.10.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-7.2.6.10.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.10-x86.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.10-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.10-amd64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.10-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.10-x86.tar.xz ) )
+_eclasses_=fdo-mime	21ef5adf81836863efa968f2a25cff64	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=d3ddd17f33c190db44473cc7504e5129
diff --git a/metadata/md5-cache/dev-lang/erlang-18.3 b/metadata/md5-cache/dev-lang/erlang-18.3
index c7c29e389dff..b477d9c13e38 100644
--- a/metadata/md5-cache/dev-lang/erlang-18.3
+++ b/metadata/md5-cache/dev-lang/erlang-18.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) sctp? ( net-misc/lksctp-tools ) tk? ( dev-lang/tk ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) sctp? ( net-misc/lksctp-tools ) tk? ( dev-lang/tk ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=5
 HOMEPAGE=http://www.erlang.org/
 IUSE=compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets elibc_FreeBSD java
 KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_18.3.tar.gz http://erlang.org/download/otp_doc_man_18.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_18.3.tar.gz )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=81e950e71ff511c5f64ab7273cb7a3dc
+_md5_=34e90e00c6f995c1068fe80aa24aeb4e
diff --git a/metadata/md5-cache/dev-lang/erlang-19.1 b/metadata/md5-cache/dev-lang/erlang-19.1
index 338de7ddb7f7..4c69c6934624 100644
--- a/metadata/md5-cache/dev-lang/erlang-19.1
+++ b/metadata/md5-cache/dev-lang/erlang-19.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) sctp? ( net-misc/lksctp-tools ) tk? ( dev-lang/tk ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) sctp? ( net-misc/lksctp-tools ) tk? ( dev-lang/tk ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=5
 HOMEPAGE=http://www.erlang.org/
 IUSE=compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets elibc_FreeBSD java
 KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_19.1.tar.gz http://erlang.org/download/otp_doc_man_19.1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_19.1.tar.gz )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=13fbd0d50f3e4d72ccff3d912c3e8629
+_md5_=791e19853076894246ef519a70db2f5d
diff --git a/metadata/md5-cache/dev-lang/erlang-19.2 b/metadata/md5-cache/dev-lang/erlang-19.2
index 4e403ba93fff..c19f10430d76 100644
--- a/metadata/md5-cache/dev-lang/erlang-19.2
+++ b/metadata/md5-cache/dev-lang/erlang-19.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) sctp? ( net-misc/lksctp-tools ) tk? ( dev-lang/tk ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) sctp? ( net-misc/lksctp-tools ) tk? ( dev-lang/tk ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=5
 HOMEPAGE=http://www.erlang.org/
 IUSE=compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets elibc_FreeBSD java
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_19.2.tar.gz http://erlang.org/download/otp_doc_man_19.2.tar.gz doc? ( http://erlang.org/download/otp_doc_html_19.2.tar.gz )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=2d7f369ac578d5245b5b0bfbc2594768
+_md5_=3270b8c6b726abc4e108f9765beaca9b
diff --git a/metadata/md5-cache/dev-lang/erlang-19.3 b/metadata/md5-cache/dev-lang/erlang-19.3
index 0100a7f3401c..930e95f7cabb 100644
--- a/metadata/md5-cache/dev-lang/erlang-19.3
+++ b/metadata/md5-cache/dev-lang/erlang-19.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) sctp? ( net-misc/lksctp-tools ) tk? ( dev-lang/tk ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) sctp? ( net-misc/lksctp-tools ) tk? ( dev-lang/tk ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=5
 HOMEPAGE=http://www.erlang.org/
 IUSE=compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets elibc_FreeBSD java
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_19.3.tar.gz http://erlang.org/download/otp_doc_man_19.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_19.3.tar.gz )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=2d7f369ac578d5245b5b0bfbc2594768
+_md5_=3270b8c6b726abc4e108f9765beaca9b
diff --git a/metadata/md5-cache/dev-lang/ghc-8.0.2 b/metadata/md5-cache/dev-lang/ghc-8.0.2
index bd824773c4fd..dd035344f5b5 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.0.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( || ( sys-libs/ncurses:0/6 sys-libs/ncurses:5/6 ) ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) >=app-portage/elt-patches-20170317 !<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=The Glasgow Haskell Compiler
 EAPI=5
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -7,9 +7,9 @@ IUSE=doc ghcbootstrap ghcmakebinary +gmp +profile binary
 KEYWORDS=~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 PDEPEND=!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )
-RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( || ( sys-libs/ncurses:0/6 sys-libs/ncurses:5/6 ) )
+RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( sys-libs/ncurses:0/6 )
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.0.2
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-src.tar.xz ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-8.0.2-alpha.tbz2 ) arm64? ( http://code.haskell.org/~slyfox/ghc-arm64/ghc-bin-8.0.2-arm64.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-8.0.2-amd64.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-8.0.2-x86.tbz2 ) )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ghc-package	f9cf05643e20f03876bb4807f008c80f	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4e5dc4c0f606447d209c1bd6accd859e
+_md5_=7e2d2b330a00846e0aca17262bd6bfb7
diff --git a/metadata/md5-cache/dev-libs/Ice-3.5.1 b/metadata/md5-cache/dev-libs/Ice-3.5.1
index 5129ecb489f7..5ee5488fe74a 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.5.1
+++ b/metadata/md5-cache/dev-libs/Ice-3.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 >=dev-libs/openssl-0.9.8o:
 REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.tar.gz doc? ( http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.pdf )
-_eclasses_=db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b5e711bc9b083ebf6ee6523c9ea66ea6
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.3 b/metadata/md5-cache/dev-libs/Ice-3.6.3
index cc2eed8e3794..cf00f292dc48 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.6.3
+++ b/metadata/md5-cache/dev-libs/Ice-3.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 !libressl? ( dev-libs/open
 REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) php? ( || ( php_targets_php7-0 ) )
 SLOT=0/36
 SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.6.3.tar.gz -> Ice-3.6.3.tar.gz doc? ( http://download.zeroc.com/Ice/3.6/Ice-3.6.3.pdf )
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r2	6b0fe3f9cc5ad2f4e3ffcea3e9112c4c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r2	6b0fe3f9cc5ad2f4e3ffcea3e9112c4c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9568504734d77300fb3807390f4cb53d
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.3-r1 b/metadata/md5-cache/dev-libs/Ice-3.6.3-r1
index 7a39cf15fc58..0d9b395249ad 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.6.3-r1
+++ b/metadata/md5-cache/dev-libs/Ice-3.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 !libressl? ( dev-libs/open
 REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) php? ( || ( php_targets_php7-0 ) )
 SLOT=0/36
 SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.6.3.tar.gz -> Ice-3.6.3.tar.gz doc? ( http://download.zeroc.com/Ice/3.6/Ice-3.6.3.pdf )
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r2	6b0fe3f9cc5ad2f4e3ffcea3e9112c4c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r2	6b0fe3f9cc5ad2f4e3ffcea3e9112c4c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=38811c6415b289421f1daa05e5219b92
diff --git a/metadata/md5-cache/dev-libs/appstream-0.10.5 b/metadata/md5-cache/dev-libs/appstream-0.10.5
index 895988b8cd11..4d7d2c9903e7 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.10.5
+++ b/metadata/md5-cache/dev-libs/appstream-0.10.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer qt5? ( dev-qt/qtcore:5 )
 SLOT=0/4
 SRC_URI=https://github.com/ximion/appstream/archive/APPSTREAM_0_10_5.tar.gz -> appstream-0.10.5.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4e487eb3f6c47753c5628e3329cae6de
diff --git a/metadata/md5-cache/dev-libs/appstream-0.10.6 b/metadata/md5-cache/dev-libs/appstream-0.10.6
index 3ba0daf5a715..ba05bb28d734 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.10.6
+++ b/metadata/md5-cache/dev-libs/appstream-0.10.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer qt5? ( dev-qt/qtcore:5 )
 SLOT=0/4
 SRC_URI=https://github.com/ximion/appstream/archive/APPSTREAM_0_10_6.tar.gz -> appstream-0.10.6.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4e487eb3f6c47753c5628e3329cae6de
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.169-r1 b/metadata/md5-cache/dev-libs/elfutils-0.169-r1
new file mode 100644
index 000000000000..86919546d09b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/elfutils-0.169-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install 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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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 nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
+DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for libelf)
+EAPI=6
+HOMEPAGE=http://elfutils.org/
+IUSE=bzip2 lzma nls static-libs test +threads +utils abi_x86_32 abi_x86_64 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-linux ~arm-linux ~x86-linux
+LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
+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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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
+SLOT=0
+SRC_URI=https://sourceware.org/elfutils/ftp/0.169/elfutils-0.169.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=e4fdad67d77dcbdb27d5f770c1c1e7fb
diff --git a/metadata/md5-cache/dev-libs/icu-58.2 b/metadata/md5-cache/dev-libs/icu-58.2
deleted file mode 100644
index 2ea1c1e65d52..000000000000
--- a/metadata/md5-cache/dev-libs/icu-58.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=app-portage/elt-patches-20170317 !<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=International Components for Unicode
-EAPI=6
-HOMEPAGE=http://www.icu-project.org/
-IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=BSD
-SLOT=0/58.2
-SRC_URI=http://download.icu-project.org/files/icu4c/58.2/icu4c-58_2-src.tgz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=ae5f0ced3c2ac82f75e61a27504a4cda
diff --git a/metadata/md5-cache/dev-libs/kasync-0.1.1 b/metadata/md5-cache/dev-libs/kasync-0.1.1
index 3d18ece3e7f6..5e6151455237 100644
--- a/metadata/md5-cache/dev-libs/kasync-0.1.1
+++ b/metadata/md5-cache/dev-libs/kasync-0.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kasync/0.1.1/src/kasync-0.1.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=82624b9e928c29220ad8738c147c1973
diff --git a/metadata/md5-cache/dev-libs/kdiagram-2.6.0 b/metadata/md5-cache/dev-libs/kdiagram-2.6.0
index 6f59b0b78aef..85f232d96754 100644
--- a/metadata/md5-cache/dev-libs/kdiagram-2.6.0
+++ b/metadata/md5-cache/dev-libs/kdiagram-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiagram/2.6.0/src/kdiagram-2.6.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=045b1f72125faa0aa03cb4d863d0ea0d
diff --git a/metadata/md5-cache/dev-libs/kirigami-1.1.0 b/metadata/md5-cache/dev-libs/kirigami-1.1.0
index daff35deb190..c079b3175a61 100644
--- a/metadata/md5-cache/dev-libs/kirigami-1.1.0
+++ b/metadata/md5-cache/dev-libs/kirigami-1.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 plasma? ( >=kde-frameworks/plasma-5.29.0 ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=1
 SRC_URI=mirror://kde/stable/kirigami/kirigami-1.1.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f5f203b2c9b733d46d063d9a8d12ea54
diff --git a/metadata/md5-cache/dev-libs/kirigami-2.1.0 b/metadata/md5-cache/dev-libs/kirigami-2.1.0
index 3f4c40698bbe..51ab23cc0793 100644
--- a/metadata/md5-cache/dev-libs/kirigami-2.1.0
+++ b/metadata/md5-cache/dev-libs/kirigami-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtquickco
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://kde/stable/kirigami/kirigami2-2.1.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4c093e6792b9ad94ec915da406341ce0
diff --git a/metadata/md5-cache/dev-libs/kproperty-3.0.0 b/metadata/md5-cache/dev-libs/kproperty-3.0.0
index 513102202df1..edc6822e36ae 100644
--- a/metadata/md5-cache/dev-libs/kproperty-3.0.0
+++ b/metadata/md5-cache/dev-libs/kproperty-3.0.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kproperty/src/kproperty-3.0.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f1ffaba5f13133d80e32cc899d5aea32
diff --git a/metadata/md5-cache/dev-libs/kproperty-3.0.1 b/metadata/md5-cache/dev-libs/kproperty-3.0.1
index d98608a7f42b..238c245b54b0 100644
--- a/metadata/md5-cache/dev-libs/kproperty-3.0.1
+++ b/metadata/md5-cache/dev-libs/kproperty-3.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kproperty/src/kproperty-3.0.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d02fde6657414e867306deebdc2e63a6
diff --git a/metadata/md5-cache/dev-libs/kreport-3.0.0-r1 b/metadata/md5-cache/dev-libs/kreport-3.0.0-r1
index 10405d4bc21d..b1ea58f8f86d 100644
--- a/metadata/md5-cache/dev-libs/kreport-3.0.0-r1
+++ b/metadata/md5-cache/dev-libs/kreport-3.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/kproperty marble? ( >=kde-apps/marble-14.12.0:5= ) scripting? ( >=dev-qt/qtdeclarative-5.6.1:5 ) webkit? ( >=dev-qt/qtwebkit-5.6.1:5 ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kreport/src/kreport-3.0.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b29cd9be34b877f2551f8aa0a760a4da
diff --git a/metadata/md5-cache/dev-libs/kreport-3.0.1 b/metadata/md5-cache/dev-libs/kreport-3.0.1
index 948f84d5416e..21d478fb94cc 100644
--- a/metadata/md5-cache/dev-libs/kreport-3.0.1
+++ b/metadata/md5-cache/dev-libs/kreport-3.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/kproperty marble? ( >=kde-apps/marble-14.12.0:5= ) scripting? ( >=dev-qt/qtdeclarative-5.6.1:5 ) webkit? ( >=dev-qt/qtwebkit-5.6.1:5 ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kreport/src/kreport-3.0.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=208b836d0bf22c50607a4fba293843ea
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.11.2 b/metadata/md5-cache/dev-libs/liborcus-0.11.2
index d556202cb809..cefb89301b71 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.11.2
+++ b/metadata/md5-cache/dev-libs/liborcus-0.11.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( >=dev-libs/libixion-0.11.1:= ) >=dev-util/mdds-1.2.0:1
+DEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( =dev-libs/libixion-0.11*:= ) >=dev-util/mdds-1.2.0:1
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=6
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
 IUSE=python +spreadsheet-model static-libs tools python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=MIT
-RDEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( >=dev-libs/libixion-0.11.1:= )
+RDEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( =dev-libs/libixion-0.11*:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0/0.11
 SRC_URI=http://kohei.us/files/orcus/src/liborcus-0.11.2.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=654798eb615ed930d1af1cc37592e2a6
+_md5_=9b87aed8fe35140de3c942346586102a
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.12.1 b/metadata/md5-cache/dev-libs/liborcus-0.12.1
index fc7e37920785..6159def19e23 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.12.1
+++ b/metadata/md5-cache/dev-libs/liborcus-0.12.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( >=dev-libs/libixion-0.12.1:= ) >=dev-util/mdds-1.2.2:1
+DEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( =dev-libs/libixion-0.12*:= ) >=dev-util/mdds-1.2.2:1
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=6
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
 IUSE=python +spreadsheet-model static-libs tools python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=MIT
-RDEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( >=dev-libs/libixion-0.12.1:= )
+RDEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( =dev-libs/libixion-0.12*:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0/0.12
 SRC_URI=http://kohei.us/files/orcus/src/liborcus-0.12.1.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=01af93d83f21545b4169d18b136e48f0
+_md5_=219c28e5ccd72c6e0f30d57f11b91122
diff --git a/metadata/md5-cache/dev-libs/libprelude-3.0.0 b/metadata/md5-cache/dev-libs/libprelude-3.0.0
index 2cf927ddeb35..02db83dcd41b 100644
--- a/metadata/md5-cache/dev-libs/libprelude-3.0.0
+++ b/metadata/md5-cache/dev-libs/libprelude-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls perl? ( dev-lang/perl virtual/perl
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/3.0.0/libprelude-3.0.0.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
 _md5_=6f6af324e5073b68c414d0679f601bd5
diff --git a/metadata/md5-cache/dev-libs/libprelude-3.1.0-r1 b/metadata/md5-cache/dev-libs/libprelude-3.1.0-r1
index 7ecd31214d15..399572bc6313 100644
--- a/metadata/md5-cache/dev-libs/libprelude-3.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libprelude-3.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= perl? ( dev-lang/perl:= virtual/
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/3.1.0/libprelude-3.1.0.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
 _md5_=fa232bbc845c87072dbbbe2dc2b573f9
diff --git a/metadata/md5-cache/dev-libs/libsolv-0.6.22 b/metadata/md5-cache/dev-libs/libsolv-0.6.22
index d5bdede2ce82..ecbd96f4f82f 100644
--- a/metadata/md5-cache/dev-libs/libsolv-0.6.22
+++ b/metadata/md5-cache/dev-libs/libsolv-0.6.22
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=https://github.com/openSUSE/libsolv/archive/0.6.22.tar.gz -> libsolv-0.6.22.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ab21352c2c337bcf89ee63d6e4474408
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.10-r2 b/metadata/md5-cache/dev-libs/libtasn1-4.10-r2
index ca1520c41df1..83950613a146 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.10-r2
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.10-r2
@@ -4,10 +4,10 @@ DESCRIPTION=ASN.1 library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libtasn1/
 IUSE=doc static-libs valgrind abi_x86_32 abi_x86_64 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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=valgrind? ( dev-util/valgrind ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r16 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.10.tar.gz
 _eclasses_=libtool	e32ea84bf82cf8987965b574672dba93	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=bb779c4358930472a99dabaf16530611
+_md5_=0da242d8d354087e0052f90941e281fa
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.11 b/metadata/md5-cache/dev-libs/libtasn1-4.11-r1
similarity index 96%
rename from metadata/md5-cache/dev-libs/libtasn1-4.11
rename to metadata/md5-cache/dev-libs/libtasn1-4.11-r1
index 22625c34b152..78317562ee74 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.11
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.11-r1
@@ -7,7 +7,7 @@ IUSE=doc static-libs valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=valgrind? ( dev-util/valgrind ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r16 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-SLOT=0/6
+SLOT=0/7
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.11.tar.gz
 _eclasses_=libtool	e32ea84bf82cf8987965b574672dba93	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=a79089cbb42e468800cd86517e8b42e0
+_md5_=229dc4a9836f4ed9c4f7cef58705779d
diff --git a/metadata/md5-cache/dev-libs/lzo-2.08 b/metadata/md5-cache/dev-libs/lzo-2.08
deleted file mode 100644
index 257708cfd126..000000000000
--- a/metadata/md5-cache/dev-libs/lzo-2.08
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=An extremely fast compression and decompression library
-EAPI=5
-HOMEPAGE=http://www.oberhumer.com/opensource/lzo/
-IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
-SLOT=2
-SRC_URI=http://www.oberhumer.com/opensource/lzo/download/lzo-2.08.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=d17c4644afd38d0843624003a42d2ee3
diff --git a/metadata/md5-cache/dev-libs/purpose-1.1-r1 b/metadata/md5-cache/dev-libs/purpose-1.1-r1
index 36ba4081213c..a3e5f4793510 100644
--- a/metadata/md5-cache/dev-libs/purpose-1.1-r1
+++ b/metadata/md5-cache/dev-libs/purpose-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/purpose/purpose-1.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=53d994320bcbb18d7e1e5526bb5ae563
diff --git a/metadata/md5-cache/dev-libs/sink-0.1.0 b/metadata/md5-cache/dev-libs/sink-0.1.0
index d1a85fa6a228..1f6261dda87d 100644
--- a/metadata/md5-cache/dev-libs/sink-0.1.0
+++ b/metadata/md5-cache/dev-libs/sink-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kmime-14.12.0:5 >=dev-qt/qtgui
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/sink/0.1.0/src/sink-0.1.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e81647e69c649de8fff9b38d64612bf8
diff --git a/metadata/md5-cache/dev-perl/AnyEvent-I3-0.160.0 b/metadata/md5-cache/dev-perl/AnyEvent-I3-0.160.0
deleted file mode 100644
index 2c83e0fc46fb..000000000000
--- a/metadata/md5-cache/dev-perl/AnyEvent-I3-0.160.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/AnyEvent dev-perl/JSON-XS virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
-DESCRIPTION=Communicate with the i3 window manager
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/AnyEvent-I3/
-KEYWORDS=amd64 ~arm x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/AnyEvent dev-perl/JSON-XS dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSTPLBG/AnyEvent-I3-0.16.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=e3ba3120c7c5004df9ba19df5cc704f6
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.190.0-r1 b/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.190.0-r1
deleted file mode 100644
index c2d9e8f3659e..000000000000
--- a/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.190.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/ExtUtils-Depends-0.302 virtual/perl-parent dev-lang/perl:=[-build(-)]
-DESCRIPTION=Wrap OP check callbacks
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/B-Hooks-OP-Check/
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-parent dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/B-Hooks-OP-Check-0.19.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=0b885c86790d22703d0e07f5f72fcc1b
diff --git a/metadata/md5-cache/dev-perl/Clone-0.390.0 b/metadata/md5-cache/dev-perl/Clone-0.390.0
index b7d39f71bb24..58be9f46de61 100644
--- a/metadata/md5-cache/dev-perl/Clone-0.390.0
+++ b/metadata/md5-cache/dev-perl/Clone-0.390.0
@@ -4,10 +4,10 @@ DESCRIPTION=Recursively copy Perl datatypes
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Clone/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GARU/Clone-0.39.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=5f96e65bd5a9f37b9d3db9bfa62fd467
+_md5_=67d90edf9f46b2cae3aef88dc2b375c5
diff --git a/metadata/md5-cache/dev-perl/Context-Preserve-0.10.0-r1 b/metadata/md5-cache/dev-perl/Context-Preserve-0.10.0-r1
deleted file mode 100644
index d7638f7c83f7..000000000000
--- a/metadata/md5-cache/dev-perl/Context-Preserve-0.10.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/Test-Exception >=virtual/perl-Test-Simple-1.1.10 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Return chained, modified values from subs, without losing context
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Context-Preserve/
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~ppc-aix ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JR/JROCKWAY/Context-Preserve-0.01.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=14d48b6012bc64ad41664a0af8e8c7fb
diff --git a/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.20.0-r1 b/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.20.0-r1
deleted file mode 100644
index c77d419a6351..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.20.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Less indentation and newlines plus sub deparsing
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Data-Dumper-Concise/
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~ppc-aix ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FR/FREW/Data-Dumper-Concise-2.020.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=422c2391feac1795067fa0c77b633b11
diff --git a/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.22.0 b/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.22.0
deleted file mode 100644
index 11016b09b942..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.22.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.590.0 dev-lang/perl:=
-DESCRIPTION=Less indentation and newlines plus sub deparsing
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Data-Dumper-Concise/
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~ppc-aix ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FR/FREW/Data-Dumper-Concise-2.022.tar.gz
-_eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=6c3d7b51948d6f6fd87f2c939648a614
diff --git a/metadata/md5-cache/dev-perl/Devel-Cover-1.230.0 b/metadata/md5-cache/dev-perl/Devel-Cover-1.230.0
deleted file mode 100644
index 7ed7aed8b301..000000000000
--- a/metadata/md5-cache/dev-perl/Devel-Cover-1.230.0
+++ /dev/null
@@ -1,13 +0,0 @@
-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.23.tar.gz
-_eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=39ea85c1516cb99678a6814a2a99484e
diff --git a/metadata/md5-cache/dev-perl/Devel-Cover-1.230.0-r1 b/metadata/md5-cache/dev-perl/Devel-Cover-1.230.0-r1
deleted file mode 100644
index 582fc02c0de2..000000000000
--- a/metadata/md5-cache/dev-perl/Devel-Cover-1.230.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-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=minimal test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Storable !minimal? ( dev-perl/Browser-Open dev-perl/Capture-Tiny dev-perl/Class-XSAccessor virtual/perl-JSON-PP dev-perl/Moo dev-perl/Parallel-Iterator >=dev-perl/Pod-Coverage-0.60.0 >=dev-perl/PPI-HTML-1.70.0 >=dev-perl/Template-Toolkit-2.0.0 dev-perl/Test-Differences dev-perl/namespace-clean >=dev-perl/Perl-Tidy-20060719.0.0 ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PJ/PJCJ/Devel-Cover-1.23.tar.gz
-_eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=d8b178c461c08634e46f626e7fc1cf5a
diff --git a/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0 b/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0
index 118b60191f8b..b60517dbba0b 100644
--- a/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0
+++ b/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Get home directory for self or other user
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/File-HomeDir/
 IUSE=+xdg test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-File-Path-2.10.0 >=virtual/perl-File-Spec-3 >=virtual/perl-File-Temp-0.190.0 >=dev-perl/File-Which-0.50.0 xdg? ( x11-misc/xdg-user-dirs ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.002.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=132450982ee14c40d3d7444e811e729d
+_md5_=e2abd5d35ede0a027f1ec9c72059a441
diff --git a/metadata/md5-cache/dev-perl/GD-2.660.0 b/metadata/md5-cache/dev-perl/GD-2.660.0
index ac59d3a4c94a..ff598a0c9be1 100644
--- a/metadata/md5-cache/dev-perl/GD-2.660.0
+++ b/metadata/md5-cache/dev-perl/GD-2.660.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/gd-2.2.3 png? ( media-libs/gd[png] media-libs/libpng:0 sys-libs/zlib ) jpeg? ( media-libs/gd[jpeg] virtual/jpeg:0 ) truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) fcgi? ( dev-libs/fcgi ) gif? ( media-libs/giflib ) >=virtual/perl-ExtUtils-Constant-0.230.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DEPEND=>=media-libs/gd-2.2.3 png? ( media-libs/gd[png] media-libs/libpng:0 sys-libs/zlib ) jpeg? ( media-libs/gd[jpeg] virtual/jpeg:0 ) truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) fcgi? ( dev-libs/fcgi ) gif? ( media-libs/giflib ) >=virtual/perl-ExtUtils-Constant-0.230.0 dev-perl/ExtUtils-PkgConfig virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Interface to Thomas Boutell's gd library
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/GD/
@@ -10,4 +10,4 @@ RDEPEND=>=media-libs/gd-2.2.3 png? ( media-libs/gd[png] media-libs/libpng:0 sys-
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/GD-2.66.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=de52f59e28eb7f9c1fb9819f98c396d3
+_md5_=de5e3b29dd7ad4280ff75286eeee44ac
diff --git a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.460.0-r1 b/metadata/md5-cache/dev-perl/GnuPG-Interface-0.460.0-r1
deleted file mode 100644
index ad1b23b0e20f..000000000000
--- a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.460.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-crypt/gnupg-1.2.1-r1 >=virtual/perl-Math-BigInt-1.78 dev-perl/Any-Moose dev-lang/perl:=[-build(-)]
-DESCRIPTION=GnuPG::Interface is a Perl module interface to interacting with GnuPG
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/GnuPG-Interface/
-KEYWORDS=amd64 hppa ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=app-crypt/gnupg-1.2.1-r1 >=virtual/perl-Math-BigInt-1.78 dev-perl/Any-Moose dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.46.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=996dbca5ad105fea5a3955ba3d4ced83
diff --git a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r2 b/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r2
new file mode 100644
index 000000000000..544a01b0c56a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-crypt/gnupg-1.2.1-r1 virtual/perl-autodie >=virtual/perl-Math-BigInt-1.780.0 >=dev-perl/Moo-0.91.11 >=dev-perl/MooX-HandlesVia-0.1.4 >=dev-perl/MooX-late-0.14.0 >=virtual/perl-ExtUtils-MakeMaker-6.360.0 dev-lang/perl:=
+DESCRIPTION=Perl module interface to interacting with GnuPG
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/GnuPG-Interface/
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=app-crypt/gnupg-1.2.1-r1 virtual/perl-autodie >=virtual/perl-Math-BigInt-1.780.0 >=dev-perl/Moo-0.91.11 >=dev-perl/MooX-HandlesVia-0.1.4 >=dev-perl/MooX-late-0.14.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.52.tar.gz
+_eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=8322001ea7707603d4412ad1d2af0ef0
diff --git a/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15 b/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
index b3a2f3fd19e7..fcfc6ff9f7f2 100644
--- a/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
+++ b/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
@@ -4,10 +4,10 @@ DESCRIPTION=Generate Recursive-Descent Parsers
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Parse-RecDescent/
 IUSE=test examples
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Text-Balanced-1.950.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=b655d77f82a1d6f5e2ef227427d3cd92
+_md5_=2a6c68bec726a683f07f04d6dc4b5680
diff --git a/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0 b/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0
index b7e01d2e65c1..4d14905f3b35 100644
--- a/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0
+++ b/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0
@@ -4,10 +4,10 @@ DESCRIPTION=Apparently run a function in a higher stack frame
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Sub-Uplevel/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2800.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=a3f7f66120166f177b129ad6cc15d748
+_md5_=82acac478164d56926822b0047747ec6
diff --git a/metadata/md5-cache/dev-perl/Text-CSV-1.940.0 b/metadata/md5-cache/dev-perl/Text-CSV-1.940.0
index 43c8b5f83f44..fb1c0fdaa941 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV-1.940.0
+++ b/metadata/md5-cache/dev-perl/Text-CSV-1.940.0
@@ -4,10 +4,10 @@ DESCRIPTION=Manipulate comma-separated value strings
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Text-CSV/
 IUSE=test +xs
-KEYWORDS=alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=xs? ( >=dev-perl/Text-CSV_XS-1.20.0 ) virtual/perl-IO dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.94.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=8e07c817973e38ca8e88d9acf6024014
+_md5_=5057efb1349d974f380ca92af7f434e3
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0 b/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
index 7ab664452be9..9834fec6a76e 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
@@ -4,10 +4,10 @@ DESCRIPTION=Base class SAX Drivers and Filters
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-SAX-Base/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/XML-SAX-0.990.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=503b433cbf74a8a449edca502ad6f57b
+_md5_=105b2734b9f77dbfc9cb810f23e83c20
diff --git a/metadata/md5-cache/dev-perl/YAML-LibYAML-0.640.0 b/metadata/md5-cache/dev-perl/YAML-LibYAML-0.640.0
index f58c3a901d22..bcebb1314798 100644
--- a/metadata/md5-cache/dev-perl/YAML-LibYAML-0.640.0
+++ b/metadata/md5-cache/dev-perl/YAML-LibYAML-0.640.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Perl YAML Serialization using XS and libyaml
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/YAML-LibYAML/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.64.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=8c8c6aed86ab8180b2d2149fbd698324
+_md5_=36ed09d596967dcaf79a55bd7a9cf324
diff --git a/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0 b/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
index d0b1423ff58c..5d549e7c0be5 100644
--- a/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
+++ b/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Fast, lightweight YAML loader and dumper
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/YAML-Syck/
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.30.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=5cc09fdd87d69b7fcdfeded9bd7b0088
+_md5_=e1762645a5decc27ba620bc6f74379f4
diff --git a/metadata/md5-cache/dev-php/File_Iterator-1.3.1 b/metadata/md5-cache/dev-php/File_Iterator-1.3.1
deleted file mode 100644
index ffd8955b0491..000000000000
--- a/metadata/md5-cache/dev-php/File_Iterator-1.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php >=dev-php/pear-1.9.0
-DESCRIPTION=FilterIterator implementation that filters files based on a list of suffixes
-EAPI=4
-HOMEPAGE=http://www.phpunit.de
-KEYWORDS=amd64 hppa x86
-LICENSE=BSD
-RDEPEND=dev-lang/php >=dev-php/pear-1.9.0
-SLOT=0
-SRC_URI=http://pear.phpunit.de/get/File_Iterator-1.3.1.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-lib-r1	01ef764388da73bc8c11774543b6ca37	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=967c788926afcd3035d77f9b79ced0de
diff --git a/metadata/md5-cache/dev-php/File_Iterator-1.3.4 b/metadata/md5-cache/dev-php/File_Iterator-1.3.4
index 5a8b80f57e7e..5d9506d7ff00 100644
--- a/metadata/md5-cache/dev-php/File_Iterator-1.3.4
+++ b/metadata/md5-cache/dev-php/File_Iterator-1.3.4
@@ -1,12 +1,11 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php >=dev-php/pear-1.9.0
+DEFINED_PHASES=install postinst postrm
 DESCRIPTION=FilterIterator implementation that filters files based on a list of suffixes
-EAPI=4
+EAPI=6
 HOMEPAGE=https://github.com/sebastianbergmann/php-file-iterator
 KEYWORDS=amd64 hppa x86
 LICENSE=BSD
-RDEPEND=dev-lang/php >=dev-php/pear-1.9.0
+RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
-SRC_URI=http://pear.phpunit.de/get/File_Iterator-1.3.4.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-lib-r1	01ef764388da73bc8c11774543b6ca37	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=8b22a9c12d273415bbcdc5d7d058f7d4
+SRC_URI=http:///get/File_Iterator-1.3.4.tgz
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
+_md5_=ac0f59fe38806c7c12ddf2436d6e8cc3
diff --git a/metadata/md5-cache/dev-php/PEAR-Auth_SASL-1.1.0 b/metadata/md5-cache/dev-php/PEAR-Auth_SASL-1.1.0
index 834cd91b22fc..50238fd56a33 100644
--- a/metadata/md5-cache/dev-php/PEAR-Auth_SASL-1.1.0
+++ b/metadata/md5-cache/dev-php/PEAR-Auth_SASL-1.1.0
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Auth_SASL-1.1.0.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=23d030e2cb16ab7bae034c9684502ed4
diff --git a/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.0-r1 b/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.0-r1
index 19c16f714679..4b46072b50b7 100644
--- a/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.0-r1
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Console_Table-1.3.0.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=b5be22e955c108b23665f0a10d31a289
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_Javascript-1.1.2-r1 b/metadata/md5-cache/dev-php/PEAR-HTML_Javascript-1.1.2-r1
index 463bf49be1b1..b922bd988aed 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_Javascript-1.1.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_Javascript-1.1.2-r1
@@ -7,5 +7,5 @@ LICENSE=PHP-3
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTML_Javascript-1.1.2.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=b8da8580b4212b912293814b2d144ae7
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_Template_Flexy-1.3.13 b/metadata/md5-cache/dev-php/PEAR-HTML_Template_Flexy-1.3.13
index e2b185de37d4..070479e9c92c 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_Template_Flexy-1.3.13
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_Template_Flexy-1.3.13
@@ -8,5 +8,5 @@ LICENSE=PHP-2.02
 RDEPEND=!minimal? ( >=dev-php/PEAR-HTML_Javascript-1.1.0-r1 dev-php/PEAR-File_Gettext ) >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTML_Template_Flexy-1.3.13.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=b1e198211c2f95859f7cbe952e41d930
diff --git a/metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r1 b/metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r1
index ea434d504fb3..18113956dd2a 100644
--- a/metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r1
+++ b/metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r1
@@ -9,5 +9,5 @@ PDEPEND=mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_beta4 ) mysql? ( >=dev-p
 RDEPEND=>=dev-php/PEAR-PEAR-1.9.1 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/MDB2-2.5.0b5.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=884de604a074b1f6cd639a3f7675c850
diff --git a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1 b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1
index 61c451a65173..fc4d9ff88d06 100644
--- a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1
+++ b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-MDB2-2.5.0_beta3 dev-lang/php:*[mssql] >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/MDB2_Driver_mssql-1.5.0b4.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=f1390fb683741b1fb1987ed65661f5a1
diff --git a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta4-r1 b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta4-r1
index fd4cd08d5d98..88fc200e74d5 100644
--- a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta4-r1
+++ b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta4-r1
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-MDB2-2.5.0_beta3 <dev-lang/php-7:*[mysql] >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/MDB2_Driver_mysql-1.5.0b4.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=93b1719ecb03b2e9e50f0c0eb09f8434
diff --git a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1 b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1
index a8c978f4f72b..01507e882311 100644
--- a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1
+++ b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-MDB2-2.5.0_beta3 dev-lang/php:*[mysqli(-)] >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/MDB2_Driver_mysqli-1.5.0b4.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=5b5e9f8954809de5cdda91a3b3af8357
diff --git a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1 b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1
index 730d028909cd..310445d37b31 100644
--- a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1
+++ b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-MDB2-2.5.0_beta3 dev-lang/php:*[oci8-instant-client(-)] >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/MDB2_Driver_oci8-1.5.0b4.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=2ba88e34c073981a3bd029a4378a68c9
diff --git a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1 b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1
index 858598804ff2..4d3a06ed3bec 100644
--- a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1
+++ b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-MDB2-2.5.0_beta3 dev-lang/php:*[postgres(-)] >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/MDB2_Driver_pgsql-1.5.0b4.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=1809a415346cb51cae758fcc20d4d980
diff --git a/metadata/md5-cache/dev-php/PEAR-Mail-1.4.1 b/metadata/md5-cache/dev-php/PEAR-Mail-1.4.1
index 8796639262f7..dc65ae969a12 100644
--- a/metadata/md5-cache/dev-php/PEAR-Mail-1.4.1
+++ b/metadata/md5-cache/dev-php/PEAR-Mail-1.4.1
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-Net_SMTP-1.4.1 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Mail-1.4.1.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=fa38c5dd579658fe5b39640a1c5ed824
diff --git a/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.1 b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.1
index 7fdcbaea5f08..80656ed769cb 100644
--- a/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.1
+++ b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Mail_Mime-1.10.1.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=7334f9977790ac6924fd811f1d07f69e
diff --git a/metadata/md5-cache/dev-php/PEAR-Mail_mimeDecode-1.5.6-r1 b/metadata/md5-cache/dev-php/PEAR-Mail_mimeDecode-1.5.6-r1
index cc26d1df3a0a..977461fb7f68 100644
--- a/metadata/md5-cache/dev-php/PEAR-Mail_mimeDecode-1.5.6-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Mail_mimeDecode-1.5.6-r1
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-Mail_Mime-1.5.2 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Mail_mimeDecode-1.5.6.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=c2d0698f9406c4fc2c7859b256dcc4a2
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.4.3 b/metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.4.3
index e3dd163f7dd9..67cf815f85c0 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.4.3
+++ b/metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.4.3
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[sockets] >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Net_DNS2-1.4.3.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=f59bf8287116690fac1db089f2fc7b79
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_IDNA2-0.2.0 b/metadata/md5-cache/dev-php/PEAR-Net_IDNA2-0.2.0
index a9eba72f9696..d767d96f6eba 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_IDNA2-0.2.0
+++ b/metadata/md5-cache/dev-php/PEAR-Net_IDNA2-0.2.0
@@ -7,5 +7,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Net_IDNA2-0.2.0.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=9e52d4b5add1d4dada0043aeb7c45d9b
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.1.0 b/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.1.0
index e20617c86a46..9dc1db68077d 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.1.0
+++ b/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.1.0
@@ -7,5 +7,5 @@ LICENSE=PHP-3.01
 RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Net_Socket-1.1.0.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=3655864b91c4ee2b9ff383540a83ce96
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.2.2 b/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.2.2
index ad15503d4a0f..e439b5fe02a2 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.2.2
+++ b/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.2.2
@@ -7,5 +7,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Net_Socket-1.2.2.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=1a7d2f4c8c00abef808d98ba4d7a8fd2
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_URL2-2.2.1-r2 b/metadata/md5-cache/dev-php/PEAR-Net_URL2-2.2.1-r2
index f29200a9c396..7558334ec5a7 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_URL2-2.2.1-r2
+++ b/metadata/md5-cache/dev-php/PEAR-Net_URL2-2.2.1-r2
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Net_URL2-2.2.1.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=4ef09a9c9dd0b3d62f71c92a8a8da1fd
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager-1.7.2-r1 b/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager-1.7.2-r1
index 82dd0f25a4a8..8c2e07b510bc 100644
--- a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager-1.7.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager-1.7.2-r1
@@ -8,5 +8,5 @@ LICENSE=PHP-3.01
 RDEPEND=>=dev-lang/php-5.3:* >=dev-php/PEAR-PEAR-1.10.1 dev-php/PEAR-PEAR_PackageFileManager2 dev-php/PEAR-PEAR_PackageFileManager_Plugins !minimal? ( >=dev-php/PEAR-PHP_CompatInfo-1.4.0 ) >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/PEAR_PackageFileManager-1.7.2.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=7cb49fbdb6a956c86996ecae65d54c8e
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager2-1.0.4-r1 b/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager2-1.0.4-r1
index 97411822dcfa..9e28a1875dd4 100644
--- a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager2-1.0.4-r1
+++ b/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager2-1.0.4-r1
@@ -8,5 +8,5 @@ LICENSE=PHP-3.01
 RDEPEND=>=dev-lang/php-5.3:* >=dev-php/PEAR-PEAR-1.10.1 dev-php/PEAR-PEAR_PackageFileManager_Plugins !minimal? ( >=dev-php/PEAR-PHP_CompatInfo-1.4.0 ) >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/PEAR_PackageFileManager2-1.0.4.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=7205d5a8d1ae7d3c53e2e104355c573f
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1 b/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1
index f742049d8b27..17068c8f039e 100644
--- a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1
+++ b/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1
@@ -7,5 +7,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/PEAR-XML_Serializer-0.19.0 >=dev-lang/php-5.3:*[xml,simplexml] >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/PEAR_PackageFileManager_Plugins-1.0.4.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=71317eba4096a569fd3ce878bd6351a1
diff --git a/metadata/md5-cache/dev-php/PEAR-Pager-2.4.9-r1 b/metadata/md5-cache/dev-php/PEAR-Pager-2.4.9-r1
index e78fc1681949..3754bea4e7fa 100644
--- a/metadata/md5-cache/dev-php/PEAR-Pager-2.4.9-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Pager-2.4.9-r1
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Pager-2.4.9.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=f2d22543712ea40d9e0bc2a92e91b581
diff --git a/metadata/md5-cache/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.4 b/metadata/md5-cache/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.4
index 36668bfc50ab..f1cc80997538 100644
--- a/metadata/md5-cache/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.4
+++ b/metadata/md5-cache/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.4
@@ -7,5 +7,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/php-5.4:*[iconv] >=dev-php/PEAR-OLE-0.5-r1 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Spreadsheet_Excel_Writer-0.9.4.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=b6fb3d4112f828f9ee11c372a4f1fb6b
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_CAPTCHA-1.0.2-r1 b/metadata/md5-cache/dev-php/PEAR-Text_CAPTCHA-1.0.2-r1
index 081b0a2d15d1..2c6033d9ae22 100644
--- a/metadata/md5-cache/dev-php/PEAR-Text_CAPTCHA-1.0.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Text_CAPTCHA-1.0.2-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[gd,truetype] >=dev-php/PEAR-Text_Password-1.1.1 !minimal? ( dev-php/PEAR-Numbers_Words dev-php/PEAR-Text_Figlet >=dev-php/PEAR-Image_Text-0.7.0 ) >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Text_CAPTCHA-1.0.2.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=fec53b7a04dd5da071f24ba36fc0b6a4
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Highlighter-0.8.0 b/metadata/md5-cache/dev-php/PEAR-Text_Highlighter-0.8.0
index c96e81a94f19..9575322eb138 100644
--- a/metadata/md5-cache/dev-php/PEAR-Text_Highlighter-0.8.0
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Highlighter-0.8.0
@@ -7,5 +7,5 @@ LICENSE=PHP-3.01
 RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 dev-php/PEAR-XML_Serializer >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Text_Highlighter-0.8.0.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=d0de43a38cda5f44f0e421f819b297cc
diff --git a/metadata/md5-cache/dev-php/PEAR-Var_Dump-1.0.4-r3 b/metadata/md5-cache/dev-php/PEAR-Var_Dump-1.0.4-r3
index c50fcf6e41e8..85efdb8b9ae7 100644
--- a/metadata/md5-cache/dev-php/PEAR-Var_Dump-1.0.4-r3
+++ b/metadata/md5-cache/dev-php/PEAR-Var_Dump-1.0.4-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-php/pear-1.8.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pear.php.net/get/Var_Dump-1.0.4.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=02b5fbb419ef21434c3df1528f43148a
diff --git a/metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0 b/metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0
index 282e063518ae..901367d29d55 100644
--- a/metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0
+++ b/metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0
@@ -7,5 +7,5 @@ LICENSE=PHP-3.01
 RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 dev-php/PEAR-XML_Parser >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/XML_RSS-1.1.0.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=44157a37ee88f500924e96a0de9e7daa
diff --git a/metadata/md5-cache/dev-php/PEAR-XML_Serializer-0.21.0-r1 b/metadata/md5-cache/dev-php/PEAR-XML_Serializer-0.21.0-r1
index 9c3ca72e87ba..be674a7127ed 100644
--- a/metadata/md5-cache/dev-php/PEAR-XML_Serializer-0.21.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-XML_Serializer-0.21.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/php:*[xml] >=dev-php/PEAR-XML_Parser-1.2.7 >=dev-php/PEAR-XML_Util-1.1.1-r1 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/XML_Serializer-0.21.0.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
 _md5_=cd02b985731e118c0b366d38d35c39c0
diff --git a/metadata/md5-cache/dev-php/PHP_CodeCoverage-1.2.13 b/metadata/md5-cache/dev-php/PHP_CodeCoverage-1.2.13
index 1365584e8812..148ddd85c77b 100644
--- a/metadata/md5-cache/dev-php/PHP_CodeCoverage-1.2.13
+++ b/metadata/md5-cache/dev-php/PHP_CodeCoverage-1.2.13
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install setup
-DEPEND=>=dev-php/pear-1.9.4 dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=Provides collection, processing, and rendering functionality for PHP code coverage information
-EAPI=5
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-php/pear-1.9.4
+DESCRIPTION=Collection, processing, and rendering for PHP code coverage
+EAPI=6
 HOMEPAGE=http://pear.phpunit.de
 KEYWORDS=amd64 hppa x86
 LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.9.4 >=dev-php/File_Iterator-1.3.0 >=dev-php/PHP_TokenStream-1.1.3 >=dev-php/Text_Template-1.1.1 dev-lang/php:* >=dev-php/pear-1.8.1
+RDEPEND=>=dev-php/pear-1.9.4 >=dev-php/File_Iterator-1.3.0 >=dev-php/PHP_TokenStream-1.1.3 >=dev-php/Text_Template-1.1.1 >=dev-php/pear-1.8.1
 SLOT=0
-SRC_URI=http://pear.phpunit.de/get/PHP_CodeCoverage-1.2.13.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r1	5ed7690006b53587145608c30ed10798	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=2cb623be1446fb0c2b3bec16a9b87d67
+SRC_URI=http:///get/PHP_CodeCoverage-1.2.13.tgz
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
+_md5_=d71408183084dbfc7bed97434d11be08
diff --git a/metadata/md5-cache/dev-php/PHP_Timer-1.0.5 b/metadata/md5-cache/dev-php/PHP_Timer-1.0.5
index c3f6ee3c1682..480b1b74f5e3 100644
--- a/metadata/md5-cache/dev-php/PHP_Timer-1.0.5
+++ b/metadata/md5-cache/dev-php/PHP_Timer-1.0.5
@@ -1,12 +1,11 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.9.0
+DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Utility class for timing
-EAPI=5
+EAPI=6
 HOMEPAGE=http://pear.phpunit.de/
 KEYWORDS=amd64 hppa x86
 LICENSE=BSD
-RDEPEND=dev-lang/php:* >=dev-php/pear-1.9.0
+RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
-SRC_URI=http://pear.phpunit.de/get/PHP_Timer-1.0.5.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-lib-r1	01ef764388da73bc8c11774543b6ca37	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=c4d61bb07e6a237abd689cb59e988796
+SRC_URI=http:///get/PHP_Timer-1.0.5.tgz
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
+_md5_=dd605e96e2bd3255ebeb63e945765b78
diff --git a/metadata/md5-cache/dev-php/PHP_TokenStream-1.1.3 b/metadata/md5-cache/dev-php/PHP_TokenStream-1.1.3
index dd98f024a409..9a7f3b022375 100644
--- a/metadata/md5-cache/dev-php/PHP_TokenStream-1.1.3
+++ b/metadata/md5-cache/dev-php/PHP_TokenStream-1.1.3
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php[tokenizer] >=dev-php/pear-1.9.4 dev-lang/php >=dev-php/pear-1.8.1
+DEFINED_PHASES=install postinst postrm
+DEPEND=dev-lang/php:*[tokenizer] >=dev-php/pear-1.9.4
 DESCRIPTION=Wrapper around PHP's tokenizer extension
-EAPI=4
+EAPI=6
 HOMEPAGE=http://pear.phpunit.de
 KEYWORDS=amd64 hppa x86
 LICENSE=BSD
-RDEPEND=dev-lang/php[tokenizer] >=dev-php/pear-1.9.4 dev-lang/php >=dev-php/pear-1.8.1
+RDEPEND=dev-lang/php:*[tokenizer] >=dev-php/pear-1.9.4 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=http://pear.phpunit.de/get/PHP_TokenStream-1.1.3.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r1	5ed7690006b53587145608c30ed10798	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=3f94181b54d39d9f01284a20b7ccf5d2
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
+_md5_=6ac741a654922b358d145b37bd0f6559
diff --git a/metadata/md5-cache/dev-php/Text_Template-1.1.1 b/metadata/md5-cache/dev-php/Text_Template-1.1.1
index 0f8989d9ca42..e159a81620f7 100644
--- a/metadata/md5-cache/dev-php/Text_Template-1.1.1
+++ b/metadata/md5-cache/dev-php/Text_Template-1.1.1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install setup
-DEPEND=>=dev-php/pear-1.9.4 dev-lang/php >=dev-php/pear-1.9.0
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-php/pear-1.9.4
 DESCRIPTION=Simple template engine
-EAPI=4
+EAPI=6
 HOMEPAGE=http://pear.phpunit.de
 KEYWORDS=amd64 hppa x86
 LICENSE=BSD
-RDEPEND=dev-lang/php >=dev-php/pear-1.9.0
+RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
-SRC_URI=http://pear.phpunit.de/get/Text_Template-1.1.1.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-lib-r1	01ef764388da73bc8c11774543b6ca37	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=2f35a0b95a6d5430d5862694ca1fdd88
+SRC_URI=http:///get/Text_Template-1.1.1.tgz
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
+_md5_=d85a605679182b93bb811a8b6c163282
diff --git a/metadata/md5-cache/dev-php/YAML-1.0.6-r1 b/metadata/md5-cache/dev-php/YAML-1.0.6-r1
deleted file mode 100644
index f372f868dcc3..000000000000
--- a/metadata/md5-cache/dev-php/YAML-1.0.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.9.0
-DESCRIPTION=The Symfony YAML Component
-EAPI=5
-HOMEPAGE=http://pear.symfony-project.com/
-KEYWORDS=amd64 hppa x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* >=dev-php/pear-1.9.0
-SLOT=0
-SRC_URI=http://pear.symfony-project.com/get/YAML-1.0.6.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-lib-r1	01ef764388da73bc8c11774543b6ca37	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=20eb9affff664c64cffe2e5d29862b21
diff --git a/metadata/md5-cache/dev-php/YAML-1.0.6-r2 b/metadata/md5-cache/dev-php/YAML-1.0.6-r3
similarity index 65%
rename from metadata/md5-cache/dev-php/YAML-1.0.6-r2
rename to metadata/md5-cache/dev-php/YAML-1.0.6-r3
index cadf64bfa205..b6403ef48767 100644
--- a/metadata/md5-cache/dev-php/YAML-1.0.6-r2
+++ b/metadata/md5-cache/dev-php/YAML-1.0.6-r3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=The Symfony YAML Component
 EAPI=6
 HOMEPAGE=http://pear.symfony-project.com/
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=amd64 hppa x86
 LICENSE=MIT
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=http://pear.symfony-project.com/get/YAML-1.0.6.tgz
-_eclasses_=php-pear-r2	6566af3a3c4392595873a44415abe0ff
-_md5_=ed7ffa43b7714a8cec4b6d45759ebdd4
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
+_md5_=ccefb3986461ac59b6b3af3186283868
diff --git a/metadata/md5-cache/dev-php/adodb-5.20.9 b/metadata/md5-cache/dev-php/adodb-5.20.9
index 96520abbc784..835aaab961ad 100644
--- a/metadata/md5-cache/dev-php/adodb-5.20.9
+++ b/metadata/md5-cache/dev-php/adodb-5.20.9
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD LGPL-2.1
 RDEPEND=dev-lang/php:*
 SLOT=0
-SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.20.9.tar.gz
-_md5_=5b6718beedc9f05f76755ca2dbd6519d
+SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.20.9.tar.gz -> adodb-5.20.9.tar.gz
+_md5_=8b153c7c8dcc5468bd742f0bc9219181
diff --git a/metadata/md5-cache/dev-php/mockery-0.9.0 b/metadata/md5-cache/dev-php/mockery-0.9.0
deleted file mode 100644
index 7ca097ffd7da..000000000000
--- a/metadata/md5-cache/dev-php/mockery-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.9.0
-DESCRIPTION=Simple yet flexible PHP mock object framework for use in unit testing
-EAPI=5
-HOMEPAGE=https://github.com/padraic/mockery
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:* >=dev-php/pear-1.9.0
-SLOT=0
-SRC_URI=http://pear.survivethedeepend.com/get/Mockery-0.9.0.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-lib-r1	01ef764388da73bc8c11774543b6ca37	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=96ec11ba49f86daa42687259afd48b26
diff --git a/metadata/md5-cache/dev-php/mockery-0.9.0-r1 b/metadata/md5-cache/dev-php/mockery-0.9.0-r1
new file mode 100644
index 000000000000..5d68d31f282b
--- /dev/null
+++ b/metadata/md5-cache/dev-php/mockery-0.9.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=Simple yet flexible PHP mock object framework for use in unit testing
+EAPI=6
+HOMEPAGE=https://github.com/padraic/mockery
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=http:///get/Mockery-0.9.0.tgz
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
+_md5_=dc93f92f30c41c5e7c7d8e06406b7cd2
diff --git a/metadata/md5-cache/dev-php/php-codebrowser-1.0.2 b/metadata/md5-cache/dev-php/php-codebrowser-1.0.2
deleted file mode 100644
index f56ecdf81127..000000000000
--- a/metadata/md5-cache/dev-php/php-codebrowser-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php >=dev-php/pear-1.9.0
-DESCRIPTION=Generates a highlighted code browsing parsed from xml reports generated from codesniffer or phpunit
-EAPI=4
-HOMEPAGE=http://pear.phpunit.de
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-php/PEAR-Console_CommandLine-1.1.3 >=dev-php/File_Iterator-1.3.0 >=dev-php/PEAR-Log-1.12.1 dev-lang/php >=dev-php/pear-1.9.0
-SLOT=0
-SRC_URI=http://pear.phpunit.de/get/PHP_CodeBrowser-1.0.2.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-lib-r1	01ef764388da73bc8c11774543b6ca37	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=ce0b1ae4c0c9b87c212d89db8c9c60a6
diff --git a/metadata/md5-cache/dev-php/php-codebrowser-1.0.2-r1 b/metadata/md5-cache/dev-php/php-codebrowser-1.0.2-r1
new file mode 100644
index 000000000000..d3151f96bb9b
--- /dev/null
+++ b/metadata/md5-cache/dev-php/php-codebrowser-1.0.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm prepare
+DESCRIPTION=Creates highlighted code by reading xml reports from codesniffer or phpunit
+EAPI=6
+HOMEPAGE=http://pear.phpunit.de
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-php/PEAR-Console_CommandLine-1.1.3 >=dev-php/File_Iterator-1.3.0 >=dev-php/PEAR-Log-1.12.1 >=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=http:///get/PHP_CodeBrowser-1.0.2.tgz
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
+_md5_=6d939c10a08e964b406431b8fc7d8824
diff --git a/metadata/md5-cache/dev-php/phpDocumentor-2.3.0 b/metadata/md5-cache/dev-php/phpDocumentor-2.3.0
deleted file mode 100644
index 3db5e9fa6be3..000000000000
--- a/metadata/md5-cache/dev-php/phpDocumentor-2.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=!dev-php/PEAR-PhpDocumentor dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=The phpDocumentor package provides automatic documenting of php api directly from the source
-EAPI=5
-HOMEPAGE=http://pear.phpdoc.org/phpDocumentor
-IUSE=doc
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=media-gfx/graphviz dev-lang/php[iconv,intl,xslt] dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.phpdoc.org/get/phpDocumentor-2.3.0.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r1	5ed7690006b53587145608c30ed10798	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=9b6f816219e90978daa26374a70122d0
diff --git a/metadata/md5-cache/dev-php/phpDocumentor-2.7.0 b/metadata/md5-cache/dev-php/phpDocumentor-2.7.0
index 534e24fdf049..81a97398144f 100644
--- a/metadata/md5-cache/dev-php/phpDocumentor-2.7.0
+++ b/metadata/md5-cache/dev-php/phpDocumentor-2.7.0
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install setup
-DEPEND=!dev-php/PEAR-PhpDocumentor dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=The phpDocumentor package provides automatic documenting of php api directly from the source
-EAPI=5
-HOMEPAGE=http://pear.phpdoc.org/phpDocumentor
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=!dev-php/PEAR-PhpDocumentor
+DESCRIPTION=Automatic documenting of php api directly from the source
+EAPI=6
+HOMEPAGE=https://pear.phpdoc.org/package/phpDocumentor
 IUSE=doc
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=media-gfx/graphviz dev-lang/php[iconv,intl,xmlreader,xslt] dev-lang/php:* >=dev-php/pear-1.8.1
+RDEPEND=media-gfx/graphviz dev-lang/php:*[iconv,intl,xmlreader,xslt] >=dev-php/pear-1.8.1
 SLOT=0
-SRC_URI=http://pear.phpdoc.org/get/phpDocumentor-2.7.0.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r1	5ed7690006b53587145608c30ed10798	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=ab47aeb9d1b6f3bbb765c6a85dbd1232
+SRC_URI=http:///get/phpDocumentor-2.7.0.tgz
+_eclasses_=php-pear-r2	b2a1a4ee3c7dbd9ef3b77f199aa75f84
+_md5_=be8dc56ab28cf557f06d8f0b370f9195
diff --git a/metadata/md5-cache/dev-php/phpDocumentor-2.8.2 b/metadata/md5-cache/dev-php/phpDocumentor-2.8.2
index 95e6194f6950..e4f4494baa99 100644
--- a/metadata/md5-cache/dev-php/phpDocumentor-2.8.2
+++ b/metadata/md5-cache/dev-php/phpDocumentor-2.8.2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install unpack
 DEPEND=!dev-php/PEAR-PhpDocumentor
-DESCRIPTION=The phpDocumentor package provides automatic documenting of php api directly from the source
-EAPI=5
+DESCRIPTION=Automatic documenting of php api directly from the source
+EAPI=6
 HOMEPAGE=http://phpdoc.org
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=media-gfx/graphviz dev-lang/php:*[cli,iconv,intl,phar,xmlreader,xslt]
 SLOT=0
 SRC_URI=https://github.com/phpDocumentor/phpDocumentor2/releases/download/v2.8.2/phpDocumentor.phar -> phpDocumentor-2.8.2.phar
-_md5_=69445d9bb438709fcc4c773cf489799e
+_md5_=f9b1d31bf90f5a0af4856840cf8a073f
diff --git a/metadata/md5-cache/dev-python/audioread-1.0.1 b/metadata/md5-cache/dev-python/audioread-1.0.1
deleted file mode 100644
index 50292fddf739..000000000000
--- a/metadata/md5-cache/dev-python/audioread-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Module for decoding audio files using whichever backend is available
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/audioread
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=|| ( dev-python/gst-python:0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pymad media-video/ffmpeg ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/a/audioread/audioread-1.0.1.tar.gz
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=5b9200648561208be07fb5354409a0c9
diff --git a/metadata/md5-cache/dev-python/audioread-1.0.1-r1 b/metadata/md5-cache/dev-python/audioread-1.0.1-r1
new file mode 100644
index 000000000000..c87765f281dc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/audioread-1.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Module for decoding audio files using whichever backend is available
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/audioread
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( dev-python/pymad media-video/ffmpeg ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/a/audioread/audioread-1.0.1.tar.gz
+_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=95fea858163e138380c55a1ee3033212
diff --git a/metadata/md5-cache/dev-python/autopep8-1.3.2 b/metadata/md5-cache/dev-python/autopep8-1.3.2
new file mode 100644
index 000000000000..680e3f1a1381
--- /dev/null
+++ b/metadata/md5-cache/dev-python/autopep8-1.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pep8-1.5.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycodestyle-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pydiff-0.1.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Automatically formats Python code to conform to the PEP 8 style guide
+EAPI=6
+HOMEPAGE=https://github.com/hhatto/autopep8 https://pypi.python.org/pypi/autopep8
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/pep8-1.5.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycodestyle-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/a/autopep8/autopep8-1.3.2.tar.gz
+_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=2d68bcf3aae52fe99514b7200907a086
diff --git a/metadata/md5-cache/dev-python/bluelet-0.2.0 b/metadata/md5-cache/dev-python/bluelet-0.2.0
index 5f6158516338..b9f103cbe0d7 100644
--- a/metadata/md5-cache/dev-python/bluelet-0.2.0
+++ b/metadata/md5-cache/dev-python/bluelet-0.2.0
@@ -1,14 +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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Module for pure Python asynchronous I/O using coroutines
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/bluelet
-IUSE=examples python_targets_python2_7 python_targets_python3_4
+IUSE=examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/sampsyo/bluelet/archive/v0.2.0.tar.gz -> bluelet-0.2.0.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a1a5982d09b49f44fdd495886075ce4f
+_md5_=106f248dbe716c033358f9bb1089a5f5
diff --git a/metadata/md5-cache/dev-python/configclass-0.1.0 b/metadata/md5-cache/dev-python/configclass-0.1.0
index 61829435ec62..fe7bf4a6b002 100644
--- a/metadata/md5-cache/dev-python/configclass-0.1.0
+++ b/metadata/md5-cache/dev-python/configclass-0.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A Python to class to hold configuration values
 EAPI=5
 HOMEPAGE=https://github.com/schettino72/configclass/
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/mergedict-0.2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=>=dev-python/mergedict-0.2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configclass/configclass-0.1.0.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a36b404be47c34b7b866a343ad6d1eaf
+_md5_=83a6df8523ba2e50dc4ed9cf7e4413f4
diff --git a/metadata/md5-cache/dev-python/cryptography-1.8.1 b/metadata/md5-cache/dev-python/cryptography-1.8.1
index 1a8d87e71331..190eab579f2b 100644
--- a/metadata/md5-cache/dev-python/cryptography-1.8.1
+++ b/metadata/md5-cache/dev-python/cryptography-1.8.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( ~dev-python/cryptography-vectors-1.8.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/hypothesis[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/iso8601[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=!libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( ~dev-python/cryptography-vectors-1.8.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/hypothesis[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/iso8601[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=6
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
 IUSE=libressl test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~x86
 LICENSE=|| ( Apache-2.0 BSD )
-RDEPEND=!libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=!libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-1.8.1.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b5ad147b1bccfb546f817c179db2e1a4
+_md5_=c627cd9cf34edd6ea237a37adc2d0f0a
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.16.7 b/metadata/md5-cache/dev-python/dbusmock-0.16.7
new file mode 100644
index 000000000000..db8b2bd851ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dbusmock-0.16.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Easily create mock objects on D-Bus for software testing
+EAPI=6
+HOMEPAGE=https://github.com/martinpitt/python-dbusmock
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=LGPL-3+
+RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-dbusmock/python-dbusmock-0.16.7.tar.gz -> dbusmock-0.16.7.tar.gz
+_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=565722e379974553e74ff7d3687a6d3a
diff --git a/metadata/md5-cache/dev-python/docker-py-2.0.1 b/metadata/md5-cache/dev-python/docker-py-2.0.1
deleted file mode 100644
index 256421afd8dd..000000000000
--- a/metadata/md5-cache/dev-python/docker-py-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/docker-pycreds-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.9.1[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(-)] ) doc? ( dev-python/recommonmark[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.4.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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=Python client for Docker
-EAPI=6
-HOMEPAGE=https://github.com/docker/docker-py
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/docker-pycreds-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[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_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/docker/docker-py/archive/2.0.1.tar.gz -> docker-py-2.0.1.tar.gz
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b2e42c357e5812d6958bbb7fed2c3088
diff --git a/metadata/md5-cache/dev-python/docker-py-2.0.2 b/metadata/md5-cache/dev-python/docker-py-2.0.2
deleted file mode 100644
index aa848e549e69..000000000000
--- a/metadata/md5-cache/dev-python/docker-py-2.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/docker-pycreds-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.9.1[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(-)] ) doc? ( dev-python/recommonmark[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.4.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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=Python client for Docker
-EAPI=6
-HOMEPAGE=https://github.com/docker/docker-py
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/docker-pycreds-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[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_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/docker/docker-py/archive/2.0.2.tar.gz -> docker-py-2.0.2.tar.gz
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4a6897323ab8dce8936234d49be36cdc
diff --git a/metadata/md5-cache/dev-python/doit-0.27.0 b/metadata/md5-cache/dev-python/doit-0.27.0
deleted file mode 100644
index df1542121c06..000000000000
--- a/metadata/md5-cache/dev-python/doit-0.27.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pyinotify[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Automation tool
-EAPI=5
-HOMEPAGE=http://python-doit.sourceforge.net/ https://pypi.python.org/pypi/doit
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/pyinotify[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/d/doit/doit-0.27.0.tar.gz
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0d919c100eea6265df70657dc7f3af4d
diff --git a/metadata/md5-cache/dev-python/doit-0.28.0 b/metadata/md5-cache/dev-python/doit-0.28.0
deleted file mode 100644
index fbc8a4f71b63..000000000000
--- a/metadata/md5-cache/dev-python/doit-0.28.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pyinotify[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/doit-py-0.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyflakes[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Automation tool
-EAPI=5
-HOMEPAGE=http://python-doit.sourceforge.net/ https://pypi.python.org/pypi/doit
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pyinotify[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/doit-py-0.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/d/doit/doit-0.28.0.tar.gz
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=70af59ae8ad10664cb7c326835285d7e
diff --git a/metadata/md5-cache/dev-python/doit-0.29.0 b/metadata/md5-cache/dev-python/doit-0.29.0
index c51546db89d7..8bff22ad558e 100644
--- a/metadata/md5-cache/dev-python/doit-0.29.0
+++ b/metadata/md5-cache/dev-python/doit-0.29.0
@@ -1,15 +1,16 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pyinotify[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/doit-py-0.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyflakes[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/cloudpickle[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=test? ( dev-python/cloudpickle[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinotify[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyflakes[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Automation tool
 EAPI=5
 HOMEPAGE=http://python-doit.sourceforge.net/ https://pypi.python.org/pypi/doit
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4
+IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/pyinotify[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/doit-py-0.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
+PDEPEND=>=dev-python/doit-py-0.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/cloudpickle[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinotify[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/doit/doit-0.29.0.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=76c584182ac8819a04cd704ed332bfde
+_md5_=4f8b6f49080c1b22227dd98b48504b2d
diff --git a/metadata/md5-cache/dev-python/doit-py-0.3.0 b/metadata/md5-cache/dev-python/doit-py-0.3.0
deleted file mode 100644
index a626df9978c0..000000000000
--- a/metadata/md5-cache/dev-python/doit-py-0.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=doit tasks for python stuff
-EAPI=5
-HOMEPAGE=http://pythonhosted.org/doit-py
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/python-pathlib[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/doit[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/configclass[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/d/doit-py/doit-py-0.3.0.tar.gz
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=667a144ee901725f9ec8456065fa4ce8
diff --git a/metadata/md5-cache/dev-python/doit-py-0.4.0 b/metadata/md5-cache/dev-python/doit-py-0.4.0
index 75d720776458..801f6fc0a6f8 100644
--- a/metadata/md5-cache/dev-python/doit-py-0.4.0
+++ b/metadata/md5-cache/dev-python/doit-py-0.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-text/hunspell ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pyflakes[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/hunspell ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=doit tasks for python stuff
 EAPI=5
 HOMEPAGE=http://pythonhosted.org/doit-py
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4
+IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=virtual/python-pathlib[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/doit[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/configclass[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=virtual/python-pathlib[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/doit[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configclass[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/doit-py/doit-py-0.4.0.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=eb8d1b76076ea66ece35c509e0e26220
+_md5_=2532923afc23f54df0bf202eff20643f
diff --git a/metadata/md5-cache/dev-python/jenkins-autojobs-0.14.3 b/metadata/md5-cache/dev-python/jenkins-autojobs-0.14.3
index d2fe4e7c90d2..532d3bd3079d 100644
--- a/metadata/md5-cache/dev-python/jenkins-autojobs-0.14.3
+++ b/metadata/md5-cache/dev-python/jenkins-autojobs-0.14.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >dev-python/jenkins-webapi-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-3.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/jenkins-bin net-analyzer/netcat dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/sphinx-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/alabaster-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >dev-python/jenkins-webapi-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/jenkins-bin net-analyzer/netcat dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/sphinx-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/alabaster-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Scripts for automatically creating Jenkins jobs from scm branches
 EAPI=5
 HOMEPAGE=https://github.com/gvalkov/jenkins-autojobs
-IUSE=doc test python_targets_python2_7 python_targets_python3_4
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>dev-python/jenkins-webapi-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-3.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=>dev-python/jenkins-webapi-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/gvalkov/jenkins-autojobs/archive/v0.14.3.tar.gz -> jenkins-autojobs-0.14.3.tar.gz http://updates.jenkins-ci.org/download/plugins/mercurial/1.41/mercurial.hpi -> jenkins-autojobs-0.14.3_mercurial_1.41.hpi http://updates.jenkins-ci.org/download/plugins/git/1.1.21/git.hpi -> jenkins-autojobs-0.14.3_git_1.1.21.hpi
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d85ca55a4c4b838da7a28f20a9eb4154
+_md5_=5c8ec209479b9d68d4f641a26b3ab6c8
diff --git a/metadata/md5-cache/dev-python/jenkins-webapi-0.5.0 b/metadata/md5-cache/dev-python/jenkins-webapi-0.5.0
index c363ee419e10..a8db941c260a 100644
--- a/metadata/md5-cache/dev-python/jenkins-webapi-0.5.0
+++ b/metadata/md5-cache/dev-python/jenkins-webapi-0.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/requests-2.7.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] net-analyzer/netcat net-misc/curl app-arch/unzip >=virtual/jre-1.7.0 >=dev-python/pytest-2.6.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/termcolor-1.1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-cov-1.8.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httmock-1.2.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >=dev-python/sphinx-1.2.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/alabaster-0.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/requests-2.7.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-analyzer/netcat net-misc/curl app-arch/unzip >=virtual/jre-1.7.0 >=dev-python/pytest-2.6.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/termcolor-1.1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-cov-1.8.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/httmock-1.2.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/sphinx-1.2.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/alabaster-0.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Module for interacting with the Jenkins CI server
 EAPI=5
 HOMEPAGE=https://github.com/gvalkov/jenkins-webapi
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/requests-2.7.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=>=dev-python/requests-2.7.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/gvalkov/jenkins-webapi/archive/v0.5.0.tar.gz -> jenkins-webapi-0.5.0.tar.gz test? ( http://mirrors.jenkins-ci.org/war-stable/1.596.3/jenkins.war -> jenkins-1.596.3.war )
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=08323ebc3432647c7f137f766151bb00
+_md5_=ecf053f484fc81277fcd7036f1e6817b
diff --git a/metadata/md5-cache/dev-python/libasyncns-python-0.7.1-r1 b/metadata/md5-cache/dev-python/libasyncns-python-0.7.1-r1
index e7d36add3afb..d68119477c1e 100644
--- a/metadata/md5-cache/dev-python/libasyncns-python-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/libasyncns-python-0.7.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/libasyncns-0.4 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=>=net-libs/libasyncns-0.4 python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python bindings for libasyncns
 EAPI=5
 HOMEPAGE=https://launchpad.net/libasyncns-python/
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=net-libs/libasyncns-0.4 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=>=net-libs/libasyncns-0.4 python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://launchpad.net/libasyncns-python/trunk/0.7.1/+download/libasyncns-python-0.7.1.tar.bz2
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8ce356c3928adfb19a6ac12fd6c39811
+_md5_=38c6280523f710f3afa0b4514970a0d8
diff --git a/metadata/md5-cache/dev-python/maintboot-0.1.0 b/metadata/md5-cache/dev-python/maintboot-0.1.0
index 63ec52cacb3c..fdbc8343940e 100644
--- a/metadata/md5-cache/dev-python/maintboot-0.1.0
+++ b/metadata/md5-cache/dev-python/maintboot-0.1.0
@@ -1,14 +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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Run maintenance tasks outside the OS
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/maintboot
-IUSE=python_targets_python2_7 python_targets_python3_4
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/maintboot/maintboot-0.1.0.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c55351e148af8411c1dac78f1b9901fa
+_md5_=e7c41000fdb96ee2fb4512df2f7940eb
diff --git a/metadata/md5-cache/dev-python/mergedict-0.2.0 b/metadata/md5-cache/dev-python/mergedict-0.2.0
index 6e4d7a09d27f..566b61291142 100644
--- a/metadata/md5-cache/dev-python/mergedict-0.2.0
+++ b/metadata/md5-cache/dev-python/mergedict-0.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A Python 'dict' with a merge() method
 EAPI=5
 HOMEPAGE=https://github.com/schettino72/mergedict/
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mergedict/mergedict-0.2.0.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=50accaf9d0d856554be24a118507c25c
+_md5_=d348c4d8001e870bbef1f231bc1e2b90
diff --git a/metadata/md5-cache/dev-python/neovim-python-client-0.1.13 b/metadata/md5-cache/dev-python/neovim-python-client-0.1.13
index a848c23d80e8..920ac9c9a6cb 100644
--- a/metadata/md5-cache/dev-python/neovim-python-client-0.1.13
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.1.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/trollius[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_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(-)]
+DEPEND=>=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.1.6 dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python client for Neovim
 EAPI=6
 HOMEPAGE=https://github.com/neovim/python-client
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.1.6 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 )
+RDEPEND=>=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.1.6 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/neovim/python-client/archive/0.1.13.tar.gz -> neovim-python-client-0.1.13.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c6a911fbacd27a0a66e86a8395f093a6
+_md5_=7369467cea05b94073e550fd1b361ad0
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6
deleted file mode 100644
index 8196ed77fbeb..000000000000
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] media-libs/sdl2-mixer media-libs/sdl2-ttf virtual/jpeg:62 dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Reimplementation of portions of the pygame API using SDL2
-EAPI=5
-HOMEPAGE=https://github.com/renpy/pygame_sdl2
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 ZLIB
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] media-libs/sdl2-mixer media-libs/sdl2-ttf virtual/jpeg:62 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=http://www.renpy.org/dl/6.99.6/pygame_sdl2-for-renpy-6.99.6.tar.bz2
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=32e7644cf79dcbc31a691f2f9af66194
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1
index 19364fa04504..e39017a657c9 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] media-libs/sdl2-mixer media-libs/sdl2-ttf virtual/jpeg:62 dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] media-libs/sdl2-mixer media-libs/sdl2-ttf virtual/jpeg:62 dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Reimplementation of portions of the pygame API using SDL2
 EAPI=6
 HOMEPAGE=https://github.com/renpy/pygame_sdl2
-IUSE=python_targets_python2_7 python_targets_python3_4
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 ZLIB
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] media-libs/sdl2-mixer media-libs/sdl2-ttf virtual/jpeg:62 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] media-libs/sdl2-mixer media-libs/sdl2-ttf virtual/jpeg:62 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.renpy.org/dl/6.99.6/pygame_sdl2-for-renpy-6.99.6.tar.bz2
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2cb8e747525c18bfe98f019ab8ff7b21
+_md5_=f389e92774036fdef4f82ca983e83ff2
diff --git a/metadata/md5-cache/dev-python/pytest-3.0.2 b/metadata/md5-cache/dev-python/pytest-3.0.2
deleted file mode 100644
index 0e2642fafd3a..000000000000
--- a/metadata/md5-cache/dev-python/pytest-3.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/py-1.4.29[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/hypothesis[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Simple powerful testing with Python
-EAPI=5
-HOMEPAGE=http://pytest.org/ https://pypi.python.org/pypi/pytest
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/py-1.4.29[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !dev-python/logilab-common python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest/pytest-3.0.2.tar.gz
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7a42172e1ee46262c1e13c1ebfa95ed7
diff --git a/metadata/md5-cache/dev-python/pytest-3.0.3 b/metadata/md5-cache/dev-python/pytest-3.0.3
index 9cb1345673f3..20a5d2e5c276 100644
--- a/metadata/md5-cache/dev-python/pytest-3.0.3
+++ b/metadata/md5-cache/dev-python/pytest-3.0.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-3.0.3.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=932d662bbd27e5c0f15b7fee8956385b
+_md5_=ab957a993654cc3b8744737902f7dc24
diff --git a/metadata/md5-cache/dev-python/pytest-3.0.6 b/metadata/md5-cache/dev-python/pytest-3.0.6
index 944601d07320..df7380a8b8d5 100644
--- a/metadata/md5-cache/dev-python/pytest-3.0.6
+++ b/metadata/md5-cache/dev-python/pytest-3.0.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-3.0.6.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=19b5268ba0a9d736cd37177c80c550c3
+_md5_=cf7f544eb94987771b0e0c634be9c607
diff --git a/metadata/md5-cache/dev-python/pytest-3.0.7 b/metadata/md5-cache/dev-python/pytest-3.0.7
index 0d385f26521e..c9e9a43e86c1 100644
--- a/metadata/md5-cache/dev-python/pytest-3.0.7
+++ b/metadata/md5-cache/dev-python/pytest-3.0.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-3.0.7.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=aa749a85b21e5a7aac73b1af4c55573a
+_md5_=0e92416ce1d6f623dd0b7a9b5ffa0bed
diff --git a/metadata/md5-cache/dev-python/pytest-9999 b/metadata/md5-cache/dev-python/pytest-9999
deleted file mode 100644
index 20470e834c30..000000000000
--- a/metadata/md5-cache/dev-python/pytest-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/py-1.4.29[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pexpect[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/sphinx-1.2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/regendoc[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
-DESCRIPTION=simple powerful testing with Python
-EAPI=6
-HOMEPAGE=http://pytest.org/ https://pypi.python.org/pypi/pytest
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=MIT
-RDEPEND=>=dev-python/py-1.4.29[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	git-r3	cbafa3261c37c7e3af44bb16a34ea390	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=52537964b854eed85fec5edb6dd78005
diff --git a/metadata/md5-cache/dev-python/pythonmagick-0.9.17 b/metadata/md5-cache/dev-python/pythonmagick-0.9.17
new file mode 100644
index 000000000000..e61c7271090d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pythonmagick-0.9.17
@@ -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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/boost-1.48[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-gfx/imagemagick-6.9.1 virtual/pkgconfig >=app-portage/elt-patches-20170317
+DESCRIPTION=Python bindings for ImageMagick
+EAPI=6
+HOMEPAGE=http://www.imagemagick.org/script/api.php
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/boost-1.48[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-gfx/imagemagick-6.9.1
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://imagemagick/python/PythonMagick-0.9.17.tar.xz
+_eclasses_=libtool	e32ea84bf82cf8987965b574672dba93	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=d8e69cc0479ee0e80f3620e5f7082a45
diff --git a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2 b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
index 0b1051e68c68..15afc131df0d 100644
--- a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
+++ b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/georuby-2.5.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=32818597e5acb98ae9eebb8816d35bdf
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.3 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.3
index 3a2f5bc98024..91d71e0a570e 100644
--- a/metadata/md5-cache/dev-ruby/RubyInline-3.12.3
+++ b/metadata/md5-cache/dev-ruby/RubyInline-3.12.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/zentest[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/RubyInline-3.12.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5bdcbcf01bb7a463327d6dc2f7b8c709
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.4 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.4
index 255c10eec173..51645922eb83 100644
--- a/metadata/md5-cache/dev-ruby/RubyInline-3.12.4
+++ b/metadata/md5-cache/dev-ruby/RubyInline-3.12.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/zentest[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/RubyInline-3.12.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0326eebd3dc16026421031e464b23489
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
index bafd2cf763f2..aa9ecab4a142 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/abstract-1.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c8824a1a87d1ce82bde7f74018f56b90
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.0.0.1 b/metadata/md5-cache/dev-ruby/actioncable-5.0.0.1
index 5669804d7a69..b0c783d426af 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.0.0.1
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.0.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.0.1.tar.gz -> rails-5.0.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5545550066888b71d389f743c61dcc99
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.0.1 b/metadata/md5-cache/dev-ruby/actioncable-5.0.1
index 1ed12ca0ff2e..04434d03d8fe 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.0.1
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.1.tar.gz -> rails-5.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b6cb32b6a36edbdde14adefcee94c16c
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.0.2 b/metadata/md5-cache/dev-ruby/actioncable-5.0.2
index 51ede07a3558..f4116cd06a94 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.0.2
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.2.tar.gz -> rails-5.0.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fee5b4721d780d185a26a91a077fedab
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.0.3 b/metadata/md5-cache/dev-ruby/actioncable-5.0.3
index b9456f020556..0fb26e58a375 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.0.3
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6e5a2449086df0f68abef4ffa6718e96
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.1.1 b/metadata/md5-cache/dev-ruby/actioncable-5.1.1
index 5b0929a64e0f..435c281e56ac 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.1.1
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=406ebd84888920ebbc857e720f3bc528
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.2.7.1 b/metadata/md5-cache/dev-ruby/actionmailer-4.2.7.1
index 30c93cd0a7bc..381584ffee46 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.2.7.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.2.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/actionpack-4.2.7.1[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.7.1.tar.gz -> rails-4.2.7.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7b79235abc62999f622a44b9e424c425
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.2.8 b/metadata/md5-cache/dev-ruby/actionmailer-4.2.8
index 11071cde2a6a..6caefd5acf43 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.2.8
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.2.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby21] ~
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0ba6573ca60258f9b95a74373cdcaa51
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.0.0.1 b/metadata/md5-cache/dev-ruby/actionmailer-5.0.0.1
index 069c16608ec8..1054a307ce64 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.0.0.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.0.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.0.0.1[ruby_targets_ruby22]
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.0.1.tar.gz -> rails-5.0.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dac57d6ee246c985bd20e2b942aaadf8
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.0.1 b/metadata/md5-cache/dev-ruby/actionmailer-5.0.1
index 251b91557dd7..b60324babebd 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.0.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.0.1[ruby_targets_ruby22] ~
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.1.tar.gz -> rails-5.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=af663e0f72bf03d9c29626774294ec6f
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.0.2 b/metadata/md5-cache/dev-ruby/actionmailer-5.0.2
index ea2d8a4f0ccf..bd61b0730f6c 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.0.2
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.0.2[ruby_targets_ruby22] ~
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.2.tar.gz -> rails-5.0.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=af663e0f72bf03d9c29626774294ec6f
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.0.3 b/metadata/md5-cache/dev-ruby/actionmailer-5.0.3
index ec512d2253f3..bc398c2963ff 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.0.3
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.0.3[ruby_targets_ruby22] ~
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b2daf8aad96ef6ad98532173cfe5952a
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.1.1 b/metadata/md5-cache/dev-ruby/actionmailer-5.1.1
index 9ca506d7e2ec..3263d10d6895 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.1.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.1[ruby_targets_ruby22] ~
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b2daf8aad96ef6ad98532173cfe5952a
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.2.7.1 b/metadata/md5-cache/dev-ruby/actionpack-4.2.7.1
index 76bf70a84326..865cd2363ce2 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.2.7.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.2.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.7.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.7.1.tar.gz -> rails-4.2.7.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6402d04a6ddee80be30981b1d2a655a1
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.2.8 b/metadata/md5-cache/dev-ruby/actionpack-4.2.8
index 1e2cf84c0bce..235436ddb56a 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.2.8
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.2.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3c667b7043cd51952ccf0a717947d59b
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.0.0.1 b/metadata/md5-cache/dev-ruby/actionpack-5.0.0.1
index 278eb43ab274..7a5ed33044c1 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.0.0.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.0.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.0.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.0.1.tar.gz -> rails-5.0.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d27e2b983be89829ec22e3d6bf9f5977
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.0.1 b/metadata/md5-cache/dev-ruby/actionpack-5.0.1
index 55e121288e45..b18c44f43d5a 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.0.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.1[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.1.tar.gz -> rails-5.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8688b40a7c51830f61666f2d71e1bcc2
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.0.2 b/metadata/md5-cache/dev-ruby/actionpack-5.0.2
index a06047e8d423..afdbc5bfed0a 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.0.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.2[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.2.tar.gz -> rails-5.0.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8688b40a7c51830f61666f2d71e1bcc2
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.0.3 b/metadata/md5-cache/dev-ruby/actionpack-5.0.3
index 8df7aaf441fc..7d0516af4901 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.0.3
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.3[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe98da076f524451becf9b1681eab91c
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.1.1 b/metadata/md5-cache/dev-ruby/actionpack-5.1.1
index a81d658e6514..9aebab12de39 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.1.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.1[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe98da076f524451becf9b1681eab91c
diff --git a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.1.1 b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.1.1
index 2754f82a24c6..e085a165eb4a 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.1.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/actionpack-action_caching-1.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4f1799d207ce00b6e5577f0c3ea74416
diff --git a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.0 b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.0
index dc8b2e186a48..ab4bb210daa4 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.0
+++ b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/actionpack-action_caching-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dd75666c678b6544fec313183d3af1a5
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-1.0.2 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-1.0.2
index 7f21764ccd20..0e40036aa509 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-1.0.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v1.0.2.tar.gz -> actionpack-xml_parser-1.0.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=52427845c180dbc079ba84d1150e67ab
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.0 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.0
index bd20ed0b86c0..82380c08a42d 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.0
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( =dev-ruby/actionpack-5*:*[ruby_targets_ruby22] =d
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v2.0.0.tar.gz -> actionpack-xml_parser-2.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c95ca0f2c3b462df4891d0b3e9879caa
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
index 62e258de2857..573936ad1617 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( =dev-ruby/actionpack-5*:*[ruby_targets_ruby22] =d
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v2.0.1.tar.gz -> actionpack-xml_parser-2.0.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a30f81ac9fb4c125392311321cf81a99
diff --git a/metadata/md5-cache/dev-ruby/actionview-4.2.7.1 b/metadata/md5-cache/dev-ruby/actionview-4.2.7.1
index 2fe87e069557..34d267526e0f 100644
--- a/metadata/md5-cache/dev-ruby/actionview-4.2.7.1
+++ b/metadata/md5-cache/dev-ruby/actionview-4.2.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.7.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.7.1.tar.gz -> rails-4.2.7.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7051f9750f4d3cff1e2936d072c104c8
diff --git a/metadata/md5-cache/dev-ruby/actionview-4.2.8 b/metadata/md5-cache/dev-ruby/actionview-4.2.8
index 095f707e2f77..a2ae5a3e555e 100644
--- a/metadata/md5-cache/dev-ruby/actionview-4.2.8
+++ b/metadata/md5-cache/dev-ruby/actionview-4.2.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=aaa56cc60519bc179f53048175a06aa9
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.0.0.1 b/metadata/md5-cache/dev-ruby/actionview-5.0.0.1
index 66984fa3291b..c7b34c770c33 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.0.0.1
+++ b/metadata/md5-cache/dev-ruby/actionview-5.0.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.0.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.0.1.tar.gz -> rails-5.0.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=97c07b167e511b976e268a4fcbdb4851
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.0.1 b/metadata/md5-cache/dev-ruby/actionview-5.0.1
index e3a65a5bbdce..915f4496cbd6 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.0.1
+++ b/metadata/md5-cache/dev-ruby/actionview-5.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.1[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.1.tar.gz -> rails-5.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e2db8bdf487a58433187a2633a2f3583
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.0.2 b/metadata/md5-cache/dev-ruby/actionview-5.0.2
index 462ae9ef079e..52222214be35 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.0.2
+++ b/metadata/md5-cache/dev-ruby/actionview-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.2[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.2.tar.gz -> rails-5.0.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9e054dd2e9374b52421e2676287fe6b7
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.0.3 b/metadata/md5-cache/dev-ruby/actionview-5.0.3
index a0e63ae6029f..7823cdbf8344 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.0.3
+++ b/metadata/md5-cache/dev-ruby/actionview-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.3[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0b1f641f2728966dfa032f36e93c8385
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.1.1 b/metadata/md5-cache/dev-ruby/actionview-5.1.1
index 61dbcdd1800d..b5ea0a1c1ca7 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.1.1
+++ b/metadata/md5-cache/dev-ruby/actionview-5.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.1[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=981fe237c93fb2ec5555bda2ecbac810
diff --git a/metadata/md5-cache/dev-ruby/activejob-4.2.7.1 b/metadata/md5-cache/dev-ruby/activejob-4.2.7.1
index 9ba5d68eda3d..1f8467685315 100644
--- a/metadata/md5-cache/dev-ruby/activejob-4.2.7.1
+++ b/metadata/md5-cache/dev-ruby/activejob-4.2.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.7.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.7.1.tar.gz -> rails-4.2.7.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0f40ad2196c15a250117d50bb9b10857
diff --git a/metadata/md5-cache/dev-ruby/activejob-4.2.8 b/metadata/md5-cache/dev-ruby/activejob-4.2.8
index 606cb2e57e1a..33b87bd8db9a 100644
--- a/metadata/md5-cache/dev-ruby/activejob-4.2.8
+++ b/metadata/md5-cache/dev-ruby/activejob-4.2.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c7f56e7c87d28b9f9d93d62d72b6bc86
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.0.0.1 b/metadata/md5-cache/dev-ruby/activejob-5.0.0.1
index debc71182c7a..63a42e70957a 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.0.0.1
+++ b/metadata/md5-cache/dev-ruby/activejob-5.0.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.0.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.0.1.tar.gz -> rails-5.0.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=16fb45c3f980a3d9f3dc208d11d9644a
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.0.1 b/metadata/md5-cache/dev-ruby/activejob-5.0.1
index 35e1300cc21c..20655e4639eb 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.0.1
+++ b/metadata/md5-cache/dev-ruby/activejob-5.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.1[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.1.tar.gz -> rails-5.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4ca3200d13d978fa3bce1eca544c8706
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.0.2 b/metadata/md5-cache/dev-ruby/activejob-5.0.2
index 80c3b8994883..45d70bcfe352 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.0.2
+++ b/metadata/md5-cache/dev-ruby/activejob-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.2[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.2.tar.gz -> rails-5.0.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4ca3200d13d978fa3bce1eca544c8706
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.0.3 b/metadata/md5-cache/dev-ruby/activejob-5.0.3
index c2cbf4642823..f94f7b759d9f 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.0.3
+++ b/metadata/md5-cache/dev-ruby/activejob-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.3[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4ca3200d13d978fa3bce1eca544c8706
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.1.1 b/metadata/md5-cache/dev-ruby/activejob-5.1.1
index 13b3ff1900cd..b6a0bbdc25b3 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.1.1
+++ b/metadata/md5-cache/dev-ruby/activejob-5.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.1[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8dc4dabaa855df7726ab87f5fde89209
diff --git a/metadata/md5-cache/dev-ruby/activeldap-4.0.6 b/metadata/md5-cache/dev-ruby/activeldap-4.0.6
index 1c895e1ea71c..0399852ee529 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-4.0.6
+++ b/metadata/md5-cache/dev-ruby/activeldap-4.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://rubygems/activeldap-4.0.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=39d317beb8d7d932c5bbf40da735f6a9
diff --git a/metadata/md5-cache/dev-ruby/activeldap-5.1.0 b/metadata/md5-cache/dev-ruby/activeldap-5.1.0
index d7579196ca5b..588bc733ecdf 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-5.1.0
+++ b/metadata/md5-cache/dev-ruby/activeldap-5.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://rubygems/activeldap-5.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a9f00271ab661fef76fb48d7fe76290e
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.2.7.1 b/metadata/md5-cache/dev-ruby/activemodel-4.2.7.1
index 1abdd8c0fb6c..b58470dfde54 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.2.7.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.2.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.7.1:*[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.7.1.tar.gz -> rails-4.2.7.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=db295fdfa6b7d765faf468afc7fcf9e5
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.2.8 b/metadata/md5-cache/dev-ruby/activemodel-4.2.8
index e612192201b7..1d6be518ae7a 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.2.8
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.2.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8:*[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ff61a8271bc2384652b2d4025fd12ded
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.0.0.1 b/metadata/md5-cache/dev-ruby/activemodel-5.0.0.1
index 662f2482142b..9910a115bf44 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.0.0.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.0.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.0.1:*[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.0.1.tar.gz -> rails-5.0.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5c881940cc51ffe35a6711439bde271c
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.0.1 b/metadata/md5-cache/dev-ruby/activemodel-5.0.1
index b6d8e7cf3dc1..772f680e9df7 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.0.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.1:*[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.1.tar.gz -> rails-5.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=03b7a62750d077af4cfebe36ad46a74f
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.0.2 b/metadata/md5-cache/dev-ruby/activemodel-5.0.2
index 28ef0e84b39a..b09c5669b120 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.0.2
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.2:*[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.2.tar.gz -> rails-5.0.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=03b7a62750d077af4cfebe36ad46a74f
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.0.3 b/metadata/md5-cache/dev-ruby/activemodel-5.0.3
index d2307a411564..f5da4e8942c0 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.0.3
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.3:*[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6fa869cbd5068b9a662bfb40b2e87575
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.1.1 b/metadata/md5-cache/dev-ruby/activemodel-5.1.1
index ec6045bf5640..552f03912aad 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.1.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.1:*[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c7b856f11fbcacff61db221080105507
diff --git a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.1 b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.1
index a99cb2aaffa3..bfb5fd5f37cd 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( =dev-ruby/activesupport-5*:*[ruby_targets_ruby22]
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.0
 SRC_URI=https://github.com/rails/activemodel-serializers-xml/archive/v1.0.1.tar.gz -> activemodel-serializers-xml-1.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=883d67733772de86518407d6022dd0b0
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.2.7.1 b/metadata/md5-cache/dev-ruby/activerecord-4.2.7.1
index 6032e32ab574..7106fb1e9ea2 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.2.7.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.2.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.7.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.7.1.tar.gz -> rails-4.2.7.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=baa4e61147edbdd7b903406e0f202d7a
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.2.8 b/metadata/md5-cache/dev-ruby/activerecord-4.2.8
index 09ddaa0504b7..1d40ea9c1827 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.2.8
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.2.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a4216a439359e283533a13ed4f2e93bb
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.0.0.1 b/metadata/md5-cache/dev-ruby/activerecord-5.0.0.1
index f7f4c88e005a..6e43c0e3e8c0 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.0.0.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.0.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.0.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.0.1.tar.gz -> rails-5.0.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0ee2a0f6494055257786cd78d719062d
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.0.1 b/metadata/md5-cache/dev-ruby/activerecord-5.0.1
index dbc67d527299..3d1384407854 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.0.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.1[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.1.tar.gz -> rails-5.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ed0d8615a202b16e170d99eb1cca9795
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.0.2 b/metadata/md5-cache/dev-ruby/activerecord-5.0.2
index abd7f0023171..3a34029c7b6d 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.0.2
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.2[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.2.tar.gz -> rails-5.0.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ed0d8615a202b16e170d99eb1cca9795
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.0.3 b/metadata/md5-cache/dev-ruby/activerecord-5.0.3
index 4a9830ee5baa..f13113638f3f 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.0.3
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.3[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2a5c1d7aa3a99634ac8711de9e80aa01
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.1.1 b/metadata/md5-cache/dev-ruby/activerecord-5.1.1
index 454e9884ae58..8dd3309fd286 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.1.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.1[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=17c7855de552b520f054cea45f9570b2
diff --git a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4 b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
index c54fdea10eff..ec6cb5dfa1a1 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
+++ b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.0
 SRC_URI=https://github.com/rails/activerecord-deprecated_finders/archive/v1.0.4.tar.gz -> activerecord-deprecated_finders-1.0.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b8d5f0a28550ee911bb18b80dbee3b5e
diff --git a/metadata/md5-cache/dev-ruby/activeresource-4.0.0 b/metadata/md5-cache/dev-ruby/activeresource-4.0.0
index 4912e0071952..5cabeb60b92b 100644
--- a/metadata/md5-cache/dev-ruby/activeresource-4.0.0
+++ b/metadata/md5-cache/dev-ruby/activeresource-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/activesupport-4*[ruby_targets_ruby21] =
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=https://github.com/rails/activeresource/archive/v4.0.0.tar.gz -> activeresource-4.0.0.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5f98b63f6c1a59b79467335963f88729
diff --git a/metadata/md5-cache/dev-ruby/activeresource-4.1.0 b/metadata/md5-cache/dev-ruby/activeresource-4.1.0
index be4c2dcef6aa..fbb64b7a5e3f 100644
--- a/metadata/md5-cache/dev-ruby/activeresource-4.1.0
+++ b/metadata/md5-cache/dev-ruby/activeresource-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/activesupport-4*:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/activeresource/archive/v4.1.0.tar.gz -> activeresource-4.1.0.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=10b0c347db8b93998b58985c61c0f826
diff --git a/metadata/md5-cache/dev-ruby/activeresource-5.0.0 b/metadata/md5-cache/dev-ruby/activeresource-5.0.0
index 6eee2a46916c..e57aef90a509 100644
--- a/metadata/md5-cache/dev-ruby/activeresource-5.0.0
+++ b/metadata/md5-cache/dev-ruby/activeresource-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( =dev-ruby/activesupport-5*:*[ruby_targets_ruby22]
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/activeresource/archive/v5.0.0.tar.gz -> activeresource-5.0.0.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d74c359f88d3f1c6f28a416a7b172bbb
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.2.7.1 b/metadata/md5-cache/dev-ruby/activesupport-4.2.7.1
index 89f348e29497..408cdd598f22 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.2.7.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.2.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby21] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.7.1.tar.gz -> rails-4.2.7.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c9e91e5a50dd229bc2d8233af283fafa
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.2.8 b/metadata/md5-cache/dev-ruby/activesupport-4.2.8
index d6f47306ca52..115b8eef1a28 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.2.8
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.2.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby21] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0e2c5a526eca5d57d9d061e93a685954
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.0.0.1 b/metadata/md5-cache/dev-ruby/activesupport-5.0.0.1
index 0548f7ef99b0..09fc000db838 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.0.0.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.0.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.0.1.tar.gz -> rails-5.0.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=18bd77e9c7121a9604b1249e94e6f492
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.0.1 b/metadata/md5-cache/dev-ruby/activesupport-5.0.1
index a0cdc34c369b..3b498b7338ac 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.0.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.1.tar.gz -> rails-5.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=517da89ef9a53ea29ddf1e8fd269ef70
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.0.2 b/metadata/md5-cache/dev-ruby/activesupport-5.0.2
index 0783e8e9db16..b7b08292d375 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.0.2
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.2.tar.gz -> rails-5.0.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=eea14043522473cb661df9d65742bd2f
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.0.3 b/metadata/md5-cache/dev-ruby/activesupport-5.0.3
index 65504ea333a6..0c168fbd61a3 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.0.3
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=98dfcea2ed1216e2ce773aa9b706cffd
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.1.1 b/metadata/md5-cache/dev-ruby/activesupport-5.1.1
index ffa9f00acaba..fc604b979d93 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.1.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bb485825614cd2c9f0d79c6d8ede83d6
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.8.2 b/metadata/md5-cache/dev-ruby/acts_as_list-0.8.2
index e049e2a4aa75..caceb0ea40ce 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.8.2
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/acts_as_list-0.8.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3e1ec9e4973f4e31ebddc23d1bb217f4
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.2 b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.2
index 641d70ab5c1e..ec46999c7f77 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.2
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/acts_as_list-0.9.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a4c188c6517143c596c5ce36d0bafa80
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.3 b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.3
index 81c2d6788b3e..a298e851756b 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.3
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/acts_as_list-0.9.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a4c188c6517143c596c5ce36d0bafa80
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.4 b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.4
index c564844b84a6..76ced4325acc 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.4
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/acts_as_list-0.9.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a4c188c6517143c596c5ce36d0bafa80
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.5 b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.5
index d33a5df814bb..0344112efaab 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.5
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/acts_as_list-0.9.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a4c188c6517143c596c5ce36d0bafa80
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.4.0-r1 b/metadata/md5-cache/dev-ruby/addressable-2.4.0-r1
index 8e378cb101e6..688575ca2153 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/addressable-2.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/addressable-2.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6e7045ba81d6231d494509776c9e803a
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.5.1 b/metadata/md5-cache/dev-ruby/addressable-2.5.1
index 801e5621f67f..0aefdee56d36 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.5.1
+++ b/metadata/md5-cache/dev-ruby/addressable-2.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/addressable-2.5.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d41717eb2b15d913b1d4608cc885de4d
diff --git a/metadata/md5-cache/dev-ruby/ae-1.8.2 b/metadata/md5-cache/dev-ruby/ae-1.8.2
index 97d185cafab7..8e7093f15f0b 100644
--- a/metadata/md5-cache/dev-ruby/ae-1.8.2
+++ b/metadata/md5-cache/dev-ruby/ae-1.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ae-1.8.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fd073f06be658a76b4ab5ea7f818d53f
diff --git a/metadata/md5-cache/dev-ruby/afm-0.2.2 b/metadata/md5-cache/dev-ruby/afm-0.2.2
index a4c740a66fca..832675778d54 100644
--- a/metadata/md5-cache/dev-ruby/afm-0.2.2
+++ b/metadata/md5-cache/dev-ruby/afm-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/afm-0.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=db49e6111c172a280f67e376b1e2168c
diff --git a/metadata/md5-cache/dev-ruby/akismet-1.0.2 b/metadata/md5-cache/dev-ruby/akismet-1.0.2
index 410f3bf87572..94cd67752eea 100644
--- a/metadata/md5-cache/dev-ruby/akismet-1.0.2
+++ b/metadata/md5-cache/dev-ruby/akismet-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/jonahb/akismet/archive/v1.0.2.tar.gz -> akismet-1.0.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8d0a284da438acc9bae077faf126f9bf
diff --git a/metadata/md5-cache/dev-ruby/akismet-2.0.0 b/metadata/md5-cache/dev-ruby/akismet-2.0.0
index 9b107a356ad5..df43a545e68f 100644
--- a/metadata/md5-cache/dev-ruby/akismet-2.0.0
+++ b/metadata/md5-cache/dev-ruby/akismet-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/jonahb/akismet/archive/v2.0.0.tar.gz -> akismet-2.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f3de163550e8f828ca20c79b9cebc797
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
index 9f24b531db05..ba6415efd7c3 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/allison-2.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=57f216abd0c572ca068239fb81f1e425
diff --git a/metadata/md5-cache/dev-ruby/amatch-0.3.0 b/metadata/md5-cache/dev-ruby/amatch-0.3.0
index 34b90b232af3..4951d07778bc 100644
--- a/metadata/md5-cache/dev-ruby/amatch-0.3.0
+++ b/metadata/md5-cache/dev-ruby/amatch-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/tins-0.3[ruby_targets_ruby21] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/amatch-0.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=29e3a75fd0969a2a64f0a3aa6b7b9645
diff --git a/metadata/md5-cache/dev-ruby/amatch-0.3.1 b/metadata/md5-cache/dev-ruby/amatch-0.3.1
index e373e07eeead..ba8db0122966 100644
--- a/metadata/md5-cache/dev-ruby/amatch-0.3.1
+++ b/metadata/md5-cache/dev-ruby/amatch-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/tins-1*[ruby_targets_ruby21] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/amatch-0.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=31b158e3e102f53654412577e8ed71eb
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.4 b/metadata/md5-cache/dev-ruby/ammeter-1.1.4
index a584f9c46824..308c8bc7b790 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.4
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ammeter-1.1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=003c8ce82814967d746d464778447866
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1 b/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
index c3995b5ae5be..b43d758cf43b 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ammeter-1.1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e82b38fec5082775a6bbbc74d93a6486
diff --git a/metadata/md5-cache/dev-ruby/amq-client-1.0.4 b/metadata/md5-cache/dev-ruby/amq-client-1.0.4
index 70cea071afd7..8cd0747f5b2e 100644
--- a/metadata/md5-cache/dev-ruby/amq-client-1.0.4
+++ b/metadata/md5-cache/dev-ruby/amq-client-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/amq-client-1.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=72a32e70fbbb595286269d661834b6e4
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2 b/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
index 58b85e488637..b66efed1548f 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/amq-protocol-1.9.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0433178fac17e4fdcf3723274942d2b1
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.1.0 b/metadata/md5-cache/dev-ruby/amq-protocol-2.1.0
index ecb8b900506f..734ebb15f0fa 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-2.1.0
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/amq-protocol-2.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bb883c0dcad194cd6029e9703fb630d6
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.2.0 b/metadata/md5-cache/dev-ruby/amq-protocol-2.2.0
index 4f2e049798d1..d5c08995c2e8 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-2.2.0
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/amq-protocol-2.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b245c6ea57363fe06e744586320cfe1e
diff --git a/metadata/md5-cache/dev-ruby/amqp-1.6.0 b/metadata/md5-cache/dev-ruby/amqp-1.6.0
index 3ce02d43cd4b..70c31b40450e 100644
--- a/metadata/md5-cache/dev-ruby/amqp-1.6.0
+++ b/metadata/md5-cache/dev-ruby/amqp-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.4
 SRC_URI=mirror://rubygems/amqp-1.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=31598ba919409ee6099fcf684efe59dd
diff --git a/metadata/md5-cache/dev-ruby/amqp-1.7.0 b/metadata/md5-cache/dev-ruby/amqp-1.7.0
index 29fa27781940..b8114c03c57a 100644
--- a/metadata/md5-cache/dev-ruby/amqp-1.7.0
+++ b/metadata/md5-cache/dev-ruby/amqp-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.4
 SRC_URI=mirror://rubygems/amqp-1.7.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=12fc3ab86ece39fa94c03412701e12a8
diff --git a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1 b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
index aaccbb9082c7..861dcf76a997 100644
--- a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
+++ b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/annoy-0.5.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a5f5b0474953c8b50c2fa90f36dd6a3f
diff --git a/metadata/md5-cache/dev-ruby/ansi-1.5.0 b/metadata/md5-cache/dev-ruby/ansi-1.5.0
index 88b43f9f624e..ba54eb66790c 100644
--- a/metadata/md5-cache/dev-ruby/ansi-1.5.0
+++ b/metadata/md5-cache/dev-ruby/ansi-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ansi-1.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b735a9bef90279cc5fe9459cf31b0115
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1
index cb50656b3357..7638f9e3fe76 100644
--- a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1
+++ b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitar-0.6.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1df617db3a7dd4a2e52f2575196cabd5
diff --git a/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214 b/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214
index 9892269fe3ee..3aaf5cd37d00 100644
--- a/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214
+++ b/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=mirror://rubygems/arel-5.0.1.20140414130214.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5b03ee1c50fb408cfbaf4f97cde2dbe5
diff --git a/metadata/md5-cache/dev-ruby/arel-6.0.3 b/metadata/md5-cache/dev-ruby/arel-6.0.3
index d1be24e1c4a0..482dcab041d2 100644
--- a/metadata/md5-cache/dev-ruby/arel-6.0.3
+++ b/metadata/md5-cache/dev-ruby/arel-6.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/arel/archive/v6.0.3.tar.gz -> arel-6.0.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ebcd7d16215422fc6dd3a0d925ead032
diff --git a/metadata/md5-cache/dev-ruby/arel-7.1.4 b/metadata/md5-cache/dev-ruby/arel-7.1.4
index 0bd6efecaa34..5d2449cdaab3 100644
--- a/metadata/md5-cache/dev-ruby/arel-7.1.4
+++ b/metadata/md5-cache/dev-ruby/arel-7.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=7.0
 SRC_URI=https://github.com/rails/arel/archive/v7.1.4.tar.gz -> arel-7.1.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=410a35b8c0cdb8c32659287d799af88c
diff --git a/metadata/md5-cache/dev-ruby/arel-8.0.0 b/metadata/md5-cache/dev-ruby/arel-8.0.0
index e6053d6fe1a4..23096e5e2443 100644
--- a/metadata/md5-cache/dev-ruby/arel-8.0.0
+++ b/metadata/md5-cache/dev-ruby/arel-8.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=8.0
 SRC_URI=https://github.com/rails/arel/archive/v8.0.0.tar.gz -> arel-8.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=410a35b8c0cdb8c32659287d799af88c
diff --git a/metadata/md5-cache/dev-ruby/arel-helpers-2.3.0 b/metadata/md5-cache/dev-ruby/arel-helpers-2.3.0
index d8f17fd42368..3c339de820cd 100644
--- a/metadata/md5-cache/dev-ruby/arel-helpers-2.3.0
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/arel-helpers-2.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5ba2b74a46ae4413d7673ac84f5b97df
diff --git a/metadata/md5-cache/dev-ruby/arel-helpers-2.4.0 b/metadata/md5-cache/dev-ruby/arel-helpers-2.4.0
index 7d5ba3593ad5..a60e8854f149 100644
--- a/metadata/md5-cache/dev-ruby/arel-helpers-2.4.0
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/arel-helpers-2.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=062c035baaaed89d562545f2d5cf0dae
diff --git a/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2 b/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
index 74b300737561..9e0fa4ac4e90 100644
--- a/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/Ascii85-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=58335505dfaafd833c3297ec799894b3
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.4 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.4
index 50b6e6000ccd..8278083b30de 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.4
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v1.5.4.tar.gz -> asciidoctor-1.5.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9891b5ddf832886b847f61ea9bdf31e9
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.5 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.5
index 4031b573ef1b..7a7c8b8c4795 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.5
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v1.5.5.tar.gz -> asciidoctor-1.5.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9891b5ddf832886b847f61ea9bdf31e9
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.5-r1 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.5-r1
index 8313a703d895..55df874282bc 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.5-r1
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v1.5.5.tar.gz -> asciidoctor-1.5.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=53563921ebab6ea78ae9bf976dd58fdd
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.4 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.4
index 0e17a30ab1ca..e18072b8d097 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.4
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor-diagram/archive/v1.5.4.tar.gz -> asciidoctor-diagram-1.5.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b47e88af90a2d09645314a9d7344832c
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.2 b/metadata/md5-cache/dev-ruby/asciimath-1.0.2
index 10f6a3d03125..34e8b6ccf81c 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-1.0.2
+++ b/metadata/md5-cache/dev-ruby/asciimath-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/asciimath-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ca7e4d4cd804e3038bbe25f422b98dc4
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.4 b/metadata/md5-cache/dev-ruby/asciimath-1.0.4
index 99099c421f9b..85b346d4de01 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-1.0.4
+++ b/metadata/md5-cache/dev-ruby/asciimath-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/asciimath-1.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=386351eda55520fc040053eba19fd18a
diff --git a/metadata/md5-cache/dev-ruby/ast-2.2.0 b/metadata/md5-cache/dev-ruby/ast-2.2.0
index 67ebc62271bd..0be8502036a2 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ast-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ast-2.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3d148482a5387dd049cdd7cef33ff984
diff --git a/metadata/md5-cache/dev-ruby/ast-2.3.0 b/metadata/md5-cache/dev-ruby/ast-2.3.0
index b528441b0784..7d6ece73cc97 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.3.0
+++ b/metadata/md5-cache/dev-ruby/ast-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ast-2.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e6ee201b02a2cf6e45f10963802f3351
diff --git a/metadata/md5-cache/dev-ruby/astrolabe-1.3.1 b/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
index 43c57c8fe6ca..22f0b1c06888 100644
--- a/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
+++ b/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/astrolabe-1.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a127c97f2ac2a45b03799b8efeff7ed5
diff --git a/metadata/md5-cache/dev-ruby/async_sinatra-1.2.1 b/metadata/md5-cache/dev-ruby/async_sinatra-1.2.1
index ed9b636a0c55..ea76326c1cae 100644
--- a/metadata/md5-cache/dev-ruby/async_sinatra-1.2.1
+++ b/metadata/md5-cache/dev-ruby/async_sinatra-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby21] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/raggi/async_sinatra/archive/v1.2.1.tar.gz -> async_sinatra-1.2.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=861c99218aef7995bd820af913e24814
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.99 b/metadata/md5-cache/dev-ruby/atomic-1.1.99
index 74287003858b..8dba1ba14eac 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.99
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.99
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/atomic-1.1.99.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=24cdb8d35f516a5da8c585ee5ceb5a76
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-6.7.7.2 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-6.7.7.2
index 3d4b37a00ad6..68d4f4938527 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-6.7.7.2
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-6.7.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=6
 SRC_URI=mirror://rubygems/autoprefixer-rails-6.7.7.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8c482803ac6de98b3dedd75607a2b73c
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.1 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.1
index 0ff2a6604d41..7a225fc4749d 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.1
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=7
 SRC_URI=mirror://rubygems/autoprefixer-rails-7.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c6df768569908f1c16ebb3570482eb01
diff --git a/metadata/md5-cache/dev-ruby/awesome_print-1.7.0 b/metadata/md5-cache/dev-ruby/awesome_print-1.7.0
index 87adc06c8fed..4815fea4327d 100644
--- a/metadata/md5-cache/dev-ruby/awesome_print-1.7.0
+++ b/metadata/md5-cache/dev-ruby/awesome_print-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/awesome-print/awesome_print/archive/v1.7.0.tar.gz -> awesome_print-1.7.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=52356483e0a5499b72620f9bcdbee524
diff --git a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3 b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
index b5129706ccac..e5b5763e166f 100644
--- a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
+++ b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/xml-simple[ruby_targets_ruby21] dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/aws-s3-0.6.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=463ca57d377c90b9d768a4c51bba0876
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-1.66.0 b/metadata/md5-cache/dev-ruby/aws-sdk-1.66.0
index abc97192ce15..17cb6aaeab29 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-1.66.0
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-1.66.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v1.66.0.tar.gz -> aws-sdk-ruby-1.66.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=62636934c6724f77248d0b242690949a
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.5.11 b/metadata/md5-cache/dev-ruby/aws-sdk-2.5.11
index 1b55e5ddfbda..b6c173cb1d40 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.5.11
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-2.5.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ~dev-ruby/a
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.5.11.tar.gz -> aws-sdk-ruby-2.5.11.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5286139a3ac72b75852103a2fccc3fb9
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.6.50 b/metadata/md5-cache/dev-ruby/aws-sdk-2.6.50
index e4b9e3cb71c0..9ffdc3e33677 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.6.50
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-2.6.50
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ~dev-ruby/a
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.6.50.tar.gz -> aws-sdk-ruby-2.6.50.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b53eb38f6468f707576da178104ea8d6
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.8.14 b/metadata/md5-cache/dev-ruby/aws-sdk-2.8.14
index eb5d3b0f80c7..6a725e041e1c 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.8.14
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-2.8.14
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ~dev-ruby/a
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.8.14.tar.gz -> aws-sdk-ruby-2.8.14.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a90c4ac7c9da2e10b831fec3b63692dc
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.5.11 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.5.11
index d48c5625d9ed..2e6ea0da9021 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.5.11
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.5.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/jmespath:1[ruby_targets_ruby21] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.5.11.tar.gz -> aws-sdk-ruby-2.5.11.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b65f06d5554c811e6756afb1b5ce4f8c
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.6.50 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.6.50
index 8c4650c885f4..1a57f69bcb19 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.6.50
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.6.50
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/aws-sigv4[ruby_targets_ruby21] dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.6.50.tar.gz -> aws-sdk-ruby-2.6.50.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d4a63672f12a3c512e5ef65f2cf2ac73
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.8.14 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.8.14
index 53e8f825b83d..1b83e2fb5317 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.8.14
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.8.14
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/aws-sigv4[ruby_targets_ruby21] dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.8.14.tar.gz -> aws-sdk-ruby-2.8.14.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b5f3381e0932af9d1721e149ec39372e
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.5.11 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.5.11
index 609a02b100a2..edbb5af506bf 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.5.11
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.5.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/aws-sdk-core-2.5.11[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.5.11.tar.gz -> aws-sdk-ruby-2.5.11.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5b31ad1dcdda5388462849771657e810
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.6.50 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.6.50
index 4c69ca94d885..0dda4502ba97 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.6.50
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.6.50
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/aws-sdk-core-2.6.50[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.6.50.tar.gz -> aws-sdk-ruby-2.6.50.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=31455d24bafe75cc1097fc7cbecbfaa6
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.8.14 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.8.14
index 18c9b167a31b..781f0668fe5a 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.8.14
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.8.14
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/aws-sdk-core-2.8.14[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.8.14.tar.gz -> aws-sdk-ruby-2.8.14.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bcc2c5da95e5ad756160dacdd4d6cb51
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.0 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.0
index 3fccb02d799a..18d24452d297 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.0
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/aws-sigv4-1.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=012b591883594a3fdfd65b2558669fc5
diff --git a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1 b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
index 61565c3b9132..ffb47a50b5b0 100644
--- a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
+++ b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/axiom-types-0.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6f23ed46233ce8b4090fd74f2bf8e7de
diff --git a/metadata/md5-cache/dev-ruby/backports-3.6.8 b/metadata/md5-cache/dev-ruby/backports-3.6.8
index ee2665dbef9c..24598c25df5c 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.6.8
+++ b/metadata/md5-cache/dev-ruby/backports-3.6.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/backports-3.6.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8791281dd76885266fa0b5e912961ec2
diff --git a/metadata/md5-cache/dev-ruby/backports-3.7.0 b/metadata/md5-cache/dev-ruby/backports-3.7.0
index ee45f70728c2..93c4fc4eb155 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.7.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/backports-3.7.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0d81d8c696accd846a05c08a2b5842b0
diff --git a/metadata/md5-cache/dev-ruby/backports-3.8.0 b/metadata/md5-cache/dev-ruby/backports-3.8.0
index ef583711724e..634d620cec45 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.8.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/backports-3.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f33817349120241bcec33c319131a76f
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
index 9eee3155dd63..0ea8fe2d17ae 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bacon-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4fade1d8538f8d9979769e0baf1b7d69
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.3-r1 b/metadata/md5-cache/dev-ruby/barby-0.6.3-r1
index 087586dca85e..10240a8cd0e0 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.3-r1
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/v0.6.3.tar.gz -> barby-0.6.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fc4336bc0bd831a3bbc2442a3a35dcfe
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.4 b/metadata/md5-cache/dev-ruby/barby-0.6.4
index b9d84f061814..5feea97d93be 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.4
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/v0.6.4.tar.gz -> barby-0.6.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fc4336bc0bd831a3bbc2442a3a35dcfe
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.5 b/metadata/md5-cache/dev-ruby/barby-0.6.5
index 0394a642c5b1..7fa6357e4f02 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.5
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/v0.6.5.tar.gz -> barby-0.6.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ba50aaad1936ecb59a0dfc6be8980e62
diff --git a/metadata/md5-cache/dev-ruby/base32-0.3.2 b/metadata/md5-cache/dev-ruby/base32-0.3.2
index 3a21bbdc852d..56bdff69eed3 100644
--- a/metadata/md5-cache/dev-ruby/base32-0.3.2
+++ b/metadata/md5-cache/dev-ruby/base32-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/base32-0.3.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=be88042b46657e563dfcddeae528f46e
diff --git a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2 b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
index 926b98314a8e..49db543eb265 100644
--- a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
+++ b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!!<app-accessibility/speech-tools-2.1-r3 ruby_targets_ruby21? ( dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcat-0.6.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3406846563838be07fa095e99ffde8c6
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11
index 757fd1389de7..f93acc856d3d 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcrypt-3.1.11.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1474c71d7f1adcbaf835e6d420892683
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11-r1 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11-r1
index b43e3061e653..898af5316782 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11-r1
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcrypt-3.1.11.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d2b7b60e70fee0d4725b65eaf3fdcb43
diff --git a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0 b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
index 730d108fd359..058d3017ca06 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
+++ b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/bcrypt_pbkdf-1.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4e8dab0128b6fcec80e42a61409bafc1
diff --git a/metadata/md5-cache/dev-ruby/best_in_place-3.1.0 b/metadata/md5-cache/dev-ruby/best_in_place-3.1.0
index c588da9fc6ea..29d6955402a1 100644
--- a/metadata/md5-cache/dev-ruby/best_in_place-3.1.0
+++ b/metadata/md5-cache/dev-ruby/best_in_place-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/best_in_place-3.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=425d9542e29d128c9df05d06ffb29123
diff --git a/metadata/md5-cache/dev-ruby/bindata-2.4.0 b/metadata/md5-cache/dev-ruby/bindata-2.4.0
index 7855f20106e7..08b375806167 100644
--- a/metadata/md5-cache/dev-ruby/bindata-2.4.0
+++ b/metadata/md5-cache/dev-ruby/bindata-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2.4.0
 SRC_URI=mirror://rubygems/bindata-2.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ada7ed8111b7b338b7581fbe7b3e5b4f
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2 b/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
index 7ad5b5227d62..476dd76cc56a 100644
--- a/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/binding_of_caller-0.7.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5955187677653daf664cd66832993c97
diff --git a/metadata/md5-cache/dev-ruby/bit-struct-0.15.0 b/metadata/md5-cache/dev-ruby/bit-struct-0.15.0
index 9bc4aa4b93bc..c0538e59b91b 100644
--- a/metadata/md5-cache/dev-ruby/bit-struct-0.15.0
+++ b/metadata/md5-cache/dev-ruby/bit-struct-0.15.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/bit-struct-0.15.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=655da76d961ee21c84769441b25ebad2
diff --git a/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4 b/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
index a9317b4cc486..968d8e6e07d8 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
+++ b/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://rubygems/blankslate-2.1.2.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=828a25e09787f8d62e7a89e901d77c75
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
index 4e13aa859c77..2880a7c24919 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.3
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/blankslate-3.1.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=45ad6f1afa83d125f522a11e60ed7308
diff --git a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3 b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
index ed64da036200..5e651044add9 100644
--- a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
+++ b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/bluecloth-2.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e109729c4f210f8cb44425d95fdd966c
diff --git a/metadata/md5-cache/dev-ruby/bogus-0.1.6 b/metadata/md5-cache/dev-ruby/bogus-0.1.6
index a59edb25fe7a..9efa3affdab6 100644
--- a/metadata/md5-cache/dev-ruby/bogus-0.1.6
+++ b/metadata/md5-cache/dev-ruby/bogus-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/bogus-0.1.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a0327061e03e33c1e1dece6ecd6db575
diff --git a/metadata/md5-cache/dev-ruby/bones-3.8.4 b/metadata/md5-cache/dev-ruby/bones-3.8.4
index 363e18fff916..d792d8db5a42 100644
--- a/metadata/md5-cache/dev-ruby/bones-3.8.4
+++ b/metadata/md5-cache/dev-ruby/bones-3.8.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/builder[ruby_targets_ruby21] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/bones-3.8.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7b64b4d8d0ec5285d627a8a4243e1d4f
diff --git a/metadata/md5-cache/dev-ruby/bones-3.8.4-r1 b/metadata/md5-cache/dev-ruby/bones-3.8.4-r1
index 7e4632c93216..d48a0dc674f8 100644
--- a/metadata/md5-cache/dev-ruby/bones-3.8.4-r1
+++ b/metadata/md5-cache/dev-ruby/bones-3.8.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/builder:*[ruby_targets_ruby21] >=dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/bones-3.8.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7adbb2b2172f7b16bafa31f0d7aa4fe4
diff --git a/metadata/md5-cache/dev-ruby/bourne-1.6.0 b/metadata/md5-cache/dev-ruby/bourne-1.6.0
index 7bdd9a98b367..086283292074 100644
--- a/metadata/md5-cache/dev-ruby/bourne-1.6.0
+++ b/metadata/md5-cache/dev-ruby/bourne-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/bourne-1.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6bb28bf541c65d6dadcc777ca278b74b
diff --git a/metadata/md5-cache/dev-ruby/brass-1.2.1 b/metadata/md5-cache/dev-ruby/brass-1.2.1
index fa0985f003f5..536ee0c74663 100644
--- a/metadata/md5-cache/dev-ruby/brass-1.2.1
+++ b/metadata/md5-cache/dev-ruby/brass-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/brass-1.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a7442d97c14016eed46ce68adac44474
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
index f8f5cf5cad04..24c3f87ea5ef 100644
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/bsearch-1.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=514343b41acbb9a2565eb83d060ab40c
diff --git a/metadata/md5-cache/dev-ruby/bson-3.2.6 b/metadata/md5-cache/dev-ruby/bson-3.2.6
index 60fd8c9df9f8..a8893a6c4d1c 100644
--- a/metadata/md5-cache/dev-ruby/bson-3.2.6
+++ b/metadata/md5-cache/dev-ruby/bson-3.2.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v3.2.6.tar.gz -> bson-3.2.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=950baddf95dfc40214c74981d92010ff
diff --git a/metadata/md5-cache/dev-ruby/bson-4.1.1 b/metadata/md5-cache/dev-ruby/bson-4.1.1
index 1da1df89d4a6..5b999977c31f 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.1.1
+++ b/metadata/md5-cache/dev-ruby/bson-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.1.1.tar.gz -> bson-4.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c0079eba56a1107fe4dca5dae5260f7f
diff --git a/metadata/md5-cache/dev-ruby/bson-4.2.0 b/metadata/md5-cache/dev-ruby/bson-4.2.0
index 36b73c99773d..bc8cb6c43371 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.2.0
+++ b/metadata/md5-cache/dev-ruby/bson-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.2.0.tar.gz -> bson-4.2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c0079eba56a1107fe4dca5dae5260f7f
diff --git a/metadata/md5-cache/dev-ruby/bson-4.2.1 b/metadata/md5-cache/dev-ruby/bson-4.2.1
index b0667b9c4328..f59e04415d2c 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.2.1
+++ b/metadata/md5-cache/dev-ruby/bson-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.2.1.tar.gz -> bson-4.2.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e14f37dd7b00f27f2dbceb4e885fd119
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1 b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
index a7a722ab955e..4d4f252e353a 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/buftok-0.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f05096a157eaf49ea32afe71f4d2700f
diff --git a/metadata/md5-cache/dev-ruby/builder-3.0.4-r2 b/metadata/md5-cache/dev-ruby/builder-3.0.4-r2
index 3034ce0e347f..ca88000a77ec 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/builder-3.0.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/builder-3.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=51d777126473b1e0c44283f7ce716913
diff --git a/metadata/md5-cache/dev-ruby/builder-3.1.4 b/metadata/md5-cache/dev-ruby/builder-3.1.4
index c4ef40115fae..a338f77d05af 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.1.4
+++ b/metadata/md5-cache/dev-ruby/builder-3.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=3.1
 SRC_URI=mirror://rubygems/builder-3.1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=73789ecb92a6da7a05a46efdea59b379
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.2-r1 b/metadata/md5-cache/dev-ruby/builder-3.2.2-r1
index 333d9ac81c5b..fd9bffb2bbcd 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3.2
 SRC_URI=mirror://rubygems/builder-3.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=082372ada9c7464c89da3462e4119174
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.3 b/metadata/md5-cache/dev-ruby/builder-3.2.3
index 14f71c244bb6..4f3c6294a988 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.3
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3.2
 SRC_URI=mirror://rubygems/builder-3.2.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=34dfb22573905a4eb84f4582369c39d5
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.12.5 b/metadata/md5-cache/dev-ruby/bundler-1.12.5
index a6d85fb62917..33cc009f94c6 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.12.5
+++ b/metadata/md5-cache/dev-ruby/bundler-1.12.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/carlhuda/bundler/archive/v1.12.5.tar.gz -> bundler-1.12.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=da487fb8a8bc936de53ca88ba8531ed8
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.12.6 b/metadata/md5-cache/dev-ruby/bundler-1.12.6
index b8f64ca30889..feac23838945 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.12.6
+++ b/metadata/md5-cache/dev-ruby/bundler-1.12.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/carlhuda/bundler/archive/v1.12.6.tar.gz -> bundler-1.12.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8c288df5b41790c1edb735029ef1d238
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.13.7 b/metadata/md5-cache/dev-ruby/bundler-1.13.7
index a9b17f524769..47382ded2a03 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.13.7
+++ b/metadata/md5-cache/dev-ruby/bundler-1.13.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/carlhuda/bundler/archive/v1.13.7.tar.gz -> bundler-1.13.7.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8234f20aa9095f87c9635556357f190d
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.4.0 b/metadata/md5-cache/dev-ruby/bundler-audit-0.4.0
index f8d38f80002d..c24a823e8948 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.4.0
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby21] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bundler-audit-0.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=09f592b32d23dc9b00d407899a442ecf
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.5.0 b/metadata/md5-cache/dev-ruby/bundler-audit-0.5.0
index cae293acb42f..68fb89ac3c6c 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.5.0
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/bundler-audit-0.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7d3b9923cf5db4711cac22a52852de0f
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.6.3 b/metadata/md5-cache/dev-ruby/bunny-2.6.3
index 51291aee612f..cc1c53ee42c3 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.6.3
+++ b/metadata/md5-cache/dev-ruby/bunny-2.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/bunny-2.6.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b48ff824665de116c40e1e51c1c79ae4
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.6.4-r1 b/metadata/md5-cache/dev-ruby/bunny-2.6.4-r1
index 273963555d3b..bbaeb00546e9 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.6.4-r1
+++ b/metadata/md5-cache/dev-ruby/bunny-2.6.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/bunny-2.6.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e8060933d66ce6521a729902390fc8aa
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.6.5 b/metadata/md5-cache/dev-ruby/bunny-2.6.5
index 8005bea11ca0..55a05c20a568 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.6.5
+++ b/metadata/md5-cache/dev-ruby/bunny-2.6.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/bunny-2.6.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e8060933d66ce6521a729902390fc8aa
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.7.0 b/metadata/md5-cache/dev-ruby/bunny-2.7.0
index dc5058f22de5..4f0b0818dad6 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.7.0
+++ b/metadata/md5-cache/dev-ruby/bunny-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bunny-2.7.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ed6d17e4fd581d2e8b015bf353827d53
diff --git a/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2 b/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
index 80a2c82b129f..d0f191c96ebc 100644
--- a/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
+++ b/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rails-3.1:*[ruby_targets_ruby21] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/calendar_date_select-2.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=65f150f8f85072f7284a426f5e680bd7
diff --git a/metadata/md5-cache/dev-ruby/camping-2.1.532 b/metadata/md5-cache/dev-ruby/camping-2.1.532
index 5730aa1c2aff..4ed517e413c3 100644
--- a/metadata/md5-cache/dev-ruby/camping-2.1.532
+++ b/metadata/md5-cache/dev-ruby/camping-2.1.532
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby21] >=dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/camping-2.1.532.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=700251bd157bd371d8340e6abc348ac8
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
index a2804e623553..ba25d69bd05c 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/capistrano-2.15.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f43e7ac34133a6a41a74ce5b57ce9162
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.4.1 b/metadata/md5-cache/dev-ruby/capistrano-3.4.1
index d2284d1ec8bc..1db29d22f892 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.4.1
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby21] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/capistrano-3.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dacb7263a267519cac762b88e89a49e0
diff --git a/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1 b/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
index 0868cc9563dc..7f285c23c56c 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
+++ b/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/capistrano-stats-1.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bb5161875a6a4dc78cac731374c0eeed
diff --git a/metadata/md5-cache/dev-ruby/capybara-1.1.4 b/metadata/md5-cache/dev-ruby/capybara-1.1.4
index e2b965546b11..117cfcc8bc10 100644
--- a/metadata/md5-cache/dev-ruby/capybara-1.1.4
+++ b/metadata/md5-cache/dev-ruby/capybara-1.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/capybara-1.1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=66008fbb64a2a0edad9fb89aa144cc71
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.10.1 b/metadata/md5-cache/dev-ruby/capybara-2.10.1
index c2004bc2b090..009b0140ccd6 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.10.1
+++ b/metadata/md5-cache/dev-ruby/capybara-2.10.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/capybara-2.10.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=d2a8f37a44b8df7aad7dd7984c037be4
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.12.0 b/metadata/md5-cache/dev-ruby/capybara-2.12.0
index a13127a8896f..680d88be347d 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.12.0
+++ b/metadata/md5-cache/dev-ruby/capybara-2.12.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/capybara-2.12.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a79489a33968d3f6873c399330dc694d
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.12.1 b/metadata/md5-cache/dev-ruby/capybara-2.12.1
index 5c11afa499cb..2298dc63b6f5 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.12.1
+++ b/metadata/md5-cache/dev-ruby/capybara-2.12.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/capybara-2.12.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a93e86c36d481cc6742e6bc6a70f19bb
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.13.0 b/metadata/md5-cache/dev-ruby/capybara-2.13.0
index 55d583f324c9..2b0f3ef39db1 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.13.0
+++ b/metadata/md5-cache/dev-ruby/capybara-2.13.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/capybara-2.13.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a93e86c36d481cc6742e6bc6a70f19bb
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.14.0 b/metadata/md5-cache/dev-ruby/capybara-2.14.0
index 981443de5e5a..f3b33fe5a326 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.14.0
+++ b/metadata/md5-cache/dev-ruby/capybara-2.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/capybara-2.14.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=d81ab346620532a9df33bb9daf78ce7c
diff --git a/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1 b/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1
index 283de35bae4c..5bd0c807449e 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1
+++ b/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/timers-4.0.0:4[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid/archive/v0.16.0.tar.gz -> celluloid-0.16.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c241420f06bd73a09e56eabc32d5b8c2
diff --git a/metadata/md5-cache/dev-ruby/celluloid-0.17.3 b/metadata/md5-cache/dev-ruby/celluloid-0.17.3
index 3083819bb4e1..933376f0b5e3 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-0.17.3
+++ b/metadata/md5-cache/dev-ruby/celluloid-0.17.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/celluloid-essentials[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/celluloid-0.17.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=80d89c2794372b6d11a1243ea069bf25
diff --git a/metadata/md5-cache/dev-ruby/celluloid-essentials-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-essentials-0.20.5
index b3cf333a595f..8d7883271c50 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-essentials-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-essentials-0.20.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid-essentials/archive/v0.20.5.tar.gz -> celluloid-essentials-0.20.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=214ff398c235a248784f726d64dcece3
diff --git a/metadata/md5-cache/dev-ruby/celluloid-extras-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-extras-0.20.5
index 44e48b985eb8..5c71be3ad094 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-extras-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-extras-0.20.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid-extras/archive/v0.20.5.tar.gz -> celluloid-extras-0.20.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8b90d4c96f1b42ca047e6293bf08a7aa
diff --git a/metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5
index 822549af20ee..40905901bebb 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid-fsm/archive/v0.20.5.tar.gz -> celluloid-fsm-0.20.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3fe7fab744b0364891259aa55179fb5b
diff --git a/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2 b/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
index 946a3a64a320..38e79331c7a0 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
+++ b/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/celluloid-0.16.0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/celluloid-io-0.16.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0fb054261830d1b265e7b58bc491a9a6
diff --git a/metadata/md5-cache/dev-ruby/celluloid-io-0.17.3 b/metadata/md5-cache/dev-ruby/celluloid-io-0.17.3
index 137f94038c04..b2af0d85d209 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-io-0.17.3
+++ b/metadata/md5-cache/dev-ruby/celluloid-io-0.17.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/celluloid-0.17.3[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/celluloid-io-0.17.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ec5be1e427e54588634e80583876e15e
diff --git a/metadata/md5-cache/dev-ruby/celluloid-pool-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-pool-0.20.5
index fa4942abd4c2..0489ec753928 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-pool-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-pool-0.20.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid-pool/archive/v0.20.5.tar.gz -> celluloid-pool-0.20.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3fe7fab744b0364891259aa55179fb5b
diff --git a/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.5
index 5e972907228d..05659ab23868 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid-supervision/archive/v0.20.5.tar.gz -> celluloid-supervision-0.20.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3fe7fab744b0364891259aa55179fb5b
diff --git a/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.6 b/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.6
index 0c1cf9ab7ecc..fd166a126aaa 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.6
+++ b/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid-supervision/archive/v0.20.6.tar.gz -> celluloid-supervision-0.20.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b2bd370dc9ee71400c504083bfcf1987
diff --git a/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6 b/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6
index 4e3b4b14ad8c..68e55b077b07 100644
--- a/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6
+++ b/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/certificate_authority-0.1.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6225b3374c3782945ea3f058a820f6aa
diff --git a/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r1 b/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r1
index fbf36ba52f12..0ae4a4f27c8c 100644
--- a/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r1
+++ b/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/certificate_authority-0.1.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2289ac641b6b32664ec35f9c9e88e6b1
diff --git a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3 b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3
index 599843b6dfbc..4de1c3b1add8 100644
--- a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3
+++ b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/icu:= sys-libs/zlib ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/charlock_holmes-0.7.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dc7afb168a938bca307c12985f54b871
diff --git a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1 b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
index e058c6d5a728..2fdf039f53a4 100644
--- a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/carllerche/childlabor/archive/6518b939dddbad20c7f05aa075d76e3ca6e70447.tar.gz -> childlabor-0.0.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=66869c55386a69bcc02e0021c940faaa
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.5.3 b/metadata/md5-cache/dev-ruby/childprocess-0.5.3
index 4f66b713389d..f29c20807c05 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.5.3
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.5.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9191f69994f9f794d7a3c1aea3bd6741
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.5.9 b/metadata/md5-cache/dev-ruby/childprocess-0.5.9
index d5e1e9ba9eec..7e6aed48e4c7 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.5.9
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.5.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.5.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d71699615bb92cac8dbfbd7051b4f7d9
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.5.9-r1 b/metadata/md5-cache/dev-ruby/childprocess-0.5.9-r1
index 9f58576a44d2..adc381929569 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.5.9-r1
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.5.9-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.5.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=deade8f821a02e0ee1c06e2a92220ea1
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.6.3 b/metadata/md5-cache/dev-ruby/childprocess-0.6.3
index dd3a70c7a814..1b86fff53185 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.6.3
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.6.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=697d8afeb954039bae8da7b8431d1781
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.7.0 b/metadata/md5-cache/dev-ruby/childprocess-0.7.0
index f9c1e5220c48..a1c99cd4db8a 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.7.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.7.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=82efb1e3ca2fd126ab0e210dd00f09bf
diff --git a/metadata/md5-cache/dev-ruby/chronic-0.10.2 b/metadata/md5-cache/dev-ruby/chronic-0.10.2
index 0000b47e0e99..2aedb740b9ef 100644
--- a/metadata/md5-cache/dev-ruby/chronic-0.10.2
+++ b/metadata/md5-cache/dev-ruby/chronic-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/chronic-0.10.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fff06850ec3575715960b61f8e8f64c7
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.6 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.6
index 182f95b6c476..8d27f381a66f 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.6
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/chunky_png-1.3.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=229e67d858c89ce04f3eef77e452f67b
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.7 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.7
index 7a1e0545e2fc..8ce2610e5f21 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.7
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/chunky_png-1.3.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8212272f92d1e7c7ddf2c28e6d5c4db8
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.8 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.8
index 980b16b0249a..47bc0aaf0b72 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.8
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/chunky_png-1.3.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8212272f92d1e7c7ddf2c28e6d5c4db8
diff --git a/metadata/md5-cache/dev-ruby/classifier-1.3.4 b/metadata/md5-cache/dev-ruby/classifier-1.3.4
index 8d90f93dfc27..6f57186174ec 100644
--- a/metadata/md5-cache/dev-ruby/classifier-1.3.4
+++ b/metadata/md5-cache/dev-ruby/classifier-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/classifier-1.3.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9629698253ac5b1f1961c2ee3b1ea42a
diff --git a/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.4 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.4
index 4194d2e27ca2..2ae8df39e377 100644
--- a/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.4
+++ b/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/classifier-reborn/archive/2.0.4.tar.gz -> classifier-reborn-2.0.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3529a55d0d58c5464982cb98fda1aa96
diff --git a/metadata/md5-cache/dev-ruby/classifier-reborn-2.1.0 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.1.0
index ea823db1f796..4d7bab6cb98b 100644
--- a/metadata/md5-cache/dev-ruby/classifier-reborn-2.1.0
+++ b/metadata/md5-cache/dev-ruby/classifier-reborn-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/classifier-reborn/archive/v2.1.0.tar.gz -> classifier-reborn-2.1.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d829579813cde0746cfea9af3e6a7942
diff --git a/metadata/md5-cache/dev-ruby/climate_control-0.0.3 b/metadata/md5-cache/dev-ruby/climate_control-0.0.3
index 604f08c56c8d..4867500f3106 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-0.0.3
+++ b/metadata/md5-cache/dev-ruby/climate_control-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/climate_control-0.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d9ec0ed311ca4b0dff993382712ed4d8
diff --git a/metadata/md5-cache/dev-ruby/climate_control-0.1.0 b/metadata/md5-cache/dev-ruby/climate_control-0.1.0
index f880b7fa67b3..2b0939b94caf 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-0.1.0
+++ b/metadata/md5-cache/dev-ruby/climate_control-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/climate_control-0.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=517527d07e34e0f390548e0b7d8cc500
diff --git a/metadata/md5-cache/dev-ruby/climate_control-0.2.0 b/metadata/md5-cache/dev-ruby/climate_control-0.2.0
index daf1e85edbc3..8a1f66b5de47 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-0.2.0
+++ b/metadata/md5-cache/dev-ruby/climate_control-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/climate_control-0.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d708fd24efbdc9ea9752711c483c3193
diff --git a/metadata/md5-cache/dev-ruby/cliver-0.3.2 b/metadata/md5-cache/dev-ruby/cliver-0.3.2
index 0e3b595d8514..e88ba8c8c324 100644
--- a/metadata/md5-cache/dev-ruby/cliver-0.3.2
+++ b/metadata/md5-cache/dev-ruby/cliver-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/cliver-0.3.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7fddfd7d3c53cdf7fb3d525f4ee3e2a6
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1 b/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
index f0b8cb07a177..f3fe041d9248 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/cmdparse-2.0.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bffe3992cfa1eace69d871088b18ec23
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.1 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.1
index 0cdfb1804986..69fa6515ba39 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.1
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/cmdparse-3.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d470d3040ef5ebd13c90d9a18d6d95eb
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.2 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.2
index 8e9126565571..efa4b0edde92 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.2
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/cmdparse-3.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dd30698c92b8d5c1d985472997502448
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.3 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.3
index 3418cc6c482e..5f2ec68aab62 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.3
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/cmdparse-3.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4fb74b4554da6f235284d164ebb429da
diff --git a/metadata/md5-cache/dev-ruby/cocaine-0.5.8 b/metadata/md5-cache/dev-ruby/cocaine-0.5.8
index aae38c95a035..32857abae112 100644
--- a/metadata/md5-cache/dev-ruby/cocaine-0.5.8
+++ b/metadata/md5-cache/dev-ruby/cocaine-0.5.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/climate_control:0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/cocaine-0.5.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9339bd10860ce6255cf94f9fe8367b90
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2 b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
index 73bd98e49d48..e00fd96bf136 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.0.tar.gz -> coderay-1.1.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cfc64fdc8484ec534fc19e01447fc789
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.1 b/metadata/md5-cache/dev-ruby/coderay-1.1.1
index 790cab78cce1..643ee7d2be4f 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.1
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.1.tar.gz -> coderay-1.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8a60b61a88ef94a9ebfd90739b9b1f70
diff --git a/metadata/md5-cache/dev-ruby/coercible-1.0.0 b/metadata/md5-cache/dev-ruby/coercible-1.0.0
index cbdfc4dd5d06..658154eaa1ed 100644
--- a/metadata/md5-cache/dev-ruby/coercible-1.0.0
+++ b/metadata/md5-cache/dev-ruby/coercible-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/coercible-1.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5b76172451e1f5c46d2740e5a1f547c5
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.0.1 b/metadata/md5-cache/dev-ruby/coffee-rails-4.0.1
index 0438eb7ad097..0457e8ab5c6e 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.0.1
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=mirror://rubygems/coffee-rails-4.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4ffff219053832ba1c69ae3bdf1806dd
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r2 b/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r2
index cd33c70bd805..48678e3b4fc2 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/coffee-rails/archive/v4.1.1.tar.gz -> coffee-rails-4.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0bd13aa04eb63b441ab86452f1d96b4a
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.2.1-r2 b/metadata/md5-cache/dev-ruby/coffee-rails-4.2.1-r2
index f1b0f0b2405c..d785abfb2d24 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.2.1-r2
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/coffee-rails/archive/v4.2.1.tar.gz -> coffee-rails-4.2.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0663907b92ad520b43adc7954cb9cd19
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.2.2 b/metadata/md5-cache/dev-ruby/coffee-rails-4.2.2
index 4149875174d0..de1ad63976d7 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.2.2
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/coffee-rails/archive/v4.2.2.tar.gz -> coffee-rails-4.2.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b3260aa5bfa82bac44760ff23b5750dd
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1 b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
index 9edc833b67e6..780411e0780c 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/coffee-script-source[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-2.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a5078e778e137e249f979011a480db23
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.10.0 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.10.0
index 60ca9cb940f1..9b10cadb3835 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.10.0
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-source-1.10.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d7fc02420ccae42d72e9b85bdc262a2d
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.11.1 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.11.1
index eb2a76ddda59..bd3bf895e226 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.11.1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.11.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-source-1.11.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=05daf56cf0d5816768d469bb24155421
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
index 8733097fdee7..a0f35e4344ad 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-source-1.12.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=05daf56cf0d5816768d469bb24155421
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3
index 78b80ce6ef23..1d0cfa31e155 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-source-1.9.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ceb26a66766f0ab6e589390ca72f2f3e
diff --git a/metadata/md5-cache/dev-ruby/color-1.8 b/metadata/md5-cache/dev-ruby/color-1.8
index a046dabf2ec7..745ca9c5e62e 100644
--- a/metadata/md5-cache/dev-ruby/color-1.8
+++ b/metadata/md5-cache/dev-ruby/color-1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/halostatue/color/archive/v1.8.tar.gz -> color-1.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=86c886c52bde73983993e714d6a8d311
diff --git a/metadata/md5-cache/dev-ruby/colorator-0.1-r1 b/metadata/md5-cache/dev-ruby/colorator-0.1-r1
index 3739273f7e59..891ee4eaef0d 100644
--- a/metadata/md5-cache/dev-ruby/colorator-0.1-r1
+++ b/metadata/md5-cache/dev-ruby/colorator-0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/colorator-0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=37473969d619e153dcab59f204820304
diff --git a/metadata/md5-cache/dev-ruby/colorator-1.0.0 b/metadata/md5-cache/dev-ruby/colorator-1.0.0
index 82e47daa77bb..8aa98b976fe7 100644
--- a/metadata/md5-cache/dev-ruby/colorator-1.0.0
+++ b/metadata/md5-cache/dev-ruby/colorator-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/octopress/colorator/archive/v1.0.0.tar.gz -> colorator-1.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=315e4d9f364798da51e82364cdc677ab
diff --git a/metadata/md5-cache/dev-ruby/colorator-1.1.0 b/metadata/md5-cache/dev-ruby/colorator-1.1.0
index 5c0f9a627f7e..259ec5124637 100644
--- a/metadata/md5-cache/dev-ruby/colorator-1.1.0
+++ b/metadata/md5-cache/dev-ruby/colorator-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/octopress/colorator/archive/v1.1.0.tar.gz -> colorator-1.1.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=315e4d9f364798da51e82364cdc677ab
diff --git a/metadata/md5-cache/dev-ruby/colored-1.2 b/metadata/md5-cache/dev-ruby/colored-1.2
index b111fe3f6f17..15a5a35e6e9b 100644
--- a/metadata/md5-cache/dev-ruby/colored-1.2
+++ b/metadata/md5-cache/dev-ruby/colored-1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/colored-1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=758dedaaf8a86e149c6c9ecf7b24e66d
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.8.1 b/metadata/md5-cache/dev-ruby/colorize-0.8.1
index 5dc5d0c081c9..21b9c615054f 100644
--- a/metadata/md5-cache/dev-ruby/colorize-0.8.1
+++ b/metadata/md5-cache/dev-ruby/colorize-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/colorize-0.8.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=07d6a7e5dd0fc68529e5e0652cfd504e
diff --git a/metadata/md5-cache/dev-ruby/columnize-0.9.0 b/metadata/md5-cache/dev-ruby/columnize-0.9.0
index 74ba2373c6b3..5d1d6000485d 100644
--- a/metadata/md5-cache/dev-ruby/columnize-0.9.0
+++ b/metadata/md5-cache/dev-ruby/columnize-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/columnize-0.9.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=087d31cd25ae4e1e18e1640929308e64
diff --git a/metadata/md5-cache/dev-ruby/combustion-0.5.5 b/metadata/md5-cache/dev-ruby/combustion-0.5.5
index 78cb27bcdad1..c619bc55bbe1 100644
--- a/metadata/md5-cache/dev-ruby/combustion-0.5.5
+++ b/metadata/md5-cache/dev-ruby/combustion-0.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/combustion-0.5.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2835badbc10aaa45081e8fe984deb0f3
diff --git a/metadata/md5-cache/dev-ruby/combustion-0.6.0 b/metadata/md5-cache/dev-ruby/combustion-0.6.0
index f727314cc167..c9873b611b0b 100644
--- a/metadata/md5-cache/dev-ruby/combustion-0.6.0
+++ b/metadata/md5-cache/dev-ruby/combustion-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/combustion-0.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=94446527b8673119957d44ee9b512505
diff --git a/metadata/md5-cache/dev-ruby/commander-4.4.0 b/metadata/md5-cache/dev-ruby/commander-4.4.0
index c32b25cd9a3e..e3547b62eb96 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.4.0
+++ b/metadata/md5-cache/dev-ruby/commander-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/commander-4.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=30dbeb2a344f1600b4f9fffc0d66d9f9
diff --git a/metadata/md5-cache/dev-ruby/commander-4.4.1 b/metadata/md5-cache/dev-ruby/commander-4.4.1
index cf37f3fe1d7c..226c54af611c 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.4.1
+++ b/metadata/md5-cache/dev-ruby/commander-4.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby21] =d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/commander-4.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=51c76a650146fc3219f5788f750ac812
diff --git a/metadata/md5-cache/dev-ruby/commander-4.4.2 b/metadata/md5-cache/dev-ruby/commander-4.4.2
index d5397d8a89c0..d576bb6128dd 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.4.2
+++ b/metadata/md5-cache/dev-ruby/commander-4.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby21] =d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/commander-4.4.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=51c76a650146fc3219f5788f750ac812
diff --git a/metadata/md5-cache/dev-ruby/commander-4.4.3 b/metadata/md5-cache/dev-ruby/commander-4.4.3
index ce89296771a7..b0ac0e690799 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.4.3
+++ b/metadata/md5-cache/dev-ruby/commander-4.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby21] =d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/commander-4.4.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dd82e6ffcaf8b90ed377f752911c9995
diff --git a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1 b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
index 65c5211811b2..ddf5ac5cacae 100644
--- a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/compass-1.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=eb9d4be067dcf6676082784edb33c048
diff --git a/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1 b/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
index fc8a21b60fb1..29ce1ff30b08 100644
--- a/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/compass-core-1.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fae2e84483b9615a4366e78ea239c07a
diff --git a/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5 b/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
index c803c95ab6f9..699b03798618 100644
--- a/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
+++ b/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby21] <dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/compass-import-once-1.0.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a1b12df06516cf5977ea7f0a764ed409
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.4 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.4
index 8304d95ee348..5442525a171d 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.4
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.0.4.tar.gz -> concurrent-ruby-1.0.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c834e6c5f7af53f25d7d5ca49f21f3f7
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
index 647999bfc279..ce1f050f25f7 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.0.5.tar.gz -> concurrent-ruby-1.0.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7199380701deb61bf83183673fcf1db2
diff --git a/metadata/md5-cache/dev-ruby/configliere-0.4.22 b/metadata/md5-cache/dev-ruby/configliere-0.4.22
index e3d008248958..75c263d70cb6 100644
--- a/metadata/md5-cache/dev-ruby/configliere-0.4.22
+++ b/metadata/md5-cache/dev-ruby/configliere-0.4.22
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/configliere-0.4.22.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=55fa019ffbf120c10c584f19c6955890
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.0 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.0
index 433d3d1c4ec6..d8d5906339cd 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.0
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/connection_pool-2.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=498c9a65340a04e8adc70cba93f61fad
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.1 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.1
index 1dbd678c7e0f..ae3d05e1e09d 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.1
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/connection_pool-2.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d7de376b85d4b79e6c6eb757c6ebc4dd
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.14.0 b/metadata/md5-cache/dev-ruby/contracts-0.14.0
index e982162137e3..bd0377a888bc 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.14.0
+++ b/metadata/md5-cache/dev-ruby/contracts-0.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/contracts-0.14.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=73c21e247c7844135c3c5da3db756e6e
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.15.0 b/metadata/md5-cache/dev-ruby/contracts-0.15.0
index 0c2ac1977541..0e5977302d12 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.15.0
+++ b/metadata/md5-cache/dev-ruby/contracts-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/contracts-0.15.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e455567b8ee2eba5f223838b5dc55df0
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.16.0 b/metadata/md5-cache/dev-ruby/contracts-0.16.0
index 42dfd4e3fc54..656bad5ee6ca 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.16.0
+++ b/metadata/md5-cache/dev-ruby/contracts-0.16.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/contracts-0.16.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=322f76bcc151a2757c59e28bd3eefa91
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.4.2 b/metadata/md5-cache/dev-ruby/coolio-1.4.2
index 842e51907e14..1e19642c9de3 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.4.2
+++ b/metadata/md5-cache/dev-ruby/coolio-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libev-4.20 ruby_targets_ruby21? ( >=dev-ruby/iobuffer-1[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cool.io-1.4.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d6813dbadb1ffc56e37f8e05eab57737
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.4.5 b/metadata/md5-cache/dev-ruby/coolio-1.4.5
index b03369576ff0..4e0d3b3df544 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.4.5
+++ b/metadata/md5-cache/dev-ruby/coolio-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libev-4.20 ruby_targets_ruby21? ( >=dev-ruby/iobuffer-1[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/cool.io-1.4.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cb9e132e8a9249be536846bc37494a06
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.5.0 b/metadata/md5-cache/dev-ruby/coolio-1.5.0
index c50830af4fc5..5af686bff0d7 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.5.0
+++ b/metadata/md5-cache/dev-ruby/coolio-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/cool.io-1.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d964e6997a2c79d24ec6256034a8ca65
diff --git a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1 b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
index 18983e6538fa..6b45c2d9a72b 100644
--- a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/countdownlatch-1.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=98880b492aaf4b43f74d946a7a4f804b
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.2-r1 b/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
index a4e490830397..ceef797330c3 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/crack-0.4.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=787bc59046f4a97414171b4facad314a
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.3 b/metadata/md5-cache/dev-ruby/crack-0.4.3
index 5affef687101..7ca29849a615 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.3
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/crack-0.4.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=51681ba4b103940146e9d2707dd180d5
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.3-r1 b/metadata/md5-cache/dev-ruby/crack-0.4.3-r1
index c8bbee1e0e3f..8c2e60d9bde4 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.3-r1
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/crack-0.4.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4138a17089ffff302b489985355b2f1f
diff --git a/metadata/md5-cache/dev-ruby/crass-1.0.2 b/metadata/md5-cache/dev-ruby/crass-1.0.2
index 682d52b45d6c..067b937e1f13 100644
--- a/metadata/md5-cache/dev-ruby/crass-1.0.2
+++ b/metadata/md5-cache/dev-ruby/crass-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/crass-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=301723d51329f2f09dd1b9892cbbb8c9
diff --git a/metadata/md5-cache/dev-ruby/creole-0.5.0 b/metadata/md5-cache/dev-ruby/creole-0.5.0
index 5c708a0b211f..e9325d994721 100644
--- a/metadata/md5-cache/dev-ruby/creole-0.5.0
+++ b/metadata/md5-cache/dev-ruby/creole-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/minad/creole/archive/v0.5.0.tar.gz -> creole-0.5.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9ac757b8fe4e70e8d0361e9879075bce
diff --git a/metadata/md5-cache/dev-ruby/cri-2.7.1 b/metadata/md5-cache/dev-ruby/cri-2.7.1
index de7990137458..e03ed31b30bd 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.7.1
+++ b/metadata/md5-cache/dev-ruby/cri-2.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/cri-2.7.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f0247d039f0eb1dba5279caf8da2652d
diff --git a/metadata/md5-cache/dev-ruby/cri-2.8.0 b/metadata/md5-cache/dev-ruby/cri-2.8.0
index 0db4e784f218..3b82f458bfab 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.8.0
+++ b/metadata/md5-cache/dev-ruby/cri-2.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/cri-2.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=31b401264b598ab7225959793dcc0809
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.4.10 b/metadata/md5-cache/dev-ruby/css_parser-1.4.10
index b9875d66dad1..fa26dcd61d80 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.4.10
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.4.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] virtual
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.4.10.tar.gz -> css_parser-1.4.10.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2fad50f998127e21962ad45640df2091
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.4.8 b/metadata/md5-cache/dev-ruby/css_parser-1.4.8
index 629c91c59657..246f8fb25d7b 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.4.8
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.4.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] virtual
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.4.8.tar.gz -> css_parser-1.4.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2fad50f998127e21962ad45640df2091
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.4.9 b/metadata/md5-cache/dev-ruby/css_parser-1.4.9
index 2192bd8be9a0..ed4875b9eb91 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.4.9
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.4.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] virtual
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.4.9.tar.gz -> css_parser-1.4.9.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2fad50f998127e21962ad45640df2091
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.5.0 b/metadata/md5-cache/dev-ruby/css_parser-1.5.0
index 57d0ab73b7b5..18c8b563b9aa 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.5.0
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] virtual
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.5.0.tar.gz -> css_parser-1.5.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1216fbac31f4d32c01e7c43a364a7bc5
diff --git a/metadata/md5-cache/dev-ruby/curb-0.9.3 b/metadata/md5-cache/dev-ruby/curb-0.9.3
index 053d68fa2d76..180bf3e5f8c8 100644
--- a/metadata/md5-cache/dev-ruby/curb-0.9.3
+++ b/metadata/md5-cache/dev-ruby/curb-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl[ssl] ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/curb-0.9.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=401de3bb6b457cf61eaef3483b5adf39
diff --git a/metadata/md5-cache/dev-ruby/curses-1.1.3 b/metadata/md5-cache/dev-ruby/curses-1.1.3
index 5d78501a98bc..7b5e7c40a19f 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.1.3
+++ b/metadata/md5-cache/dev-ruby/curses-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/curses-1.1.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=127c9c8aa4acce3dcfc0c77e75a65a0d
diff --git a/metadata/md5-cache/dev-ruby/curses-1.2.1 b/metadata/md5-cache/dev-ruby/curses-1.2.1
index b3a43b642088..36727c0f5503 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.2.1
+++ b/metadata/md5-cache/dev-ruby/curses-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/curses-1.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=127c9c8aa4acce3dcfc0c77e75a65a0d
diff --git a/metadata/md5-cache/dev-ruby/curses-1.2.2 b/metadata/md5-cache/dev-ruby/curses-1.2.2
index 44b3c1227c6f..016e3bb9aad0 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.2.2
+++ b/metadata/md5-cache/dev-ruby/curses-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/curses-1.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2ff0b829141d7367a8379f4acfef1dcd
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-3.5.16 b/metadata/md5-cache/dev-ruby/d3_rails-3.5.16
index 061f7a114bda..ae1df163ccd1 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-3.5.16
+++ b/metadata/md5-cache/dev-ruby/d3_rails-3.5.16
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/d3_rails-3.5.16.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=211d23cb20d070f5683e317de1e6ac1f
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-3.5.17 b/metadata/md5-cache/dev-ruby/d3_rails-3.5.17
index d85e34766527..a6eaec460bca 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-3.5.17
+++ b/metadata/md5-cache/dev-ruby/d3_rails-3.5.17
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/d3_rails-3.5.17.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=211d23cb20d070f5683e317de1e6ac1f
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-4.1.1 b/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
index ee3d89680d30..7428a03e6b5d 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
+++ b/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/d3_rails-4.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9546fa81c4be82b0fe4f7c293bd22524
diff --git a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1 b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
index dd6d4a147c46..cf82e4c5f245 100644
--- a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/daemon_controller-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=59aebfa7b05b181d6f7ac67fc3f0d179
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.2.3 b/metadata/md5-cache/dev-ruby/daemons-1.2.3
index b13b3311b525..9995f30f0e9e 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.2.3
+++ b/metadata/md5-cache/dev-ruby/daemons-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/daemons-1.2.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d0b8cf009f4e3d025709b328ee5df358
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.2.4 b/metadata/md5-cache/dev-ruby/daemons-1.2.4
index 633607b65527..eae80aa1206d 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.2.4
+++ b/metadata/md5-cache/dev-ruby/daemons-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.2.4.tar.gz -> daemons-1.2.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d58970d59af711809578d853088d6032
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.6 b/metadata/md5-cache/dev-ruby/dalli-2.7.6
index cadc33b99005..4ed6bdd47010 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.6
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.6.tar.gz -> dalli-2.7.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5991a6532e73db0d967cf5063ab65700
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.5.3 b/metadata/md5-cache/dev-ruby/database_cleaner-1.5.3
index f8c752932b12..1c455384fabb 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.5.3
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/database_cleaner-1.5.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bccc4884d529207f78ae6b346f16fd8d
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.6.0 b/metadata/md5-cache/dev-ruby/database_cleaner-1.6.0
index 64ff9aea03b7..5053481bd06c 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.6.0
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/database_cleaner-1.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6cb7a57e45b78a60690986fc0546bb52
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.6.1 b/metadata/md5-cache/dev-ruby/database_cleaner-1.6.1
index fd5d24324e0f..b53cbc14bbb1 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.6.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/database_cleaner-1.6.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6cb7a57e45b78a60690986fc0546bb52
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.9.0 b/metadata/md5-cache/dev-ruby/date_validator-0.9.0
index 07e7868467b5..2bdbbc929019 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.9.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/date_validator-0.9.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c3e7c72c1ee879a5c07ead727d09cef0
diff --git a/metadata/md5-cache/dev-ruby/dbf-2.0.13 b/metadata/md5-cache/dev-ruby/dbf-2.0.13
index 8d6cd6401ac2..a43c520f23fe 100644
--- a/metadata/md5-cache/dev-ruby/dbf-2.0.13
+++ b/metadata/md5-cache/dev-ruby/dbf-2.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-2.0.13.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8c668b9643d1c387bbd9509a1edb0159
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.0.8 b/metadata/md5-cache/dev-ruby/dbf-3.0.8
index 182bb7930439..eadcc317f460 100644
--- a/metadata/md5-cache/dev-ruby/dbf-3.0.8
+++ b/metadata/md5-cache/dev-ruby/dbf-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-3.0.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=201d9ae7655099f8df6469ffa2b4faaa
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.1.0 b/metadata/md5-cache/dev-ruby/dbf-3.1.0
index 23e89f7c0646..c519459bcbca 100644
--- a/metadata/md5-cache/dev-ruby/dbf-3.1.0
+++ b/metadata/md5-cache/dev-ruby/dbf-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-3.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=09fa79f0ca3c3bff190df23dc634f7b8
diff --git a/metadata/md5-cache/dev-ruby/ddplugin-1.0.1 b/metadata/md5-cache/dev-ruby/ddplugin-1.0.1
index 15c06c04d76c..bd96b18fa369 100644
--- a/metadata/md5-cache/dev-ruby/ddplugin-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ddplugin-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/ddplugin-1.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3866b8f5000ad56990acbe371971a976
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2 b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
index 7f7113df97d2..80cf43f2530b 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/debug_inspector-0.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a53a6313756ba765c6e6f7b3ab618f02
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3 b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
index e3ebde82bce4..fff8b07014c2 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/debug_inspector-0.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c218063d526fc3af0935f636db08374c
diff --git a/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0 b/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
index a00c90fef8e8..64ef870f8478 100644
--- a/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
+++ b/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/debugger-linecache-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f1852f6dba375d1113efb34ffa85b521
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.0.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
index e3996b586534..9876c4bbb452 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/deep_merge-1.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cb9b4167096c7b96436b545874c06561
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.1.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.1.1
index e1c7ccaf08ce..ea73f009cc8a 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.1.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/deep_merge-1.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=634479b82d08f37a6f467d3c8c378230
diff --git a/metadata/md5-cache/dev-ruby/delayer-0.0.2 b/metadata/md5-cache/dev-ruby/delayer-0.0.2
index 82cde9348b69..bfbd712729cd 100644
--- a/metadata/md5-cache/dev-ruby/delayer-0.0.2
+++ b/metadata/md5-cache/dev-ruby/delayer-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/delayer-0.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1103a1fe22f27b48ee9ac06c1a275bad
diff --git a/metadata/md5-cache/dev-ruby/delayer-deferred-1.0.4 b/metadata/md5-cache/dev-ruby/delayer-deferred-1.0.4
index 6f0dfb7a5f88..03a35db51920 100644
--- a/metadata/md5-cache/dev-ruby/delayer-deferred-1.0.4
+++ b/metadata/md5-cache/dev-ruby/delayer-deferred-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/delayer-deferred-1.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7fff6ac8916777954b62e30f20a14e6f
diff --git a/metadata/md5-cache/dev-ruby/delayer-deferred-1.1.1 b/metadata/md5-cache/dev-ruby/delayer-deferred-1.1.1
index 8bb628c23be4..ad0869de6eae 100644
--- a/metadata/md5-cache/dev-ruby/delayer-deferred-1.1.1
+++ b/metadata/md5-cache/dev-ruby/delayer-deferred-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/delayer-deferred-1.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f2af1273200203c08b840e69b5072ce0
diff --git a/metadata/md5-cache/dev-ruby/dep_selector-0.1.1-r1 b/metadata/md5-cache/dev-ruby/dep_selector-0.1.1-r1
index d7451bbbe1c7..482a7551630f 100644
--- a/metadata/md5-cache/dev-ruby/dep_selector-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/dep_selector-0.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gecode-3.5.0 <dev-libs/gecode-4 ruby_targets_ruby21? ( dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/opscode/dep-selector/archive/0.1.1.tar.gz -> dep_selector-0.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2aa86f67ee86090cfe974129685c7f39
diff --git a/metadata/md5-cache/dev-ruby/dependor-1.0.1 b/metadata/md5-cache/dev-ruby/dependor-1.0.1
index c124a911d770..06f745b93511 100644
--- a/metadata/md5-cache/dev-ruby/dependor-1.0.1
+++ b/metadata/md5-cache/dev-ruby/dependor-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/dependor-1.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cddddec9a7b52ab281b99852409a114c
diff --git a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2 b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
index 31dac86be511..e589deca37f3 100644
--- a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/deprecated-3.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ff7ce41f73190f3c89334b4409694316
diff --git a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4 b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
index 038efc89b03e..e3385ed57e73 100644
--- a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
+++ b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/thread_safe[ruby_targets_ruby21] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/descendants_tracker-0.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a5bd60973a90dfc7eb37d82fa23ccc16
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.0.2 b/metadata/md5-cache/dev-ruby/did_you_mean-1.0.2
index a34a447cb460..c110b98823a4 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.0.2
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/did_you_mean-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=079691d3631dd62ee42dccd3b056a20b
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.1.0 b/metadata/md5-cache/dev-ruby/did_you_mean-1.1.0
index 88911deeb35b..39173a504b7e 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.1.0
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby24 )
 SLOT=2.4
 SRC_URI=mirror://rubygems/did_you_mean-1.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5d5ad1135bdc23550b0ee7665c0c87a4
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.1.2 b/metadata/md5-cache/dev-ruby/did_you_mean-1.1.2
index f2ec89ea23f6..6ed2fed6380d 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.1.2
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby24 )
 SLOT=2.4
 SRC_URI=mirror://rubygems/did_you_mean-1.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5d5ad1135bdc23550b0ee7665c0c87a4
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1 b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
index 165a235eb5f7..9a44686f7aa9 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/diff-lcs-1.2.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f43f12e36fa932d486840332be8fffdb
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.3 b/metadata/md5-cache/dev-ruby/diff-lcs-1.3
index b647ec6cfd29..0b85a708c6cf 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.3
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/diff-lcs-1.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=23c8a52c720a190a037bf5edd12b8871
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.59.3 b/metadata/md5-cache/dev-ruby/dnsruby-1.59.3
index 5654a7934766..b4a109bcec45 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.59.3
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.59.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/dnsruby-1.59.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c706f1f8f7179759fbc510dcb82bfdfb
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.60.0 b/metadata/md5-cache/dev-ruby/dnsruby-1.60.0
index f622d0582328..1bf062e0b126 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.60.0
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.60.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/dnsruby-1.60.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c706f1f8f7179759fbc510dcb82bfdfb
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.60.1 b/metadata/md5-cache/dev-ruby/dnsruby-1.60.1
index 87e957a76691..38c23c2fbc0b 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.60.1
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.60.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/dnsruby-1.60.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2d7bfdb115dc47353c8f3057bf773959
diff --git a/metadata/md5-cache/dev-ruby/docile-1.1.5 b/metadata/md5-cache/dev-ruby/docile-1.1.5
index 6b8ce4d3890e..f75d595610d8 100644
--- a/metadata/md5-cache/dev-ruby/docile-1.1.5
+++ b/metadata/md5-cache/dev-ruby/docile-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/docile-1.1.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6168647eb7e0144d805b4fc0afa6cf33
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20161021 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20161021
index 035526f36925..5bb4049610b9 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20161021
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20161021
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/domain_name-0.5.20161021.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=003d675bb444291b1aa26f81b9784d32
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20161129 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20161129
index 186caa3a53d9..72aa645c3a5d 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20161129
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20161129
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/domain_name-0.5.20161129.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=003d675bb444291b1aa26f81b9784d32
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20170223 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20170223
index c5f906ae762c..f14586778c7b 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20170223
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20170223
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/domain_name-0.5.20170223.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=74df6cc257e9b124cbad3ce3b2d6fbe0
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20170404 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20170404
index 88d408c034ea..3cbd41ec3895 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20170404
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20170404
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/domain_name-0.5.20170404.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=74df6cc257e9b124cbad3ce3b2d6fbe0
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.24 b/metadata/md5-cache/dev-ruby/domain_name-0.5.24
index 0977f23120b7..db17ff23e112 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.24
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.24
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/domain_name-0.5.24.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c5ad6f2f06e688a1da6a0349e9575cba
diff --git a/metadata/md5-cache/dev-ruby/dotenv-2.1.1 b/metadata/md5-cache/dev-ruby/dotenv-2.1.1
index f608343005dc..6407c3f94a8b 100644
--- a/metadata/md5-cache/dev-ruby/dotenv-2.1.1
+++ b/metadata/md5-cache/dev-ruby/dotenv-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/bkeepers/dotenv/archive/v2.1.1.tar.gz -> dotenv-2.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=49d6c1f8ddf6c90c4a1b1b7b3839d5de
diff --git a/metadata/md5-cache/dev-ruby/dotenv-2.2.0 b/metadata/md5-cache/dev-ruby/dotenv-2.2.0
index a82c1f37ef7b..7aee8c5df729 100644
--- a/metadata/md5-cache/dev-ruby/dotenv-2.2.0
+++ b/metadata/md5-cache/dev-ruby/dotenv-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/bkeepers/dotenv/archive/v2.2.0.tar.gz -> dotenv-2.2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c223eab89f8c9b774a24368a17492129
diff --git a/metadata/md5-cache/dev-ruby/dotenv-2.2.1 b/metadata/md5-cache/dev-ruby/dotenv-2.2.1
index fbedf8d20b93..0aad0be58cf9 100644
--- a/metadata/md5-cache/dev-ruby/dotenv-2.2.1
+++ b/metadata/md5-cache/dev-ruby/dotenv-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/bkeepers/dotenv/archive/v2.2.1.tar.gz -> dotenv-2.2.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=68a044b4916a2a68bb1641bbd096a890
diff --git a/metadata/md5-cache/dev-ruby/dust-0.1.7-r2 b/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
index 61c9a5c49148..d18ba08db234 100644
--- a/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
+++ b/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/dust-0.1.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fb20d7a2c5efb8d70449f18ed1cd1bf3
diff --git a/metadata/md5-cache/dev-ruby/equalizer-0.0.11 b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
index 91213ca330b1..90e7b6d09d4d 100644
--- a/metadata/md5-cache/dev-ruby/equalizer-0.0.11
+++ b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/equalizer-0.0.11.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=371a46df5723262903aae3d952bc9e55
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.6.0 b/metadata/md5-cache/dev-ruby/erubi-1.6.0
index 4a8e4a4f1557..2d51851c4eec 100644
--- a/metadata/md5-cache/dev-ruby/erubi-1.6.0
+++ b/metadata/md5-cache/dev-ruby/erubi-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/erubi-1.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fa110af633b026a07a35897ac97f4012
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
index 66a99f8bd1cd..c7f573a4f4ae 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/erubis-2.7.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ad9b758dae523eeb726a932247a0ae75
diff --git a/metadata/md5-cache/dev-ruby/escape_utils-1.2.0 b/metadata/md5-cache/dev-ruby/escape_utils-1.2.0
index fc325b8d5e0c..38250bc34f4d 100644
--- a/metadata/md5-cache/dev-ruby/escape_utils-1.2.0
+++ b/metadata/md5-cache/dev-ruby/escape_utils-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/escape_utils-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=85a65e204b97a293283b2defb3e9887e
diff --git a/metadata/md5-cache/dev-ruby/escape_utils-1.2.1 b/metadata/md5-cache/dev-ruby/escape_utils-1.2.1
index 27bb9e701e6b..325dd91a6447 100644
--- a/metadata/md5-cache/dev-ruby/escape_utils-1.2.1
+++ b/metadata/md5-cache/dev-ruby/escape_utils-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/escape_utils-1.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=85a65e204b97a293283b2defb3e9887e
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.10.1 b/metadata/md5-cache/dev-ruby/ethon-0.10.1
index b8521da7a1e5..da25cf61be3c 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.10.1
+++ b/metadata/md5-cache/dev-ruby/ethon-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl ruby_targets_ruby21? ( >=dev-ruby/ffi-1.3.0[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ethon-0.10.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=96ea2075dfe80141b24f247cd04e134b
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.9.1 b/metadata/md5-cache/dev-ruby/ethon-0.9.1
index 23b4ff711fcd..bbb32d942552 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.9.1
+++ b/metadata/md5-cache/dev-ruby/ethon-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl ruby_targets_ruby21? ( >=dev-ruby/ffi-1.3.0[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ethon-0.9.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3106d2bbf5f20b40b3e58bbe7c3d3be1
diff --git a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0 b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
index c05027436f24..3e8aa0673f26 100644
--- a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
+++ b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/evented-spec-0.9.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=59f7e6b38ea6c2bae4bcfca79cc2a455
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1 b/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
index d81a13f7a418..478d9200dd83 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/eventmachine-1.0.9.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=00d39dc2c8ab693f670a89933dde0b19
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.2.0.1 b/metadata/md5-cache/dev-ruby/eventmachine-1.2.0.1
index 234003ae468e..8cd46d74c4d6 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.2.0.1
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.2.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/eventmachine-1.2.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5dfb1ec294dd630f49571c3e4377ff06
diff --git a/metadata/md5-cache/dev-ruby/execjs-1.4.0 b/metadata/md5-cache/dev-ruby/execjs-1.4.0
index d78f4ca33aa9..6ba2ef38c53a 100644
--- a/metadata/md5-cache/dev-ruby/execjs-1.4.0
+++ b/metadata/md5-cache/dev-ruby/execjs-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=https://github.com/sstephenson/execjs/tarball/v1.4.0 -> execjs-1.4.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4c2d194cd80644102a832a8e587183cb
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.6.0 b/metadata/md5-cache/dev-ruby/execjs-2.6.0
index 7d13d6175ed5..a6660ef8860f 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.6.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.6.0.tar.gz -> execjs-2.6.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=846eb7641584da5cfb6a28649d8e6b35
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.7.0 b/metadata/md5-cache/dev-ruby/execjs-2.7.0
index 3b30da782205..4faa2c2ebb83 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.7.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.7.0.tar.gz -> execjs-2.7.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1a02528799956d3494374ab8744694db
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.2.4 b/metadata/md5-cache/dev-ruby/exifr-1.2.4
index 07daaba2b419..788440c0f883 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.2.4
+++ b/metadata/md5-cache/dev-ruby/exifr-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/exifr-1.2.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a8c2e28afe2db030080822457f4134de
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.2.5 b/metadata/md5-cache/dev-ruby/exifr-1.2.5
index 354277b0aaee..17f85f449efe 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.2.5
+++ b/metadata/md5-cache/dev-ruby/exifr-1.2.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/exifr-1.2.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=465a2c1d2bc371de946030653b45e038
diff --git a/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518 b/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
index 04585994b921..eaf52f26c8aa 100644
--- a/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
+++ b/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/nricciar/expression_parser/archive/6e3c7973423ff0f2cd33db2304fcd4eac3af01ad.tar.gz -> expression_parser-0.9.0_p20130518.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e7e438b10393d9aeb329f9a6d7b026b1
diff --git a/metadata/md5-cache/dev-ruby/facets-3.1.0 b/metadata/md5-cache/dev-ruby/facets-3.1.0
index c88f04b1dbee..c6a2c2fe0489 100644
--- a/metadata/md5-cache/dev-ruby/facets-3.1.0
+++ b/metadata/md5-cache/dev-ruby/facets-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/facets-3.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=47df9c905deea7e00bbcaa0c0bd6426f
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.6 b/metadata/md5-cache/dev-ruby/facter-2.4.6
index 5e324ce9cdc8..47c284496a43 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.6
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.6
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( s
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/facter-2.4.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f6f863677887b49477c17b7bb7753d08
diff --git a/metadata/md5-cache/dev-ruby/facter-3.1.4-r1 b/metadata/md5-cache/dev-ruby/facter-3.1.4-r1
index 61a1f2a83155..3f9bf14a6bfb 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/facter-3.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/facter/facter-3.1.4.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=18df6bf2732aadb81048743bc05321f2
diff --git a/metadata/md5-cache/dev-ruby/facter-3.1.8 b/metadata/md5-cache/dev-ruby/facter-3.1.8
index b9d8e9ba0821..94234cb7b589 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.1.8
+++ b/metadata/md5-cache/dev-ruby/facter-3.1.8
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-libs/leatherman-0
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.1.8.tar.gz -> facter-3.1.8.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b1e7a5e7b4e4558cf810e5297d10870b
diff --git a/metadata/md5-cache/dev-ruby/facter-3.6.1 b/metadata/md5-cache/dev-ruby/facter-3.6.1
index d827e75d7598..7fe8e8ee9954 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.6.1
+++ b/metadata/md5-cache/dev-ruby/facter-3.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.6.1.tar.gz -> facter-3.6.1.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9c42631105bdf73cbe865b597f038362
diff --git a/metadata/md5-cache/dev-ruby/facter-3.6.3 b/metadata/md5-cache/dev-ruby/facter-3.6.3
index 5d52dc15e69c..b2d542276fbb 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.6.3
+++ b/metadata/md5-cache/dev-ruby/facter-3.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.6.3.tar.gz -> facter-3.6.3.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3dcb928b14e1c3c781cdee7a3334303c
diff --git a/metadata/md5-cache/dev-ruby/facter-3.6.3-r1 b/metadata/md5-cache/dev-ruby/facter-3.6.3-r1
index 62404339612c..d4d2fde96830 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.6.3-r1
+++ b/metadata/md5-cache/dev-ruby/facter-3.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.6.3.tar.gz -> facter-3.6.3.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7a3c6a0a4c3eaca694df46e61b35cd98
diff --git a/metadata/md5-cache/dev-ruby/facter-3.6.4 b/metadata/md5-cache/dev-ruby/facter-3.6.4
index 7bf6e6d8004e..13e4209c1645 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.6.4
+++ b/metadata/md5-cache/dev-ruby/facter-3.6.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.6.4.tar.gz -> facter-3.6.4.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7a3c6a0a4c3eaca694df46e61b35cd98
diff --git a/metadata/md5-cache/dev-ruby/facter-9999 b/metadata/md5-cache/dev-ruby/facter-9999
index a860add3c3c5..c2a2a9b3316e 100644
--- a/metadata/md5-cache/dev-ruby/facter-9999
+++ b/metadata/md5-cache/dev-ruby/facter-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !<app-admin/puppet-4.0.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c95159b942f8de025bb870cad9b996de
diff --git a/metadata/md5-cache/dev-ruby/factory_girl-4.7.0 b/metadata/md5-cache/dev-ruby/factory_girl-4.7.0
index 9c86afa25dfb..75d986c90d84 100644
--- a/metadata/md5-cache/dev-ruby/factory_girl-4.7.0
+++ b/metadata/md5-cache/dev-ruby/factory_girl-4.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/factory_girl/archive/v4.7.0.tar.gz -> factory_girl-4.7.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7d0e6b85bbd3eae37f4f6713b022045d
diff --git a/metadata/md5-cache/dev-ruby/factory_girl-4.8.0 b/metadata/md5-cache/dev-ruby/factory_girl-4.8.0
index 6f995378993a..7057324ad050 100644
--- a/metadata/md5-cache/dev-ruby/factory_girl-4.8.0
+++ b/metadata/md5-cache/dev-ruby/factory_girl-4.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/factory_girl/archive/v4.8.0.tar.gz -> factory_girl-4.8.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=45eb4043b95f9cdf867926bb337f7c55
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.10.2 b/metadata/md5-cache/dev-ruby/fakefs-0.10.2
index 4ed30bdd3715..5735ad4d46a7 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.10.2
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v0.10.2.tar.gz -> fakefs-0.10.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b6003ab428cf2d352c39b3873a569a13
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.11.0 b/metadata/md5-cache/dev-ruby/fakefs-0.11.0
index 95bb6127f935..9dd10617a9c4 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.11.0
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v0.11.0.tar.gz -> fakefs-0.11.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b6003ab428cf2d352c39b3873a569a13
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1 b/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
index 63f6c41618b6..343264d0f2b5 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=903ef37a25ab5bbceac1f52c3b1ff97f
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.9.2 b/metadata/md5-cache/dev-ruby/fakefs-0.9.2
index c42cf96b1d8a..87ac346cda37 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.9.2
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v0.9.2.tar.gz -> fakefs-0.9.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3bf3a903f6d7e6ed1fff945ff878f354
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.9.3 b/metadata/md5-cache/dev-ruby/fakefs-0.9.3
index a1bb9d99abe0..9b2c4ab01277 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.9.3
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v0.9.3.tar.gz -> fakefs-0.9.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e2e0410d1cbf400615d01355d505cf4d
diff --git a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r2 b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r2
index 8053e18380dc..0fcd0729b384 100644
--- a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r2
+++ b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakeweb-1.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0b7fc69f509a6a679f914ef50ff3fbd2
diff --git a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0.20131201 b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0.20131201
index 8999cffa9955..2bd51d0e1201 100644
--- a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0.20131201
+++ b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0.20131201
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/chrisk/fakeweb/archive/48208f9bf053577befe5723746b6ff35b99b45d0.tar.gz -> fakeweb-1.3.0.20131201.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ed8c4a4e511f7f47b2d383f8e3c0b68e
diff --git a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0.20131201-r1 b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0.20131201-r1
index a7a40395d4ae..4fd2fead6450 100644
--- a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0.20131201-r1
+++ b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0.20131201-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/chrisk/fakeweb/archive/48208f9bf053577befe5723746b6ff35b99b45d0.tar.gz -> fakeweb-1.3.0.20131201.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0a2f8ae6c06d99d77fe25aed6193c83a
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.11.0 b/metadata/md5-cache/dev-ruby/faraday-0.11.0
index 5c2321ccc525..1573afa4c8a4 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.11.0
+++ b/metadata/md5-cache/dev-ruby/faraday-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.11.0.tar.gz -> faraday-0.11.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ffe6acb32605ced0fbafbd9535f8ffe3
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.12.0.1 b/metadata/md5-cache/dev-ruby/faraday-0.12.0.1
index 70f1f4d16bfe..d6323e13509b 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.12.0.1
+++ b/metadata/md5-cache/dev-ruby/faraday-0.12.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.12.0.1.tar.gz -> faraday-0.12.0.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ffe6acb32605ced0fbafbd9535f8ffe3
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.12.1 b/metadata/md5-cache/dev-ruby/faraday-0.12.1
index 779fe3ec73e6..ed5713ee00dd 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.12.1
+++ b/metadata/md5-cache/dev-ruby/faraday-0.12.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.12.1.tar.gz -> faraday-0.12.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5a9ccba0060873e139af5e6225b332fe
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1 b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1
index 30ce3e5346b8..d4254a97042f 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1
+++ b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby
 REQUIRED_USE=|| ( 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_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=33d2cf1e50910e91dd5513bbdafb6a7e
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r2 b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r2
index 3ba6cf5b6e2c..7494527081ee 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r2
+++ b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.9.2.tar.gz -> faraday-0.9.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c1c3e30be1fc0eed39c69b4655becc06
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0
index 4821d78042e9..f80c8ef7ff6d 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] <de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v0.10.0.tar.gz -> faraday_middleware-0.10.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a0c3a9347e547c3aa3af802f52d0ba85
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.11.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.11.0
index 92191cb02e2a..65c4bda25c6d 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.11.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] <de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v0.11.0.tar.gz -> faraday_middleware-0.11.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=06d7fb30d5c1b2fafa30f5ba1efda4f5
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.9.2 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.9.2
index 422e8433c364..b6c84c5bb948 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.9.2
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] <de
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v0.9.2.tar.gz -> faraday_middleware-0.9.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4a7e2b82ae662a120a2f017abfd102d3
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6 b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6
index 2910822ab20d..80edfdf35b00 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/faraday_middleware[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/denro/faraday_middleware-multi_json/archive/v0.0.6.tar.gz -> faraday_middleware-multi_json-0.0.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=217a7e77f02296d90e359e3fd3fd58e1
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
index 25cb18f87b41..3d9e31a26a75 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/fast-stemmer-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e7461513bed8d367e06bbd655f24ef66
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.0.0 b/metadata/md5-cache/dev-ruby/fast_gettext-1.0.0
index a4027e685a72..a0106d21e96c 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.0.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.0.0.tar.gz -> fast_gettext-1.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b87001628ebe3a91fd453d26c72895ec
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.1.0 b/metadata/md5-cache/dev-ruby/fast_gettext-1.1.0
index fabc8061d859..33d9377174b7 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.1.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.1.0.tar.gz -> fast_gettext-1.1.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b87001628ebe3a91fd453d26c72895ec
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.2.0 b/metadata/md5-cache/dev-ruby/fast_gettext-1.2.0
index 57ff89b72abe..dd64fa4f8abc 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.2.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.2.0.tar.gz -> fast_gettext-1.2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7d69db019627cad496048d9bdcb05502
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.3.0 b/metadata/md5-cache/dev-ruby/fast_gettext-1.3.0
index 46dbcfd2ca8b..26cfe15d6168 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.3.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.3.0.tar.gz -> fast_gettext-1.3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7d69db019627cad496048d9bdcb05502
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.4.0 b/metadata/md5-cache/dev-ruby/fast_gettext-1.4.0
index 72a6ac7b0c7a..1a073dae444b 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.4.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.4.0.tar.gz -> fast_gettext-1.4.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4fde2a8c8964cf9e16cd37eba872f2b4
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
index 8cc60d99a268..2789ea717bda 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/fast_xs-0.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ef8e18e8f938d27cc47bf6f736764243
diff --git a/metadata/md5-cache/dev-ruby/fattr-2.3.0 b/metadata/md5-cache/dev-ruby/fattr-2.3.0
index 67cbace1a34d..87ad333f8e22 100644
--- a/metadata/md5-cache/dev-ruby/fattr-2.3.0
+++ b/metadata/md5-cache/dev-ruby/fattr-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/fattr-2.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d1bdf242288738eeada2774b25782f99
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
index ca9704ba3f6c..238cdb87acef 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/fcgi ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/fcgi-0.9.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a02e856db1bae8f2f4194240c7c84e2d
diff --git a/metadata/md5-cache/dev-ruby/ferret-0.11.8.6 b/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
index 89daf23b3464..cee5be3f6fe7 100644
--- a/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
+++ b/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ferret-0.11.8.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=feddea99478a88077b22f6af30489e6a
diff --git a/metadata/md5-cache/dev-ruby/ferret-0.11.8.7 b/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
index 427257c6bddd..5cc1bfe20846 100644
--- a/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
+++ b/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ferret-0.11.8.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e8921ebdb9c30839f7ac755e9b2473e1
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.4.0 b/metadata/md5-cache/dev-ruby/ffaker-2.4.0
index fb19a2b267df..5b130955d881 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.4.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ffaker-2.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c1ea325b621655ec7907ba4a95722d2d
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.5.0 b/metadata/md5-cache/dev-ruby/ffaker-2.5.0
index 74d03d46e19b..67501ea0a80e 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ffaker-2.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c1ea325b621655ec7907ba4a95722d2d
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.10 b/metadata/md5-cache/dev-ruby/ffi-1.9.10
index aafdc2abd41c..3fd0c9c83dd4 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.10
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.10
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.9.10.tar.gz -> ffi-git-1.9.10.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2b5c75263c2197b7941bb4b6f2c61899
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.14 b/metadata/md5-cache/dev-ruby/ffi-1.9.14
index f06b439c56e2..5650260b6ff0 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.14
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.14
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.9.14.tar.gz -> ffi-git-1.9.14.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=edcff64d7bf2a49c56f662467dc63720
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.17 b/metadata/md5-cache/dev-ruby/ffi-1.9.17
index 65d704fce061..ac45e88921cf 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.17
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.17
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.9.17.tar.gz -> ffi-git-1.9.17.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bd84b2f4a76c341ccf0b70106264e53b
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.18 b/metadata/md5-cache/dev-ruby/ffi-1.9.18
index 2b605f6a63ca..25d962851861 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.18
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.18
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.9.18.tar.gz -> ffi-git-1.9.18.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ca0e11095f20f744ea8d08429e10db08
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2 b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2
index 4c0ba4f75cc9..7e73bb087cd3 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.9.6.tar.gz -> ffi-git-1.9.6.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0a24333e1d7abe647cd532682f778bb7
diff --git a/metadata/md5-cache/dev-ruby/file-tail-1.1.1 b/metadata/md5-cache/dev-ruby/file-tail-1.1.1
index 5e426f4ab227..7ff557b7696f 100644
--- a/metadata/md5-cache/dev-ruby/file-tail-1.1.1
+++ b/metadata/md5-cache/dev-ruby/file-tail-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/tins-1*[ruby_targets_ruby21] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/file-tail-1.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ed5fa4848b5002d8626720e74626598a
diff --git a/metadata/md5-cache/dev-ruby/file-tail-1.2.0 b/metadata/md5-cache/dev-ruby/file-tail-1.2.0
index 66a194b7c535..bf3893bdd295 100644
--- a/metadata/md5-cache/dev-ruby/file-tail-1.2.0
+++ b/metadata/md5-cache/dev-ruby/file-tail-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/tins-1*[ruby_targets_ruby21] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/file-tail-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f598b44db529f410daae92737e1d7331
diff --git a/metadata/md5-cache/dev-ruby/filesize-0.1.1 b/metadata/md5-cache/dev-ruby/filesize-0.1.1
index 71aabc06675d..45199b0977bf 100644
--- a/metadata/md5-cache/dev-ruby/filesize-0.1.1
+++ b/metadata/md5-cache/dev-ruby/filesize-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.1.1
 SRC_URI=mirror://rubygems/filesize-0.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=750e93f6f699bbe53b68fb4cefcc4007
diff --git a/metadata/md5-cache/dev-ruby/fivemat-1.3.2 b/metadata/md5-cache/dev-ruby/fivemat-1.3.2
index d641a2ce1fee..8a7298c294e5 100644
--- a/metadata/md5-cache/dev-ruby/fivemat-1.3.2
+++ b/metadata/md5-cache/dev-ruby/fivemat-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/fivemat-1.3.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b7836954b9e315634809f8cec1bdd9da
diff --git a/metadata/md5-cache/dev-ruby/fivemat-1.3.3 b/metadata/md5-cache/dev-ruby/fivemat-1.3.3
index 50cf0618b034..747b885ad9ad 100644
--- a/metadata/md5-cache/dev-ruby/fivemat-1.3.3
+++ b/metadata/md5-cache/dev-ruby/fivemat-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/fivemat-1.3.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d6aae3f1a0e7cdb46cbdfd33fe60faf5
diff --git a/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1 b/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1
index f2d6762be6f8..9ade5916910d 100644
--- a/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/flexmock-1.3.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bfb59e26c4a9ce3112d8e97d444c2355
diff --git a/metadata/md5-cache/dev-ruby/flexmock-2.3.5 b/metadata/md5-cache/dev-ruby/flexmock-2.3.5
index 51ec9c88e70a..8641f2b5643e 100644
--- a/metadata/md5-cache/dev-ruby/flexmock-2.3.5
+++ b/metadata/md5-cache/dev-ruby/flexmock-2.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/doudou/flexmock/archive/v2.3.5.tar.gz -> flexmock-2.3.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a744fb6943b1b990011c0fde26d43f74
diff --git a/metadata/md5-cache/dev-ruby/flickraw-0.9.9 b/metadata/md5-cache/dev-ruby/flickraw-0.9.9
index 7118dec9dbb6..9c4184056718 100644
--- a/metadata/md5-cache/dev-ruby/flickraw-0.9.9
+++ b/metadata/md5-cache/dev-ruby/flickraw-0.9.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/flickraw-0.9.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bc583aa776e9d40665b9bd1ec4b580f3
diff --git a/metadata/md5-cache/dev-ruby/flog-4.3.2 b/metadata/md5-cache/dev-ruby/flog-4.3.2
index faa6f4a58ff9..0ee9df4045e4 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.3.2
+++ b/metadata/md5-cache/dev-ruby/flog-4.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/flog-4.3.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=738992eb92a9e04eafe63006c535227a
diff --git a/metadata/md5-cache/dev-ruby/flog-4.4.0 b/metadata/md5-cache/dev-ruby/flog-4.4.0
index cfb500d23aa7..8947ea2745ac 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.4.0
+++ b/metadata/md5-cache/dev-ruby/flog-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/flog-4.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=89b1b0cf525bfa29a7b7bdfbc57e1f95
diff --git a/metadata/md5-cache/dev-ruby/flog-4.4.1 b/metadata/md5-cache/dev-ruby/flog-4.4.1
index 3bb96969fc20..fed2fe335974 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.4.1
+++ b/metadata/md5-cache/dev-ruby/flog-4.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/path_expander:1[ruby_targets_ruby21] >de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/flog-4.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=99cdb3f1acebb3520cef3a6103476a63
diff --git a/metadata/md5-cache/dev-ruby/flog-4.5.0 b/metadata/md5-cache/dev-ruby/flog-4.5.0
index c0bce649ceef..4fd3337c8064 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.5.0
+++ b/metadata/md5-cache/dev-ruby/flog-4.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/path_expander:1[ruby_targets_ruby21] >de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/flog-4.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=99cdb3f1acebb3520cef3a6103476a63
diff --git a/metadata/md5-cache/dev-ruby/flog-4.6.1 b/metadata/md5-cache/dev-ruby/flog-4.6.1
index 5dfc35a1949f..44c61be7ea29 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.6.1
+++ b/metadata/md5-cache/dev-ruby/flog-4.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/path_expander:1[ruby_targets_ruby21] >de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/flog-4.6.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=56af8f2f772f06a27db8a1dcaad6fc7d
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.1 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.1
index a48e3c444da5..060ef097e7ad 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.1
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( <dev-ruby/railties-5.1[ruby_targets_ruby21] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/font-awesome-rails-4.7.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=abe087520b1c550003aeead2f0198feb
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.2 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.2
index 8528859fbde9..2591638844c1 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.2
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby21] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/font-awesome-rails-4.7.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0720889c3cc7929acd9ccb5bbaac1fad
diff --git a/metadata/md5-cache/dev-ruby/forgery-0.6.0 b/metadata/md5-cache/dev-ruby/forgery-0.6.0
index 05290d36a42f..8a39be671b32 100644
--- a/metadata/md5-cache/dev-ruby/forgery-0.6.0
+++ b/metadata/md5-cache/dev-ruby/forgery-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/sevenwire/forgery/archive/v0.6.0.tar.gz -> forgery-0.6.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7c9a8d22a61b6629ca8aa15b8f083aff
diff --git a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0 b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0
index f733ac4c4299..400db56d9e57 100644
--- a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0
+++ b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/forwardable-extended-2.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b66d3107fed6ddd335cff20359a0238b
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.2.0 b/metadata/md5-cache/dev-ruby/fuubar-2.2.0
index c9b2022d183f..aedcd4f807fe 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.2.0
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rspec:3[ruby_targets_ruby21] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/fuubar-2.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a1fc11d2b1fea5b25d8ec61fa0d3f0c2
diff --git a/metadata/md5-cache/dev-ruby/gettext-setup-0.10 b/metadata/md5-cache/dev-ruby/gettext-setup-0.10
index e1ec8b1d2429..52c8d53f0a92 100644
--- a/metadata/md5-cache/dev-ruby/gettext-setup-0.10
+++ b/metadata/md5-cache/dev-ruby/gettext-setup-0.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/gettext-setup-gem/archive/0.10.tar.gz -> gettext-setup-0.10.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0550ba37697d6294cc4be433cec959ee
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.5.0 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.5.0
index 887a2dbcfc92..b0ca48082a90 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.5.0
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.5.0.tar.gz -> gettext_i18n_rails-1.5.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0e6f4e430db51ae82734b6243514a1ea
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.7.2 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.7.2
index 72a5e45a0fde..b9f672cffa92 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.7.2
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.7.2.tar.gz -> gettext_i18n_rails-1.7.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0e6f4e430db51ae82734b6243514a1ea
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0
index 208424453df6..0f07e79fd9d9 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.8.0.tar.gz -> gettext_i18n_rails-1.8.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=637269f9a28a3f73d166866d404b3641
diff --git a/metadata/md5-cache/dev-ruby/gh-0.15.0-r1 b/metadata/md5-cache/dev-ruby/gh-0.15.0-r1
index 21cffbf649fb..99e73ad8b065 100644
--- a/metadata/md5-cache/dev-ruby/gh-0.15.0-r1
+++ b/metadata/md5-cache/dev-ruby/gh-0.15.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/travis-ci/gh/archive/v0.15.0.tar.gz -> gh-0.15.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=aaec712591791403e4ecf0591038920f
diff --git a/metadata/md5-cache/dev-ruby/gh-0.15.1 b/metadata/md5-cache/dev-ruby/gh-0.15.1
index ec64347ebb6d..a61ee9c18b91 100644
--- a/metadata/md5-cache/dev-ruby/gh-0.15.1
+++ b/metadata/md5-cache/dev-ruby/gh-0.15.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/travis-ci/gh/archive/v0.15.1.tar.gz -> gh-0.15.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=aaec712591791403e4ecf0591038920f
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3 b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
index db802d0ee218..f6a7af5487f1 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/gherkin/archive/v2.12.0.tar.gz -> gherkin-2.12.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=612370b63f1ee45434b8625114f27190
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.2 b/metadata/md5-cache/dev-ruby/gherkin-2.12.2
index fd7c9ea42fda..5195d2113453 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.2
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/gherkin/archive/v2.12.2.tar.gz -> gherkin-2.12.2-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b66a8d17cd4034a6ca32575df627e1e9
diff --git a/metadata/md5-cache/dev-ruby/gherkin-3.2.0-r1 b/metadata/md5-cache/dev-ruby/gherkin-3.2.0-r1
index 6db6abb715c9..1fa8e168df80 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-3.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/gherkin-3.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/gherkin-3.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b14a46464e1507e0b6b7bea24ad4d5fc
diff --git a/metadata/md5-cache/dev-ruby/gherkin-4.0.0 b/metadata/md5-cache/dev-ruby/gherkin-4.0.0
index e15f34947b55..6bb23d73a210 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-4.0.0
+++ b/metadata/md5-cache/dev-ruby/gherkin-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/gherkin-4.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5261801ecb6c1500e5ae269f3054067b
diff --git a/metadata/md5-cache/dev-ruby/gherkin-4.0.0-r1 b/metadata/md5-cache/dev-ruby/gherkin-4.0.0-r1
index 402f1168f40e..468ca5cf95be 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-4.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/gherkin-4.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/gherkin-4.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a59e6de20e0de28cfe767942a5336776
diff --git a/metadata/md5-cache/dev-ruby/gherkin-4.1.1 b/metadata/md5-cache/dev-ruby/gherkin-4.1.1
index e1dbfcfd72ee..7f0d0e34ff8b 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-4.1.1
+++ b/metadata/md5-cache/dev-ruby/gherkin-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/gherkin-4.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7c8b0664bb01f9ea78ec9eca90b10b0c
diff --git a/metadata/md5-cache/dev-ruby/gherkin-4.1.2 b/metadata/md5-cache/dev-ruby/gherkin-4.1.2
index e305eb1dd044..411f0e2da63b 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-4.1.2
+++ b/metadata/md5-cache/dev-ruby/gherkin-4.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/gherkin-4.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5810c64c477b8efeb22dd3df4a814923
diff --git a/metadata/md5-cache/dev-ruby/gherkin-4.1.3 b/metadata/md5-cache/dev-ruby/gherkin-4.1.3
index c941323d048c..cc33982be371 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-4.1.3
+++ b/metadata/md5-cache/dev-ruby/gherkin-4.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/gherkin-4.1.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5810c64c477b8efeb22dd3df4a814923
diff --git a/metadata/md5-cache/dev-ruby/git-1.3.0 b/metadata/md5-cache/dev-ruby/git-1.3.0
index 8048d7934b47..2e79fc45a02a 100644
--- a/metadata/md5-cache/dev-ruby/git-1.3.0
+++ b/metadata/md5-cache/dev-ruby/git-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/git-1.6.0.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.3.0.tar.gz -> git-1.3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c3418576489bdbfbbaca15b214be96db
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.12.4 b/metadata/md5-cache/dev-ruby/github_api-0.12.4
index 441b3b2eb828..31579e892f6f 100644
--- a/metadata/md5-cache/dev-ruby/github_api-0.12.4
+++ b/metadata/md5-cache/dev-ruby/github_api-0.12.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/peter-murach/github/archive/v0.12.4.tar.gz -> github_api-0.12.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d3d30386307658aff6c853955df4a064
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.14.5 b/metadata/md5-cache/dev-ruby/github_api-0.14.5
index 3a43399b93ea..047dd87853d1 100644
--- a/metadata/md5-cache/dev-ruby/github_api-0.14.5
+++ b/metadata/md5-cache/dev-ruby/github_api-0.14.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby21] =
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/peter-murach/github/archive/v0.14.5.tar.gz -> github_api-0.14.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=50f2362ad5bddd2aa9ed0bf973609a25
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.17.0 b/metadata/md5-cache/dev-ruby/github_api-0.17.0
index e9e2ac5e708d..f7c8e4701860 100644
--- a/metadata/md5-cache/dev-ruby/github_api-0.17.0
+++ b/metadata/md5-cache/dev-ruby/github_api-0.17.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby21] =
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/peter-murach/github/archive/v0.17.0.tar.gz -> github_api-0.17.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9918bc8cddf1f14bf3836340d88b85fd
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.3.6 b/metadata/md5-cache/dev-ruby/globalid-0.3.6
index b52f99ed1c92..6937e97ea07d 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.3.6
+++ b/metadata/md5-cache/dev-ruby/globalid-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.3.6.tar.gz -> globalid-0.3.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=617eda4e05731406fac055c906bcb053
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.3.6-r1 b/metadata/md5-cache/dev-ruby/globalid-0.3.6-r1
index 8ba5f4b7ffb3..83aba0fcd53d 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.3.6-r1
+++ b/metadata/md5-cache/dev-ruby/globalid-0.3.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.3.6.tar.gz -> globalid-0.3.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c33a85a314eba651c3167bc4f2b366db
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.3.7 b/metadata/md5-cache/dev-ruby/globalid-0.3.7
index a9bb5eae237c..37c598078f0b 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.3.7
+++ b/metadata/md5-cache/dev-ruby/globalid-0.3.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.3.7.tar.gz -> globalid-0.3.7.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8b9532c55fea9dbf230cf8371a914263
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.4.0 b/metadata/md5-cache/dev-ruby/globalid-0.4.0
index df305f1ff981..6d2352468f94 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.4.0
+++ b/metadata/md5-cache/dev-ruby/globalid-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.4.0.tar.gz -> globalid-0.4.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=220f5631125366b0241e818d5b66cc5d
diff --git a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2 b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
index 34734b01f80e..8a044da7b573 100644
--- a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
+++ b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
@@ -10,5 +10,5 @@ RDEPEND=sci-visualization/gnuplot ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/gnuplot-2.6.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a42b83004d976322eca69e479435c2b8
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.12 b/metadata/md5-cache/dev-ruby/gpgme-2.0.12
index 0b7993c098b5..930c0d7fb827 100644
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.12
+++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.12
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gpgme-1.1.3 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ) || ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ueno/ruby-gpgme/archive/2.0.12.tar.gz -> ruby-gpgme-2.0.12.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1806624611d92e011b2b1b5ebcadd5d8
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.6.0 b/metadata/md5-cache/dev-ruby/gruff-0.6.0
index b5eaef732a2c..f1c8d2cc7f96 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.6.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby21? ( >=dev-ruby/rmagic
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/gruff-0.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=64b08b2989db6860fc4b41fe10b1d451
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.7.0 b/metadata/md5-cache/dev-ruby/gruff-0.7.0
index 88a5663a56df..29d4dd3d6e18 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.7.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby21? ( >=dev-ruby/rmagic
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/gruff-0.7.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=873b90fe10778aa62ddb554efd4204e4
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.7 b/metadata/md5-cache/dev-ruby/haml-4.0.7
index 263048cfd2ce..e33efd3956d1 100644
--- a/metadata/md5-cache/dev-ruby/haml-4.0.7
+++ b/metadata/md5-cache/dev-ruby/haml-4.0.7
@@ -10,5 +10,5 @@ RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby21? ( dev-ruby/tilt:*[ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/haml-4.0.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e481263cbcecd9e1cf0f33bcd233bf28
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.7-r1 b/metadata/md5-cache/dev-ruby/haml-4.0.7-r1
index 0f3d5d91d579..e52eef096ac8 100644
--- a/metadata/md5-cache/dev-ruby/haml-4.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/haml-4.0.7-r1
@@ -10,5 +10,5 @@ RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby21? ( dev-ruby/tilt:*[ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/haml-4.0.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7967c9059dd0c859bbaeb0578032002a
diff --git a/metadata/md5-cache/dev-ruby/haml-rails-0.9.0 b/metadata/md5-cache/dev-ruby/haml-rails-0.9.0
index 7d34f04fdc5d..3143aea3f44e 100644
--- a/metadata/md5-cache/dev-ruby/haml-rails-0.9.0
+++ b/metadata/md5-cache/dev-ruby/haml-rails-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.1[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/haml-rails-0.9.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d7be57726f4b37a8d2fedecfb40e9a96
diff --git a/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1 b/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1
index 643418a7bfc8..3051d3d69ea5 100644
--- a/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hamster-3.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e4a11dccc93d701f677b1815dbdff9fe
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-0.3.2 b/metadata/md5-cache/dev-ruby/hashdiff-0.3.2
index bc4eadb3a4b5..704026842bf8 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-0.3.2
+++ b/metadata/md5-cache/dev-ruby/hashdiff-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashdiff-0.3.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6daeaaec63d3b10921e17f26c7858cdf
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-0.3.4 b/metadata/md5-cache/dev-ruby/hashdiff-0.3.4
index 11fc298ef8e7..fb6c5f65f32b 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-0.3.4
+++ b/metadata/md5-cache/dev-ruby/hashdiff-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashdiff-0.3.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e0403cab8a1718ece5325b477ddff11e
diff --git a/metadata/md5-cache/dev-ruby/hashery-2.1.2 b/metadata/md5-cache/dev-ruby/hashery-2.1.2
index 0aa8a4cf926d..e381324c23d9 100644
--- a/metadata/md5-cache/dev-ruby/hashery-2.1.2
+++ b/metadata/md5-cache/dev-ruby/hashery-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashery-2.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e3e119f2bda595450c5d9b84ef5607b0
diff --git a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1 b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1
index 4817f2acc72d..57253ddbfa25 100644
--- a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashicorp-checkpoint-0.1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9633e9fd0cad72e36ef7ad2454f6cfe7
diff --git a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1 b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
index be6d2daaf592..d2d3e1616a17 100644
--- a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashie-2.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f4da09e8a18d4a59efcdfd57800f7adc
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.4.6 b/metadata/md5-cache/dev-ruby/hashie-3.4.6
index f608f6a55ef6..b0f5cc7a60e9 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.4.6
+++ b/metadata/md5-cache/dev-ruby/hashie-3.4.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/hashie-3.4.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=93555959c43ba2750d96d25a45a37a45
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.5.1 b/metadata/md5-cache/dev-ruby/hashie-3.5.1
index 3fcff3fdb5f2..28063474f75a 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.5.1
+++ b/metadata/md5-cache/dev-ruby/hashie-3.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/hashie-3.5.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fc18f23b2f3eeeceec627e1f5a39a7ec
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.5.5 b/metadata/md5-cache/dev-ruby/hashie-3.5.5
index 1ef904154961..511ea501820c 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.5.5
+++ b/metadata/md5-cache/dev-ruby/hashie-3.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/hashie-3.5.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b3e785bcfc00cf96c8adda0302f3c55f
diff --git a/metadata/md5-cache/dev-ruby/hashr-2.0.0 b/metadata/md5-cache/dev-ruby/hashr-2.0.0
index 1421f030042b..d0c469b70276 100644
--- a/metadata/md5-cache/dev-ruby/hashr-2.0.0
+++ b/metadata/md5-cache/dev-ruby/hashr-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashr-2.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=15d7e1c71cce1676cfccd6a1b58212c4
diff --git a/metadata/md5-cache/dev-ruby/hashr-2.0.1 b/metadata/md5-cache/dev-ruby/hashr-2.0.1
index abdd304192f8..85a051d3a8f2 100644
--- a/metadata/md5-cache/dev-ruby/hashr-2.0.1
+++ b/metadata/md5-cache/dev-ruby/hashr-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashr-2.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e5a1b0be5ccddf38952f7c28fc8b77ba
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
index 1de2e6e5ccc2..9046882d9a3f 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/heredoc_unindent-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c06f30c7fdb12be0e0068309656f68ed
diff --git a/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1 b/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
index 7bd6ac682d57..d2615af2ae78 100644
--- a/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-1.3.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9d8d59a077b71f06571fce24fa41a2a6
diff --git a/metadata/md5-cache/dev-ruby/hiera-2.0.0 b/metadata/md5-cache/dev-ruby/hiera-2.0.0
index 4c223e149a87..fd8beb94e41a 100644
--- a/metadata/md5-cache/dev-ruby/hiera-2.0.0
+++ b/metadata/md5-cache/dev-ruby/hiera-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-2.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f3f1aca46e5ef362904afd823f337a07
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.2.2 b/metadata/md5-cache/dev-ruby/hiera-3.2.2
index e9ca2a62f8ba..9f6c4f5a9544 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.2.2
+++ b/metadata/md5-cache/dev-ruby/hiera-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-3.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=95cbdbecc570927e6ae946edd28be11a
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.3.0 b/metadata/md5-cache/dev-ruby/hiera-3.3.0
index 83c5505f769f..b7ae90606384 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.3.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-3.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1a64b704e09738bed9dd51c31a055630
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.3.1 b/metadata/md5-cache/dev-ruby/hiera-3.3.1
index b412c9a5b655..13a60e7bb257 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.3.1
+++ b/metadata/md5-cache/dev-ruby/hiera-3.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-3.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1a64b704e09738bed9dd51c31a055630
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0 b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0
index 9e44133384bd..5486242dcfcb 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v2.1.0.tar.gz -> hiera-eyaml-2.1.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e7df4b7de9331de2cb72fa94cc4c763f
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6
index 7a4216ce8980..aada099b8546 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-gpg-0.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ba0bd1d203a4d0dfbc4610a3e0309bc6
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6 b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
index ae3d3bb07e4a..f395e9472c99 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-plaintext-0.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0f768a0932c8c1aa6c6ee563b49a1e37
diff --git a/metadata/md5-cache/dev-ruby/highline-1.7.6 b/metadata/md5-cache/dev-ruby/highline-1.7.6
index faa2224e7178..01217ab1906c 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.7.6
+++ b/metadata/md5-cache/dev-ruby/highline-1.7.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/highline-1.7.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=90b7c90279dc401c1e8a142cc5085b06
diff --git a/metadata/md5-cache/dev-ruby/highline-1.7.8 b/metadata/md5-cache/dev-ruby/highline-1.7.8
index 12ce24756837..67cbc338fa44 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.7.8
+++ b/metadata/md5-cache/dev-ruby/highline-1.7.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/highline-1.7.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5c81bb6b85a862e3404a4f8c1dbd8218
diff --git a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1 b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
index ce69391f73c5..817a53a69643 100644
--- a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/sstephenson/hike/archive/v1.2.3.tar.gz -> hike-1.2.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dd80ce1ef1738f5f3d446afb261c5265
diff --git a/metadata/md5-cache/dev-ruby/hike-2.1.2 b/metadata/md5-cache/dev-ruby/hike-2.1.2
index 8a6cde0610d7..3286d21b5f56 100644
--- a/metadata/md5-cache/dev-ruby/hike-2.1.2
+++ b/metadata/md5-cache/dev-ruby/hike-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/sstephenson/hike/archive/v2.1.2.tar.gz -> hike-2.1.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3340a4f0917407004a85de6eb9df10c4
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.5.4 b/metadata/md5-cache/dev-ruby/hipchat-1.5.4
index 7b5f323ead11..ee761950829e 100644
--- a/metadata/md5-cache/dev-ruby/hipchat-1.5.4
+++ b/metadata/md5-cache/dev-ruby/hipchat-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/httparty[ruby_targets_ruby21] dev-ruby/m
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/hipchat/hipchat-rb/archive/v1.5.4.tar.gz -> hipchat-1.5.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4314e167dea674095d0f733bedb4a74a
diff --git a/metadata/md5-cache/dev-ruby/hitimes-1.2.4 b/metadata/md5-cache/dev-ruby/hitimes-1.2.4
index 48555fbeda55..5879f225b5c8 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-1.2.4
+++ b/metadata/md5-cache/dev-ruby/hitimes-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hitimes-1.2.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1f1ddc62c23fde9b6d3a1fb9cfd52c9b
diff --git a/metadata/md5-cache/dev-ruby/hitimes-1.2.5 b/metadata/md5-cache/dev-ruby/hitimes-1.2.5
index f8a56953ac80..f8a9fae97e10 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-1.2.5
+++ b/metadata/md5-cache/dev-ruby/hitimes-1.2.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hitimes-1.2.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9399519a2f1b40804439421af9143a31
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1 b/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
index 035ee3f0e379..1ec36cb51dd1 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
+++ b/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.13.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=921c48d2fd9a679e9d2d86c150f51249
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.14.1 b/metadata/md5-cache/dev-ruby/hoe-3.14.1
index 835da03a6377..d8d8ef847872 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.14.1
+++ b/metadata/md5-cache/dev-ruby/hoe-3.14.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] <dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.14.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=28a90911bcc2e954ea8e55efb7d0bf1c
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.15.2 b/metadata/md5-cache/dev-ruby/hoe-3.15.2
index 79d398bcc511..805df39066c6 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.15.2
+++ b/metadata/md5-cache/dev-ruby/hoe-3.15.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] <dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.15.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3db68c8078028c14fcc9026784b45d14
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.15.3 b/metadata/md5-cache/dev-ruby/hoe-3.15.3
index d9452c9f4bd0..4545a3b81657 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.15.3
+++ b/metadata/md5-cache/dev-ruby/hoe-3.15.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] <dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.15.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=df950aefe3492b1aefba7e52d50480cb
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.15.3-r1 b/metadata/md5-cache/dev-ruby/hoe-3.15.3-r1
index 68ee6c718f7f..42c2d7642bcb 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.15.3-r1
+++ b/metadata/md5-cache/dev-ruby/hoe-3.15.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] <dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.15.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bbb39349b4cf958fb1ea02dbf24748f3
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.15.3-r2 b/metadata/md5-cache/dev-ruby/hoe-3.15.3-r2
index 24fc98f7ccaf..7a3fafb38729 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.15.3-r2
+++ b/metadata/md5-cache/dev-ruby/hoe-3.15.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] <dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.15.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8e999758d212849af852a2129cbef17a
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.16.0 b/metadata/md5-cache/dev-ruby/hoe-3.16.0
index 3b7ea93f982b..cbaa277cc482 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.16.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.16.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] <dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.16.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=be56418488ef3520d9cf2b68c45a620c
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
index 761ee2b062cd..f06af7b2de30 100644
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-seattlerb-1.3.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=68a5a09302dc03f5ccd2125e70ba6ace
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.5 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.5
index d5524b191455..074d02644e6c 100644
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.5
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-seattlerb-1.3.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5ace639fa4886a4744563bc168934012
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
index d41368c39177..00084326510b 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/fast_xs[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hpricot-0.8.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ff6f2911ba7a224c097469e2155b6e35
diff --git a/metadata/md5-cache/dev-ruby/html2haml-2.1.0 b/metadata/md5-cache/dev-ruby/html2haml-2.1.0
index d8e8a9f3a6bf..42fc67938d36 100644
--- a/metadata/md5-cache/dev-ruby/html2haml-2.1.0
+++ b/metadata/md5-cache/dev-ruby/html2haml-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/html2haml-2.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=af1e7d364d2b0d7b7e8a57501fe60809
diff --git a/metadata/md5-cache/dev-ruby/html2haml-2.2.0 b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
index 870e5bc7b56b..aeb4bb20c892 100644
--- a/metadata/md5-cache/dev-ruby/html2haml-2.2.0
+++ b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/html2haml-2.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=24cfe7b244d099c78a3d8cd456fde76d
diff --git a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4 b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
index f5f1bc746fa9..d4c79417e034 100644
--- a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
+++ b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/htmlentities-4.3.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2ec6096064467dcda51feb312d46598c
diff --git a/metadata/md5-cache/dev-ruby/http-0.6.3-r1 b/metadata/md5-cache/dev-ruby/http-0.6.3-r1
index 58911645dad0..b3e1c8bae4ce 100644
--- a/metadata/md5-cache/dev-ruby/http-0.6.3-r1
+++ b/metadata/md5-cache/dev-ruby/http-0.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/http-0.6.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=902064b80ef928ed3ae5702f6462f6d4
diff --git a/metadata/md5-cache/dev-ruby/http-0.9.8 b/metadata/md5-cache/dev-ruby/http-0.9.8
index c15855c8b7f3..d80cca9d7e07 100644
--- a/metadata/md5-cache/dev-ruby/http-0.9.8
+++ b/metadata/md5-cache/dev-ruby/http-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/http-0.9.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dfa62faa00d2445b9fbb972895ab226b
diff --git a/metadata/md5-cache/dev-ruby/http-0.9.8-r1 b/metadata/md5-cache/dev-ruby/http-0.9.8-r1
index ac3b0ce5d57f..d26131fabd57 100644
--- a/metadata/md5-cache/dev-ruby/http-0.9.8-r1
+++ b/metadata/md5-cache/dev-ruby/http-0.9.8-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/http-0.9.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=580ca97a83e83b39f85bd56586be4a88
diff --git a/metadata/md5-cache/dev-ruby/http-1.0.2 b/metadata/md5-cache/dev-ruby/http-1.0.2
index 67da69c63213..523ecb287928 100644
--- a/metadata/md5-cache/dev-ruby/http-1.0.2
+++ b/metadata/md5-cache/dev-ruby/http-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/http-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4a1d5e160c6f829b18c28048970c7a54
diff --git a/metadata/md5-cache/dev-ruby/http-2.2.1 b/metadata/md5-cache/dev-ruby/http-2.2.1
index d8ba1a428b2a..10c0573151fd 100644
--- a/metadata/md5-cache/dev-ruby/http-2.2.1
+++ b/metadata/md5-cache/dev-ruby/http-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2.0
 SRC_URI=mirror://rubygems/http-2.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=14682bed854c3d959cb29917dd38443b
diff --git a/metadata/md5-cache/dev-ruby/http-2.2.2 b/metadata/md5-cache/dev-ruby/http-2.2.2
index 4ba68d0d41f8..5722abf4ed22 100644
--- a/metadata/md5-cache/dev-ruby/http-2.2.2
+++ b/metadata/md5-cache/dev-ruby/http-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2.0
 SRC_URI=mirror://rubygems/http-2.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b5648c498e944111d68263a837a98e76
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1
index f98b9609407d..9eaf2bf0d4f6 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/http-cookie-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=225e0b6f795933907d246a5985905735
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.3 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
index d7e823d8dec3..7718bfb04413 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/http-cookie-1.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=729df1258613154e04a8b13536a34ebc
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-1.0.1-r1 b/metadata/md5-cache/dev-ruby/http-form_data-1.0.1-r1
index e6fc31f668fd..7ea8ee4d79d7 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/http-form_data-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/http-form_data-1.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e76bee61470324f5282bff1c68a512ae
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-1.0.2 b/metadata/md5-cache/dev-ruby/http-form_data-1.0.2
index 18cd25d13018..d87ecdbcc3a6 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-1.0.2
+++ b/metadata/md5-cache/dev-ruby/http-form_data-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/http-form_data-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d22c33f57dca9b6c37afe1b68d6a4e83
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-1.0.3 b/metadata/md5-cache/dev-ruby/http-form_data-1.0.3
index 2ec650f8b098..31a9596443b9 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-1.0.3
+++ b/metadata/md5-cache/dev-ruby/http-form_data-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/http-form_data-1.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a816031357eefbcbedf0c89c9893c4e0
diff --git a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1 b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
index 785cf49d894f..d9cccdf20427 100644
--- a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/http_parser.rb-0.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d8a3afee1a9e555b61ad539d9c019700
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.14.0-r1 b/metadata/md5-cache/dev-ruby/httparty-0.14.0-r1
index de1d06011291..d1c38d694241 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.14.0-r1
+++ b/metadata/md5-cache/dev-ruby/httparty-0.14.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/httparty-0.14.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f0c7f3fff2bd28d6cd7c80189cec96ed
diff --git a/metadata/md5-cache/dev-ruby/httpauth-0.2.1 b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
index bac4e171fd69..ce6c39a9b184 100644
--- a/metadata/md5-cache/dev-ruby/httpauth-0.2.1
+++ b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/Manfred/HTTPauth/archive/v0.2.1.tar.gz -> httpauth-0.2.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=53a065a40e3574dd061cd6a243e3d75b
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.2.4 b/metadata/md5-cache/dev-ruby/httpclient-2.8.2.4
index 66cd499b81e1..c488dba7874b 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.8.2.4
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.8.2.4
@@ -10,5 +10,5 @@ RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.8.2.4.tar.gz -> httpclient-2.8.2.4.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6f347011bd03d24460ac8556e072a3b0
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.3 b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
index 6aee0ecf2b4a..b6fb13aad21a 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.8.3
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
@@ -10,5 +10,5 @@ RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.8.3.tar.gz -> httpclient-2.8.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7da55529f3cd6492728f707e9d48753e
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.6.11-r1 b/metadata/md5-cache/dev-ruby/i18n-0.6.11-r1
index 72352b5438ef..cef414b4acd9 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.6.11-r1
+++ b/metadata/md5-cache/dev-ruby/i18n-0.6.11-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/i18n-0.6.11.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=14246c2c98f04aaa17e0168f2f0bd69a
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.7.0-r2 b/metadata/md5-cache/dev-ruby/i18n-0.7.0-r2
index 2b607d3c4a2d..c84b2a0c0866 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.7.0-r2
+++ b/metadata/md5-cache/dev-ruby/i18n-0.7.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.7
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.7.0.tar.gz -> i18n-0.7.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ec947417112bb06d32374612de6669ca
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.8.1 b/metadata/md5-cache/dev-ruby/i18n-0.8.1
index 53a06791404b..1d6e59486c3d 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.8.1
+++ b/metadata/md5-cache/dev-ruby/i18n-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.8
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.8.1.tar.gz -> i18n-0.8.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2fbab2bb3265fec2a9d64c062689121e
diff --git a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2 b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
index c93f63f77553..7160f3b073d8 100644
--- a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
+++ b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ice_nine-0.11.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=85f41393f0cca39c383770093c2587ba
diff --git a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1 b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
index fa7377d86547..b6f3e8955c63 100644
--- a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
+++ b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/mattheworiordan/imagesize/archive/bd5be2afb088beba3f0d863cef4eac7db56ca804.tar.gz -> imagesize-0.1.1_p20100902.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4fc597fe1dbb5de652c59fde273010fc
diff --git a/metadata/md5-cache/dev-ruby/inflecto-0.0.2 b/metadata/md5-cache/dev-ruby/inflecto-0.0.2
index 98748b87e9e1..1ee020aef6ce 100644
--- a/metadata/md5-cache/dev-ruby/inflecto-0.0.2
+++ b/metadata/md5-cache/dev-ruby/inflecto-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/inflecto-0.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=98533d1e94944fa05542043f7c703323
diff --git a/metadata/md5-cache/dev-ruby/inifile-3.0.0 b/metadata/md5-cache/dev-ruby/inifile-3.0.0
index 7efe301301d7..c09974d1bee3 100644
--- a/metadata/md5-cache/dev-ruby/inifile-3.0.0
+++ b/metadata/md5-cache/dev-ruby/inifile-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/inifile-3.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=91a622fa2ae828f66674e1ab7d38a22e
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0 b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
index 7616e974c671..5affd6fb2b83 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
+++ b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/instance_storage-1.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=324f91ee656b079a6ee1231bb9e62151
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.6 b/metadata/md5-cache/dev-ruby/instantiator-0.0.6
index be552bbaf58a..cf073d8f0666 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.6
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/blankslate:*[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/instantiator-0.0.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7439e8eae0c6ee9ac1545847b1efbe29
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.7 b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
index 68f2b77642b4..8d08f6bca851 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.7
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/blankslate:*[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/instantiator-0.0.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a69343821c83de6b6a27c8af6d435eaa
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.3 b/metadata/md5-cache/dev-ruby/introspection-0.0.3
index fe54ec740068..b3f2fa1a6f02 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.3
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/introspection-0.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c3dd8549c423a65ba28b1a45171b3b66
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4 b/metadata/md5-cache/dev-ruby/introspection-0.0.4
index 8c0cc026b72e..817e5415df40 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.4
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/introspection-0.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=af60f26a902a5da97dbb55d9f263cd6e
diff --git a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3 b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
index c7209c072261..4f46712ed7e5 100644
--- a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
+++ b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/tarcieri/iobuffer/tarball/v1.1.2 -> iobuffer-git-1.1.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b358aa0974fe5ac44aeaa07cd95b5a99
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.5.4 b/metadata/md5-cache/dev-ruby/itextomml-1.5.4
index f35a99af7618..67710f9de4b8 100644
--- a/metadata/md5-cache/dev-ruby/itextomml-1.5.4
+++ b/metadata/md5-cache/dev-ruby/itextomml-1.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/itextomml-1.5.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=045f5944b6eb6e049b6001e342c675fe
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.5.5 b/metadata/md5-cache/dev-ruby/itextomml-1.5.5
index 02c70d6d33f1..52d433835451 100644
--- a/metadata/md5-cache/dev-ruby/itextomml-1.5.5
+++ b/metadata/md5-cache/dev-ruby/itextomml-1.5.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/itextomml-1.5.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=84b2f135f05edf37939b92be87949456
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.5.6 b/metadata/md5-cache/dev-ruby/itextomml-1.5.6
index 8734e53edda3..7e5035ee0724 100644
--- a/metadata/md5-cache/dev-ruby/itextomml-1.5.6
+++ b/metadata/md5-cache/dev-ruby/itextomml-1.5.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/itextomml-1.5.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=245609a684fa35c2607074af41d90456
diff --git a/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r2 b/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r2
index a2e93d006632..e552ad258ace 100644
--- a/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] >=dev-ruby/git
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/jeweler-2.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cc0d2172324d6de0328f48a3361262ae
diff --git a/metadata/md5-cache/dev-ruby/jira-ruby-1.2.0 b/metadata/md5-cache/dev-ruby/jira-ruby-1.2.0
index 6f1813ee64db..2e08952fb369 100644
--- a/metadata/md5-cache/dev-ruby/jira-ruby-1.2.0
+++ b/metadata/md5-cache/dev-ruby/jira-ruby-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/activesupport[ruby_targets_ruby21] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/jira-ruby-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e4ac1f5936fbe267dd78223122873dec
diff --git a/metadata/md5-cache/dev-ruby/jmespath-1.2.4 b/metadata/md5-cache/dev-ruby/jmespath-1.2.4
index f25f24a517c3..59236dfe62e6 100644
--- a/metadata/md5-cache/dev-ruby/jmespath-1.2.4
+++ b/metadata/md5-cache/dev-ruby/jmespath-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=https://github.com/jmespath/jmespath.rb/archive/v1.2.4.tar.gz -> jmespath-1.2.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=17c3a0ba6ef390e75dca9dd4d785fe3f
diff --git a/metadata/md5-cache/dev-ruby/jmespath-1.3.0 b/metadata/md5-cache/dev-ruby/jmespath-1.3.0
index 5926975dc599..99ae3244882b 100644
--- a/metadata/md5-cache/dev-ruby/jmespath-1.3.0
+++ b/metadata/md5-cache/dev-ruby/jmespath-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=https://github.com/jmespath/jmespath.rb/archive/v1.3.0.tar.gz -> jmespath-1.3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=17c3a0ba6ef390e75dca9dd4d785fe3f
diff --git a/metadata/md5-cache/dev-ruby/jmespath-1.3.1 b/metadata/md5-cache/dev-ruby/jmespath-1.3.1
index c5d82ab0ab4d..a2d8667b198f 100644
--- a/metadata/md5-cache/dev-ruby/jmespath-1.3.1
+++ b/metadata/md5-cache/dev-ruby/jmespath-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=https://github.com/jmespath/jmespath.rb/archive/v1.3.1.tar.gz -> jmespath-1.3.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fa260a92de1620d0abea7970d31d62f2
diff --git a/metadata/md5-cache/dev-ruby/journey-1.0.4-r1 b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
index c35efe36222e..d2df27336c0f 100644
--- a/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/journey-1.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=45d38476f5373f9e6abd9803f86be820
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4 b/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
index 1cb9753bc556..4b2362bff353 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] <d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/jquery-rails-3.1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2a1c875016dac7f3203ab8b7550268ce
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1 b/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1
index 1273cd971a89..301a46dc4516 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/jquery-rails-4.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5b2eca8b752ef2721bbe1135458742c5
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1-r1 b/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1-r1
index dc003dfa8221..dd34439fa84e 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/jquery-rails-4.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f9df0332d32d7f055c0cbc5288b04827
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.2.2 b/metadata/md5-cache/dev-ruby/jquery-rails-4.2.2
index 963149707ab5..463fe75f963b 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.2.2
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/jquery-rails-4.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=61a380796f0c78a965c5cfa75190dce7
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.3.1 b/metadata/md5-cache/dev-ruby/jquery-rails-4.3.1
index a4319b1d48fc..ca612e31874a 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.3.1
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/jquery-rails-4.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=de649ed4646c106bf742652bd95a4749
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-3.0.1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-3.0.1
index 4243d679c862..111dc2541ee0 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-3.0.1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.1[ruby_targets_ruby21] dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/jquery-ui-rails-3.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ff664f58189ff48e02021167acbe10b7
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
index e7fbbd1c4f20..6209d1cb2dbf 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/jquery-ui-rails-4.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b0a40c442a217ee02fa3c97f10247762
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5
index 0515deb75f1c..09e991cc2d70 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5
 SRC_URI=mirror://rubygems/jquery-ui-rails-5.0.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e9f35fb3a00ab4d55e95baa0a9660ad4
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.0 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.0
index bc32be7280e5..6ee5cf026ec2 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.0
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=6
 SRC_URI=mirror://rubygems/jquery-ui-rails-6.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=44393a9618a9e7c896293040aba24e71
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1
index af8ad5dc0864..69bbd26030eb 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=6
 SRC_URI=mirror://rubygems/jquery-ui-rails-6.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=44393a9618a9e7c896293040aba24e71
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1 b/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1
index 30d7d40d995f..67199d00e458 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.3.0
 SRC_URI=mirror://rubygems/jsobfu-0.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8ed0b163256476c16c0844e064b1ec02
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2 b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
index b28d795a32a7..1fd0de949bd0 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.4.2
 SRC_URI=mirror://rubygems/jsobfu-0.4.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3b20111ef743d6f2d30e1aa5e86d522b
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.2-r1 b/metadata/md5-cache/dev-ruby/json-1.8.2-r1
index 1e1bb14b17c8..140d5ff0ae4d 100644
--- a/metadata/md5-cache/dev-ruby/json-1.8.2-r1
+++ b/metadata/md5-cache/dev-ruby/json-1.8.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/json-1.8.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d7a1dfa197f9c39663ea4f5b02de78f4
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.3 b/metadata/md5-cache/dev-ruby/json-1.8.3
index 5a61a7269a75..f7dfda7d14cf 100644
--- a/metadata/md5-cache/dev-ruby/json-1.8.3
+++ b/metadata/md5-cache/dev-ruby/json-1.8.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/json-1.8.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3501cd8248cd2ac6ccbd5b4b2279bca2
diff --git a/metadata/md5-cache/dev-ruby/json-2.0.1 b/metadata/md5-cache/dev-ruby/json-2.0.1
index 87f3f5d88fc0..8fae90531d52 100644
--- a/metadata/md5-cache/dev-ruby/json-2.0.1
+++ b/metadata/md5-cache/dev-ruby/json-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/json-2.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c60ea0cb11e4f09ade0211d46b62082e
diff --git a/metadata/md5-cache/dev-ruby/json-2.0.2 b/metadata/md5-cache/dev-ruby/json-2.0.2
index 92d41d5dcfdc..318499d00ab4 100644
--- a/metadata/md5-cache/dev-ruby/json-2.0.2
+++ b/metadata/md5-cache/dev-ruby/json-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/json-2.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9f9ccb69465728b0070f5f2371e4829f
diff --git a/metadata/md5-cache/dev-ruby/json-2.0.3 b/metadata/md5-cache/dev-ruby/json-2.0.3
index e0e9a2433b00..cf0ba5dced01 100644
--- a/metadata/md5-cache/dev-ruby/json-2.0.3
+++ b/metadata/md5-cache/dev-ruby/json-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/json-2.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2225b4dbc6091d6a4904756d74ca46a9
diff --git a/metadata/md5-cache/dev-ruby/json-2.0.4 b/metadata/md5-cache/dev-ruby/json-2.0.4
index de0ffd344663..06f3451e1067 100644
--- a/metadata/md5-cache/dev-ruby/json-2.0.4
+++ b/metadata/md5-cache/dev-ruby/json-2.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/json-2.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2225b4dbc6091d6a4904756d74ca46a9
diff --git a/metadata/md5-cache/dev-ruby/json-2.1.0 b/metadata/md5-cache/dev-ruby/json-2.1.0
index 8a2d72124557..3e3479b5bcdb 100644
--- a/metadata/md5-cache/dev-ruby/json-2.1.0
+++ b/metadata/md5-cache/dev-ruby/json-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/json-2.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e6d950706cccaabc3ac8f477f628e75f
diff --git a/metadata/md5-cache/dev-ruby/jwt-1.5.4 b/metadata/md5-cache/dev-ruby/jwt-1.5.4
index 6786ae430112..02c6c8214999 100644
--- a/metadata/md5-cache/dev-ruby/jwt-1.5.4
+++ b/metadata/md5-cache/dev-ruby/jwt-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v1.5.4.tar.gz -> jwt-1.5.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=26145ec949b795b2c09fdd9b289e2696
diff --git a/metadata/md5-cache/dev-ruby/jwt-1.5.5 b/metadata/md5-cache/dev-ruby/jwt-1.5.5
index 1afca16408f9..78e9fa876910 100644
--- a/metadata/md5-cache/dev-ruby/jwt-1.5.5
+++ b/metadata/md5-cache/dev-ruby/jwt-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v1.5.5.tar.gz -> jwt-1.5.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6fa136c666f13d53bebb6c31a5b1cf5f
diff --git a/metadata/md5-cache/dev-ruby/jwt-1.5.6 b/metadata/md5-cache/dev-ruby/jwt-1.5.6
index a3ff1e7ad6d5..399fab5ba7c3 100644
--- a/metadata/md5-cache/dev-ruby/jwt-1.5.6
+++ b/metadata/md5-cache/dev-ruby/jwt-1.5.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v1.5.6.tar.gz -> jwt-1.5.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6fa136c666f13d53bebb6c31a5b1cf5f
diff --git a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2 b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
index 06a2f9543d91..c98d0d68d1fb 100644
--- a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
+++ b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/KirbyBase-2.6.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1ad09b705feeb602b13c3a9881c966be
diff --git a/metadata/md5-cache/dev-ruby/kissfft-0.0.2 b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
index 3017b153034e..3d2f727e6001 100644
--- a/metadata/md5-cache/dev-ruby/kissfft-0.0.2
+++ b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/kissfft-0.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=17564cf74ca56a5482bddf065015b709
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.1.0 b/metadata/md5-cache/dev-ruby/kpeg-1.1.0
index 445d42a0e467..b90887ad44d8 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.1.0
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/kpeg-1.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bbe0e73d1277e6e2039d8f02447bae9c
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.12.0 b/metadata/md5-cache/dev-ruby/kramdown-1.12.0
index 4d26a2b3a227..d7d42d761fc0 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.12.0
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/kramdown-1.12.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f2df49cd01b9c50873a9042d084ee974
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.13.1 b/metadata/md5-cache/dev-ruby/kramdown-1.13.1
index 9b2f50155209..27e7261fb094 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.13.1
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/kramdown-1.13.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=377aa80935d707e3e8ea40127bfe6bbd
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.13.2 b/metadata/md5-cache/dev-ruby/kramdown-1.13.2
index 49d320018d48..027abddf295e 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.13.2
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/kramdown-1.13.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=377aa80935d707e3e8ea40127bfe6bbd
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.13.2-r1 b/metadata/md5-cache/dev-ruby/kramdown-1.13.2-r1
index 85da0be8a042..0f8966ef7292 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.13.2-r1
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.13.2-r1
@@ -10,5 +10,5 @@ RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/kramdown-1.13.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4f00c8e773adc67596786d43b9543117
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.4.3 b/metadata/md5-cache/dev-ruby/launchy-2.4.3
index df9c02c8fd4f..6500444373c3 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.4.3
+++ b/metadata/md5-cache/dev-ruby/launchy-2.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] !
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/launchy-2.4.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=46ec4b755c6c015011cbb1a788b15f8e
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r1 b/metadata/md5-cache/dev-ruby/launchy-2.4.3-r1
index 65551b23af40..510d1027a52a 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r1
+++ b/metadata/md5-cache/dev-ruby/launchy-2.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] !
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/launchy-2.4.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8643305d0168e84804820c99a2471dd0
diff --git a/metadata/md5-cache/dev-ruby/lemon-0.9.1 b/metadata/md5-cache/dev-ruby/lemon-0.9.1
index 3ade3da20e80..20a42d187f00 100644
--- a/metadata/md5-cache/dev-ruby/lemon-0.9.1
+++ b/metadata/md5-cache/dev-ruby/lemon-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/ae[ruby_targets_ruby21] >=dev-ruby/ansi-
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/lemon-0.9.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=af6d78597f3f51eedee4ea2e45734daa
diff --git a/metadata/md5-cache/dev-ruby/letter_opener-1.4.1 b/metadata/md5-cache/dev-ruby/letter_opener-1.4.1
index f8c8cb983b9a..d26871b549c2 100644
--- a/metadata/md5-cache/dev-ruby/letter_opener-1.4.1
+++ b/metadata/md5-cache/dev-ruby/letter_opener-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/launchy[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ryanb/letter_opener/archive/v1.4.1.tar.gz -> letter_opener-1.4.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=50cd7054a61627489b69f23eb3712b8d
diff --git a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2 b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
index cdcc38192938..9fa317d2aed5 100644
--- a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
+++ b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/levenshtein-0.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9939a2dc74930db623c8bcec9d357e3f
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1 b/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
index baed44855cd7..a95d6a9df87f 100644
--- a/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/libxml-ruby-2.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=35f1006752468db466e7cdcadfb481b0
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.9.0 b/metadata/md5-cache/dev-ruby/libxml-2.9.0
index a2bc88c8d18d..615b6f14b187 100644
--- a/metadata/md5-cache/dev-ruby/libxml-2.9.0
+++ b/metadata/md5-cache/dev-ruby/libxml-2.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/libxml-ruby-2.9.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fef412823f1d25dadb037f07afeb04ec
diff --git a/metadata/md5-cache/dev-ruby/liquid-2.6.2 b/metadata/md5-cache/dev-ruby/liquid-2.6.2
index d5fac237bee5..654bf0506883 100644
--- a/metadata/md5-cache/dev-ruby/liquid-2.6.2
+++ b/metadata/md5-cache/dev-ruby/liquid-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/liquid-2.6.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e110d27ff5fd7f2c0dfe8738b27a46b0
diff --git a/metadata/md5-cache/dev-ruby/liquid-3.0.6 b/metadata/md5-cache/dev-ruby/liquid-3.0.6
index 8c98d8a8ef50..4bb859cd77e6 100644
--- a/metadata/md5-cache/dev-ruby/liquid-3.0.6
+++ b/metadata/md5-cache/dev-ruby/liquid-3.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/Shopify/liquid/archive/v3.0.6.tar.gz -> liquid-3.0.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=80c0e3cd32d2e0f8726aa047f5bf5190
diff --git a/metadata/md5-cache/dev-ruby/liquid-c-3.0.0 b/metadata/md5-cache/dev-ruby/liquid-c-3.0.0
index e259cf2aea8e..598155cbd373 100644
--- a/metadata/md5-cache/dev-ruby/liquid-c-3.0.0
+++ b/metadata/md5-cache/dev-ruby/liquid-c-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/liquid-3.0.0[ruby_targets_ruby21] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/liquid-c-3.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=35e431b9de9aaa83fbb7f0ef4e0aebb4
diff --git a/metadata/md5-cache/dev-ruby/listen-0.7.3-r2 b/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
index 513ec4d0b8b5..984cc2bd11b4 100644
--- a/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
+++ b/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/guard/listen/archive/v0.7.3.tar.gz -> listen-0.7.3-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=21566dcc89ed2097699cf45dd572df9d
diff --git a/metadata/md5-cache/dev-ruby/listen-1.3.1-r3 b/metadata/md5-cache/dev-ruby/listen-1.3.1-r3
index 00f7955a2971..47cc7cfb9ec5 100644
--- a/metadata/md5-cache/dev-ruby/listen-1.3.1-r3
+++ b/metadata/md5-cache/dev-ruby/listen-1.3.1-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=https://github.com/guard/listen/archive/v1.3.1.tar.gz -> listen-1.3.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=88320d12311661e37b0e83b1c22d7b1e
diff --git a/metadata/md5-cache/dev-ruby/listen-1.3.1-r4 b/metadata/md5-cache/dev-ruby/listen-1.3.1-r4
index 42ed3d4bf6d8..940ec0e3a6e1 100644
--- a/metadata/md5-cache/dev-ruby/listen-1.3.1-r4
+++ b/metadata/md5-cache/dev-ruby/listen-1.3.1-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=https://github.com/guard/listen/archive/v1.3.1.tar.gz -> listen-1.3.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=772c366d973fd28ccda6e8f4d3e2eaaa
diff --git a/metadata/md5-cache/dev-ruby/listen-2.8.6-r1 b/metadata/md5-cache/dev-ruby/listen-2.8.6-r1
index 47d6d95bd79e..51f00b25e372 100644
--- a/metadata/md5-cache/dev-ruby/listen-2.8.6-r1
+++ b/metadata/md5-cache/dev-ruby/listen-2.8.6-r1
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/listen !!media-radio/ax25 ruby_targets_ruby21? ( >=dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/guard/listen/archive/v2.8.6.tar.gz -> listen-2.8.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a1b1bb7cb708a115e5b03780b2d02e27
diff --git a/metadata/md5-cache/dev-ruby/listen-3.0.8 b/metadata/md5-cache/dev-ruby/listen-3.0.8
index 640e0536d4fb..0a5974b0bcda 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.0.8
+++ b/metadata/md5-cache/dev-ruby/listen-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2 ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.0.8.tar.gz -> listen-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8e1b08ca5d63c5a4ffddfe4a5c48a327
diff --git a/metadata/md5-cache/dev-ruby/listen-3.1.5 b/metadata/md5-cache/dev-ruby/listen-3.1.5
index 50b73ef0b427..45a9e2fbde70 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.1.5
+++ b/metadata/md5-cache/dev-ruby/listen-3.1.5
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2 ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.1.5.tar.gz -> listen-3.1.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=468a8dd5b26745cc3d4f70c8d59ddba5
diff --git a/metadata/md5-cache/dev-ruby/litc-1.0.3-r1 b/metadata/md5-cache/dev-ruby/litc-1.0.3-r1
index 3c3375f5a15a..c0440c8418d8 100644
--- a/metadata/md5-cache/dev-ruby/litc-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/litc-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/litc-1.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=42d931c76504da339a2e300d167c3f4a
diff --git a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4 b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
index e68684acec9a..3aa62dd0a7ee 100644
--- a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
+++ b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/little-plugger-1.1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a4fba6bb8482658e09cbc866282b6002
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.0-r2 b/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
index 1a3fc1307a8a..b9825c14d279 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.0.tar.gz -> locale-2.1.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3a87aabf90bcea2cd140a141b84f7890
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.1 b/metadata/md5-cache/dev-ruby/locale-2.1.1
index 311082d4949c..0584cb45575d 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.1
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.1.tar.gz -> locale-2.1.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4449157248c2b55b1e80a9632eb2beff
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.2 b/metadata/md5-cache/dev-ruby/locale-2.1.2
index 24d3ed520d94..89a8640770b2 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.2
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.2.tar.gz -> locale-2.1.2-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=59708b1e5e37909e12622a6f4c142438
diff --git a/metadata/md5-cache/dev-ruby/lockfile-2.1.3 b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
index 074b21f2d774..76dd1cc2a9b8 100644
--- a/metadata/md5-cache/dev-ruby/lockfile-2.1.3
+++ b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/lockfile-2.1.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2af56df5bae9bb4123c769ce72cc0f50
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
index 954d5d7ec62f..acf5483a16d7 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/log4r-1.1.10.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e1ae7d229cf932f2ebd168d45f97423a
diff --git a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0 b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
index ee5831486b3a..95008e728998 100644
--- a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
+++ b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/log_buddy-0.7.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4ce7ced49a9218ffa57ec9a3b4d21c33
diff --git a/metadata/md5-cache/dev-ruby/logging-2.1.0 b/metadata/md5-cache/dev-ruby/logging-2.1.0
index 1607d45e5037..17c8488de635 100644
--- a/metadata/md5-cache/dev-ruby/logging-2.1.0
+++ b/metadata/md5-cache/dev-ruby/logging-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/logging-2.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bed46841267948e4466e24467b4b4895
diff --git a/metadata/md5-cache/dev-ruby/logging-2.2.0 b/metadata/md5-cache/dev-ruby/logging-2.2.0
index 25220cb7700e..107d2041a620 100644
--- a/metadata/md5-cache/dev-ruby/logging-2.2.0
+++ b/metadata/md5-cache/dev-ruby/logging-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/logging-2.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=767d4c399064a5e7355688033f36fab9
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.4 b/metadata/md5-cache/dev-ruby/logue-1.0.4
index 14cdd0716283..604e53a0b86f 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.4
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/jpace/logue/archive/v1.0.4.tar.gz -> logue-git-1.0.4.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=176107018f1b712d1034aa943e0387bc
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.0.3 b/metadata/md5-cache/dev-ruby/loofah-2.0.3
index 39538ef9e933..46b64ad24444 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.0.3
+++ b/metadata/md5-cache/dev-ruby/loofah-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/loofah-2.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a82bbd3da4952ef04258418dd5677b31
diff --git a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2 b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
index 8e4908763d03..7fc79d84a31e 100644
--- a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
+++ b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/loquacious-1.9.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=334d6074620b3337361b3e7c90ca4753
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.0.10 b/metadata/md5-cache/dev-ruby/lumberjack-1.0.10
index 9079e9fc6820..50280009f4fa 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.0.10
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.0.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/lumberjack-1.0.10.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fbf64e1eb50335bfceeeb53879ebab86
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.0.11 b/metadata/md5-cache/dev-ruby/lumberjack-1.0.11
index 53759287bccb..0078e86c233f 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.0.11
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.0.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/lumberjack-1.0.11.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cd6905eba6ce82072e0f59317e2fe1e3
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.0.12 b/metadata/md5-cache/dev-ruby/lumberjack-1.0.12
index 19dca05e54b4..23025b16fa2e 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.0.12
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.0.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/lumberjack-1.0.12.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4bee1697608d7f0eacf5bf38bbaebc97
diff --git a/metadata/md5-cache/dev-ruby/mab-0.0.3 b/metadata/md5-cache/dev-ruby/mab-0.0.3
index 6fa63c2b4f2b..a4bf9909d4a2 100644
--- a/metadata/md5-cache/dev-ruby/mab-0.0.3
+++ b/metadata/md5-cache/dev-ruby/mab-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/mab-0.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f9f05045b943045993071167754fa550
diff --git a/metadata/md5-cache/dev-ruby/magic-0.2.9 b/metadata/md5-cache/dev-ruby/magic-0.2.9
index bb7a7c8498ed..ce85c169c56e 100644
--- a/metadata/md5-cache/dev-ruby/magic-0.2.9
+++ b/metadata/md5-cache/dev-ruby/magic-0.2.9
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/file ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/qoobaa/magic/archive/v0.2.9.tar.gz -> magic-0.2.9.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0a556841b01ce3f13f5effc5b8764fc5
diff --git a/metadata/md5-cache/dev-ruby/mail-2.6.4 b/metadata/md5-cache/dev-ruby/mail-2.6.4
index 2e5965c154f7..867beca6f4f2 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.6.4
+++ b/metadata/md5-cache/dev-ruby/mail-2.6.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2.6
 SRC_URI=https://github.com/mikel/mail/archive/2.6.4.tar.gz -> mail-2.6.4-git.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=af4255dcf696fbf10c360a71986ebc11
diff --git a/metadata/md5-cache/dev-ruby/mail-2.6.5 b/metadata/md5-cache/dev-ruby/mail-2.6.5
index e031f120eb73..aa5f49eeb0a6 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.6.5
+++ b/metadata/md5-cache/dev-ruby/mail-2.6.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2.6
 SRC_URI=https://github.com/mikel/mail/archive/2.6.5.tar.gz -> mail-2.6.5-git.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=42edd28262d9a422ece0865b88574914
diff --git a/metadata/md5-cache/dev-ruby/map-6.6.0 b/metadata/md5-cache/dev-ruby/map-6.6.0
index 28bb28aa851b..ced869085aa9 100644
--- a/metadata/md5-cache/dev-ruby/map-6.6.0
+++ b/metadata/md5-cache/dev-ruby/map-6.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/map-6.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9179f01ecbd34eacfef41ed36f3f5240
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1 b/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1
index 30641d56c2be..d352b0b00fc2 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/maruku-0.7.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c240c2f4c7a9f99c0d1ce033a12c4b1b
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.3 b/metadata/md5-cache/dev-ruby/maruku-0.7.3
index 8debfdb29a66..83d7961d17c2 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.3
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/maruku-0.7.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=73d887cbdd0417430cbff945e1266cb4
diff --git a/metadata/md5-cache/dev-ruby/mash-0.1.1-r2 b/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
index a4a84ebf701a..614b3b9b0beb 100644
--- a/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/mash-0.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=130334c562f9cf0b2122a855a0060d88
diff --git a/metadata/md5-cache/dev-ruby/maxitest-2.4.0 b/metadata/md5-cache/dev-ruby/maxitest-2.4.0
index 59aeb83f9578..436875848234 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-2.4.0
+++ b/metadata/md5-cache/dev-ruby/maxitest-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v2.4.0.tar.gz -> maxitest-2.4.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=20dd4e0df043e0db3b555e70dd94954a
diff --git a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1 b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
index 2e7fb13b0ae7..3bfc3bebe196 100644
--- a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
+++ b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
@@ -10,5 +10,5 @@ RDEPEND=~app-text/mecab-0.996 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://mecab.googlecode.com/files/mecab-ruby-0.996.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=54f330f3c48e1ae09590cd4ced50d638
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1 b/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
index 07dd81a06aa7..b73eba49ab0c 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mechanize-2.7.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=22ae27f0d28f361ff32d953ec52339ca
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.5 b/metadata/md5-cache/dev-ruby/mechanize-2.7.5
index e7bd072a0006..8bd78b61dbe5 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.5
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mechanize-2.7.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f30e7b20fa77c5c099a15b893193f3b9
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2 b/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2
index 78e1c38204ec..69a6d3cdb048 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/mechanize-2.7.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=34b8ce1064417d0b997cd02afee2034f
diff --git a/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r2 b/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r2
index 41a913b2810c..4ec20f8fa3e3 100644
--- a/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r2
+++ b/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/memcache-client-1.8.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=32815ce3e9118f19f5db109423687baa
diff --git a/metadata/md5-cache/dev-ruby/memoist-0.14.0 b/metadata/md5-cache/dev-ruby/memoist-0.14.0
index c751a1d10235..196814ba0fb2 100644
--- a/metadata/md5-cache/dev-ruby/memoist-0.14.0
+++ b/metadata/md5-cache/dev-ruby/memoist-0.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/memoist-0.14.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3916f87455a49078dc3f0bac70af2359
diff --git a/metadata/md5-cache/dev-ruby/memoist-0.15.0 b/metadata/md5-cache/dev-ruby/memoist-0.15.0
index b53d7e8954ca..e25f19decea3 100644
--- a/metadata/md5-cache/dev-ruby/memoist-0.15.0
+++ b/metadata/md5-cache/dev-ruby/memoist-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/memoist-0.15.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3916f87455a49078dc3f0bac70af2359
diff --git a/metadata/md5-cache/dev-ruby/memoizable-0.4.2 b/metadata/md5-cache/dev-ruby/memoizable-0.4.2
index a5b58724ecc7..41dfea8f0a6e 100644
--- a/metadata/md5-cache/dev-ruby/memoizable-0.4.2
+++ b/metadata/md5-cache/dev-ruby/memoizable-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/memoizable-0.4.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=178b85329ce79c8005aebb51012eb515
diff --git a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1 b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
index 1b6186f6c219..b0dafc43a8df 100644
--- a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/memoize-1.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=78c519985113b2977d9af53cd73a8e93
diff --git a/metadata/md5-cache/dev-ruby/mercenary-0.3.5 b/metadata/md5-cache/dev-ruby/mercenary-0.3.5
index 26a8fc8f05e9..44d81e678456 100644
--- a/metadata/md5-cache/dev-ruby/mercenary-0.3.5
+++ b/metadata/md5-cache/dev-ruby/mercenary-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mercenary-0.3.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8f3eda51d6d7bc9170b20b1298e6838e
diff --git a/metadata/md5-cache/dev-ruby/mercenary-0.3.6 b/metadata/md5-cache/dev-ruby/mercenary-0.3.6
index 0988c4b207ce..5a9f91bfc47b 100644
--- a/metadata/md5-cache/dev-ruby/mercenary-0.3.6
+++ b/metadata/md5-cache/dev-ruby/mercenary-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/mercenary-0.3.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=00df9bff5204210a5a7e9936fcdb304d
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
index b3dfcba0e285..b4fb3ba1bb72 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9536ce8a4196fd1b6359152f8ddecd23
diff --git a/metadata/md5-cache/dev-ruby/metaid-1.0-r3 b/metadata/md5-cache/dev-ruby/metaid-1.0-r3
index ceeb7d77a3d7..b1dfe3d8a3f2 100644
--- a/metadata/md5-cache/dev-ruby/metaid-1.0-r3
+++ b/metadata/md5-cache/dev-ruby/metaid-1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/metaid-1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4ea1c72503a1102e1d7215410e423fd7
diff --git a/metadata/md5-cache/dev-ruby/metasm-1.0.2-r4 b/metadata/md5-cache/dev-ruby/metasm-1.0.2-r4
index 011954853433..9ab673f67fcb 100644
--- a/metadata/md5-cache/dev-ruby/metasm-1.0.2-r4
+++ b/metadata/md5-cache/dev-ruby/metasm-1.0.2-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.0.2
 SRC_URI=mirror://rubygems/metasm-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6721f21af482114db9e68234cf3c07dc
diff --git a/metadata/md5-cache/dev-ruby/metasm-9999 b/metadata/md5-cache/dev-ruby/metasm-9999
index 4a07e3cb54c6..2bb651b855f0 100644
--- a/metadata/md5-cache/dev-ruby/metasm-9999
+++ b/metadata/md5-cache/dev-ruby/metasm-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=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_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_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=9999
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4f8abbac5426f1e996831b52a9da60d9
diff --git a/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.1 b/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.1
index 6e72d92c5470..b9aaf08b82bf 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.1
+++ b/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=2.0
 SRC_URI=mirror://rubygems/metasploit-concern-2.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a03bdbf1da27e705ba510171508c1df9
diff --git a/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.3 b/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.3
index 9ac46f71f0ff..1e8ace3b239d 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.3
+++ b/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=2.0
 SRC_URI=mirror://rubygems/metasploit-concern-2.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=91375d251a783ee7433eb6c8af6f3e30
diff --git a/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.3 b/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.3
index 5190d820adcd..0f80cc4b22ae 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.3
+++ b/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=2.0.3
 SRC_URI=mirror://rubygems/metasploit-credential-2.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=73892c58af3e48c01b4d48f7d5c1797f
diff --git a/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.8 b/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.8
index d4952cc32d71..9a48ce376c5b 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.8
+++ b/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=2.0.8
 SRC_URI=mirror://rubygems/metasploit-credential-2.0.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=524848039cf6903a77c87a608bbfaeca
diff --git a/metadata/md5-cache/dev-ruby/metasploit-model-2.0.0 b/metadata/md5-cache/dev-ruby/metasploit-model-2.0.0
index 27ea0c605215..8bfef8f2d118 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-model-2.0.0
+++ b/metadata/md5-cache/dev-ruby/metasploit-model-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=2.0
 SRC_URI=mirror://rubygems/metasploit-model-2.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b333499504b09190f5c2eee86dce7414
diff --git a/metadata/md5-cache/dev-ruby/metasploit-model-2.0.3 b/metadata/md5-cache/dev-ruby/metasploit-model-2.0.3
index 0dd4303ff666..2fb1f3e4e5d1 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-model-2.0.3
+++ b/metadata/md5-cache/dev-ruby/metasploit-model-2.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=2.0
 SRC_URI=mirror://rubygems/metasploit-model-2.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=299632ef45464c774d6f198bce5ba236
diff --git a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.11 b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.11
index b31f0e9c6338..6d8fbe0560ff 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.11
+++ b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test strip
 SLOT=1.1.11
 SRC_URI=mirror://rubygems/metasploit-payloads-1.1.11.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c6fc81ed278a3c083b6b5e074aeec4de
diff --git a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.13 b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.13
index a30360e8926c..35f694ced61d 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.13
+++ b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test strip
 SLOT=1.1.13
 SRC_URI=mirror://rubygems/metasploit-payloads-1.1.13.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c6fc81ed278a3c083b6b5e074aeec4de
diff --git a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.24 b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.24
index 13ad69026d20..42c70ee7c9a1 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.24
+++ b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.24
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test strip
 SLOT=1.2.24
 SRC_URI=mirror://rubygems/metasploit-payloads-1.2.24.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9d822da170a41affaa18c22322295ece
diff --git a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.28 b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.28
index d304529a70f9..ef57c2b3f9aa 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.28
+++ b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.28
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test strip
 SLOT=1.2.28
 SRC_URI=mirror://rubygems/metasploit-payloads-1.2.28.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9d822da170a41affaa18c22322295ece
diff --git a/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.0 b/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.0
index ef7791c52d70..acec0f65bbdf 100644
--- a/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.0
+++ b/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=2.0.0
 SRC_URI=mirror://rubygems/metasploit_data_models-2.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9a06f8fb293f816660c6915b88cc786b
diff --git a/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.14 b/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.14
index e07c2981b1b6..107c1d503c68 100644
--- a/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.14
+++ b/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=2.0.14
 SRC_URI=mirror://rubygems/metasploit_data_models-2.0.14.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=747535d383e41241508d1558c54d4617
diff --git a/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.0.6 b/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.0.6
index 9ee7ce6f9ca6..fce526d38167 100644
--- a/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.0.6
+++ b/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test strip
 SLOT=0.0.6
 SRC_URI=mirror://rubygems/metasploit_payloads-mettle-0.0.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3dde0707d278ab906026f4098f24d202
diff --git a/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.1.9 b/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.1.9
index 62b03fa7980b..3a0f0680209d 100644
--- a/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.1.9
+++ b/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.1.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test strip
 SLOT=0.1.9
 SRC_URI=mirror://rubygems/metasploit_payloads-mettle-0.1.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2bc45c83dfd4754126c93c9a8028bac0
diff --git a/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.22 b/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.22
index fa0702362f0c..52f50fbb802b 100644
--- a/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.22
+++ b/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.22
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0.0.22
 SRC_URI=mirror://rubygems/meterpreter_bins-0.0.22.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6cf39fe50ac864c953585a6f91bddea1
diff --git a/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3 b/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
index 3be76b150d60..53858b3a59df 100644
--- a/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
+++ b/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/method_source-0.8.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fc6163fca3f3bcd9d1a23582eeff3a43
diff --git a/metadata/md5-cache/dev-ruby/mime-types-1.25.1 b/metadata/md5-cache/dev-ruby/mime-types-1.25.1
index 3643d379a60d..f64bca65d80a 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-1.25.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-1.25.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mime-types-1.25.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8639928f70b6530a6f5027bce544c18b
diff --git a/metadata/md5-cache/dev-ruby/mime-types-2.6.2 b/metadata/md5-cache/dev-ruby/mime-types-2.6.2
index dbb5437c1b04..9bd002ff704a 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-2.6.2
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/mime-types-2.6.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=51191d279b2ffafa9973a8f45616c6a9
diff --git a/metadata/md5-cache/dev-ruby/mime-types-2.99.2 b/metadata/md5-cache/dev-ruby/mime-types-2.99.2
index fc5bb0d998c2..7126d5c5d435 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-2.99.2
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.99.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/mime-types-2.99.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7c15212de037b78dcfd633c91beba6e0
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.0 b/metadata/md5-cache/dev-ruby/mime-types-3.0
index c0ef1a3085ce..f99b467996a2 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.0
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5b459965b2cdf442dd28ff059af8c1c3
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.0-r1 b/metadata/md5-cache/dev-ruby/mime-types-3.0-r1
index 8da121ba06fb..27d7c2c2bb9a 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.0-r1
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dd4b05f220bbb097c726b3119a929537
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.1 b/metadata/md5-cache/dev-ruby/mime-types-3.1
index cddc74f659fc..e2bf06424a5d 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5959819f16d2a90b55074d0977b17ba2
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2015.1120 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2015.1120
index 00b295a81aca..de382421d13c 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2015.1120
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2015.1120
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-data-3.2015.1120.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1772d5bb1067aab457161657654dba2c
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0221 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0221
index d1d30579c0fd..4f12156960eb 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0221
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0221
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-data-3.2016.0221.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=72efa1ef07350007a927990282a91316
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0521 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0521
index 8e915efa2637..1690d9b4550d 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0521
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0521
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-data-3.2016.0521.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=72efa1ef07350007a927990282a91316
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.1 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.1
index d493bafcb03c..0c51b59db5fb 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.1
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/mimemagic-0.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=decb7467623f8603b30d7165d1076dfc
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.2 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.2
index db4e0869356e..25a2dbf5fc08 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.2
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/mimemagic-0.3.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=decb7467623f8603b30d7165d1076dfc
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.4.0-r1 b/metadata/md5-cache/dev-ruby/mini_magick-4.4.0-r1
index 166e06db4002..751c47881a95 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/imagemagick ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.4.0.tar.gz -> mini_magick-4.4.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=24b49ae178a9cffe3508328526d0b181
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.5.1-r1 b/metadata/md5-cache/dev-ruby/mini_magick-4.5.1-r1
index 5d82a260f44e..f90442f3ec8a 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/imagemagick ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.5.1.tar.gz -> mini_magick-4.5.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4ab62f9daa3e82a9ec2bd2de439512f5
diff --git a/metadata/md5-cache/dev-ruby/mini_shoulda-0.5.0-r1 b/metadata/md5-cache/dev-ruby/mini_shoulda-0.5.0-r1
index 5a7e4da856c7..0466fa040f02 100644
--- a/metadata/md5-cache/dev-ruby/mini_shoulda-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/mini_shoulda-0.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >dev-ruby/minitest-2.1.0[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/mini_shoulda-0.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ef6e9709989043d2de7da241546c5afb
diff --git a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1 b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
index 3446e3f3c000..a466bb69473f 100644
--- a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-4.7.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b221d10e0916a10fee176c98bb4558b8
diff --git a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2 b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
index f98a8821baf8..ac1f8eaa915d 100644
--- a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
+++ b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-4.7.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=811a7bbe3892b2bf0cba62363812c589
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.10.1 b/metadata/md5-cache/dev-ruby/minitest-5.10.1
index f40054df7ac5..f0599ea6c179 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.10.1
+++ b/metadata/md5-cache/dev-ruby/minitest-5.10.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.10.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=574f8a12b4f705266a48b88367fa129e
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.10.2 b/metadata/md5-cache/dev-ruby/minitest-5.10.2
index 333c339dcc19..b2d64683eeec 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.10.2
+++ b/metadata/md5-cache/dev-ruby/minitest-5.10.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.10.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=058f558435ee31f0a02eb986bbb3556d
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1 b/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1
index 8029c8f4895f..3b9f021a5e5a 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.3.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9d86c08cd1d5746fe917b9a92f80f99f
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.8.4 b/metadata/md5-cache/dev-ruby/minitest-5.8.4
index daf202a4015c..4bd805a0849e 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.8.4
+++ b/metadata/md5-cache/dev-ruby/minitest-5.8.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.8.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ae4d5f921c3a8d77283b2c1394c6e42a
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.9.0 b/metadata/md5-cache/dev-ruby/minitest-5.9.0
index d5a218cd7c62..10e2ebe57560 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.9.0
+++ b/metadata/md5-cache/dev-ruby/minitest-5.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.9.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=110ba35b5a0fb239572ce498f2d3bd7c
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.9.1 b/metadata/md5-cache/dev-ruby/minitest-5.9.1
index 0562592de1f4..23080ab4ea52 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.9.1
+++ b/metadata/md5-cache/dev-ruby/minitest-5.9.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.9.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=110ba35b5a0fb239572ce498f2d3bd7c
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-2.0 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-2.0
index c175fd5bec98..7886806c3e53 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-2.0
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/minitest-bonus-assertions-2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cf60053fa679a04d7d172fc5dff46bb7
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
index 4d1493d24ab2..a91395c9f04a 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/minitest-bonus-assertions-3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1e94de59d6d635943325f8934a4e5ed2
diff --git a/metadata/md5-cache/dev-ruby/minitest-hooks-1.4.0 b/metadata/md5-cache/dev-ruby/minitest-hooks-1.4.0
index fe47fcc86ccd..04b195667a3d 100644
--- a/metadata/md5-cache/dev-ruby/minitest-hooks-1.4.0
+++ b/metadata/md5-cache/dev-ruby/minitest-hooks-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/minitest-hooks-1.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c7d93e591ca91f248726f3170158091e
diff --git a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1 b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
index c96cb347713b..a95d7626c5fa 100644
--- a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
+++ b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-pretty_diff-0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f3d2a70479cca2461530563e1d8d1a55
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.7 b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.7
index 9fcc0e286b64..c7e1b3b051dd 100644
--- a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.7
+++ b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/opscode/mixlib-shellout/archive/2.2.7.tar.gz -> mixlib-shellout-2.2.7.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0179b2def9db846c0856046d6bc370b8
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2 b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
index c4830a72dea2..70df5d524c14 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
+++ b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.10
 SRC_URI=mirror://rubygems/mocha-0.10.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=556d54e1c8256d237c70a06c6736f1bc
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1 b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
index b2c2e2674760..31bb40fef04e 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.11
 SRC_URI=mirror://rubygems/mocha-0.11.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c33a962b147f925ce320772e536b0f80
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1 b/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
index 16a1a8d75d25..0b7edfe573f4 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.12
 SRC_URI=mirror://rubygems/mocha-0.12.10.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3a9ae5181d887a4daaf2cb6fafe15f0f
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2 b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
index 30a66e8e3891..ba1ead2cd8da 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
+++ b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.13
 SRC_URI=mirror://rubygems/mocha-0.13.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d0414922466ff1ab3b08c5df6ed00bd8
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.14.0 b/metadata/md5-cache/dev-ruby/mocha-0.14.0
index fd50da4d4463..a17a9b024f8f 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.14.0
+++ b/metadata/md5-cache/dev-ruby/mocha-0.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.14
 SRC_URI=mirror://rubygems/mocha-0.14.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8b50de9c40bc8698392a44bdb2d886c6
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.1.0 b/metadata/md5-cache/dev-ruby/mocha-1.1.0
index 5b7f5927c522..5bb4cb54a8e7 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.1.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/introspection[ruby_targets_ruby21] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/mocha-1.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f55a92e3dd7779c8815c56f37d5931df
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.2.0 b/metadata/md5-cache/dev-ruby/mocha-1.2.0
index c0abfac37666..0c8fef06c07d 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.2.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/mocha-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1928862b5077d4127b84fc9cfb5b0bee
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.2.1 b/metadata/md5-cache/dev-ruby/mocha-1.2.1
index 907f1e7bce1c..f10fa3d4e3e6 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.2.1
+++ b/metadata/md5-cache/dev-ruby/mocha-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/mocha-1.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1928862b5077d4127b84fc9cfb5b0bee
diff --git a/metadata/md5-cache/dev-ruby/modernizr-2.6.2 b/metadata/md5-cache/dev-ruby/modernizr-2.6.2
index 8f12795c077e..1549ff4aa2d4 100644
--- a/metadata/md5-cache/dev-ruby/modernizr-2.6.2
+++ b/metadata/md5-cache/dev-ruby/modernizr-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/modernizr-2.6.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=afea323c3b355a013a43ec3a0fec4652
diff --git a/metadata/md5-cache/dev-ruby/moneta-0.8.1 b/metadata/md5-cache/dev-ruby/moneta-0.8.1
index 316c23586dae..7a31a5e317fb 100644
--- a/metadata/md5-cache/dev-ruby/moneta-0.8.1
+++ b/metadata/md5-cache/dev-ruby/moneta-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v0.8.1.tar.gz -> moneta-0.8.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9e655eebdcd0dcaacfbf2e27d7e02a0f
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.0.0 b/metadata/md5-cache/dev-ruby/moneta-1.0.0
index b34857a87993..df5b11d6babc 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.0.0
+++ b/metadata/md5-cache/dev-ruby/moneta-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.0.0.tar.gz -> moneta-1.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f0045e836bc865d4ab964647906f4ca3
diff --git a/metadata/md5-cache/dev-ruby/mongo-2.0.6 b/metadata/md5-cache/dev-ruby/mongo-2.0.6
index 8abe7059431f..4d074eb1b972 100644
--- a/metadata/md5-cache/dev-ruby/mongo-2.0.6
+++ b/metadata/md5-cache/dev-ruby/mongo-2.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-ruby-driver/archive/2.0.6.tar.gz -> mongo-ruby-driver-2.0.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4f46bdb672b5676c81173e5ca239d2f3
diff --git a/metadata/md5-cache/dev-ruby/msgpack-0.7.6 b/metadata/md5-cache/dev-ruby/msgpack-0.7.6
index 7d97f45f800d..4cc88107c66b 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-0.7.6
+++ b/metadata/md5-cache/dev-ruby/msgpack-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/msgpack-0.7.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2adabb97be76cfa52628a33afad78331
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.0.1 b/metadata/md5-cache/dev-ruby/msgpack-1.0.1
index 02d67fe0232f..28915d0f0c02 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.0.1
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/msgpack-1.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ec73c7f0f11a21e6a00d9b1dfb8cd3cc
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.0.2 b/metadata/md5-cache/dev-ruby/msgpack-1.0.2
index 660e2450a035..066a9801a979 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.0.2
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/msgpack-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5f9671b670a1caa80f7fedaf9dd1fa20
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.0.3 b/metadata/md5-cache/dev-ruby/msgpack-1.0.3
index ffb193ce12ee..5711edda8785 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.0.3
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/msgpack-1.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5788976a1a4574ae28bc2f6dabaddef0
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.1.0 b/metadata/md5-cache/dev-ruby/msgpack-1.1.0
index 24ba0a2b027f..45e93184b6ac 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.1.0
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/msgpack-1.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5788976a1a4574ae28bc2f6dabaddef0
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.11.2 b/metadata/md5-cache/dev-ruby/multi_json-1.11.2
index 1be1433e6e7e..cab674469bf5 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.11.2
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.11.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby21] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.11.2.tar.gz -> multi_json-1.11.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=18beb28258a6785d7de95d41cf0bed20
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.12.1 b/metadata/md5-cache/dev-ruby/multi_json-1.12.1
index 4d476aa4e024..c8b38c3d5746 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.12.1
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.12.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby21] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.12.1.tar.gz -> multi_json-1.12.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=eb5f66674d79654e7badcf53ba8e6e46
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.9.3 b/metadata/md5-cache/dev-ruby/multi_json-1.9.3
index a6e870272a5d..687e4219c19d 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.9.3
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby21] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_json-1.9.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a17858913ad72b47081efc89785da2ab
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.2 b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
index 145e2baca37f..80ef83f492eb 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.2
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/multi_test-0.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=db6bbcc0f3d6d80a87c9bd59323c88a0
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2 b/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
index 692e8a059185..9b107452efaa 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_xml-0.5.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f9a2918df6f79bfa1d85c08c4c0ef23b
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.5.5 b/metadata/md5-cache/dev-ruby/multi_xml-0.5.5
index f6f4cc2a441b..6e067c439fdc 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.5.5
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_xml-0.5.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=35be36ac0c97c984099641fa61dc6f67
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0 b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0
index 46bf9417a5e8..dfa4fdeb3794 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/sferik/multi_xml/archive/v0.6.0.tar.gz -> multi_xml-0.6.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6f15d0701faca07a21104f9d83c94c28
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
index b15445e036d9..9a2ba27b5bc6 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/multipart-post-2.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=50e6cbea631b0f18979b72e54fd3ca85
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.0.2 b/metadata/md5-cache/dev-ruby/mustache-1.0.2
index 1a68aeba5b2b..6fb8cebdd107 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.0.2
+++ b/metadata/md5-cache/dev-ruby/mustache-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7a269717cef8e79958e3f2711149e10f
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.0.3 b/metadata/md5-cache/dev-ruby/mustache-1.0.3
index 26c653037d5b..4c9c99874328 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.0.3
+++ b/metadata/md5-cache/dev-ruby/mustache-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-1.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e3f1e63e35082f0130f7034b6a55d15d
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.0.4 b/metadata/md5-cache/dev-ruby/mustache-1.0.4
index 5f2a3f5b69e8..e78ab0431678 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.0.4
+++ b/metadata/md5-cache/dev-ruby/mustache-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-1.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9795c93691817456aaa8314195f74055
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.0.5 b/metadata/md5-cache/dev-ruby/mustache-1.0.5
index e900eb492975..a1d16c392117 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.0.5
+++ b/metadata/md5-cache/dev-ruby/mustache-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-1.0.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cc1783d6dbbc42350d70d5d01366f921
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.3.20 b/metadata/md5-cache/dev-ruby/mysql2-0.3.20
index d88bafa5b8aa..65e7324dc343 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.3.20
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.3.20
@@ -10,5 +10,5 @@ RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.3
 SRC_URI=mirror://rubygems/mysql2-0.3.20.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7b4027f2f876c4e8c9e2d07852e14afc
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.3.21 b/metadata/md5-cache/dev-ruby/mysql2-0.3.21
index 081d19b2758d..b33d3ef11413 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.3.21
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.3.21
@@ -10,5 +10,5 @@ RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.3
 SRC_URI=mirror://rubygems/mysql2-0.3.21.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4e2ec3dfe7d5e8f6832bad3e34cf3a9a
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.4.4 b/metadata/md5-cache/dev-ruby/mysql2-0.4.4
index 30328eddea6f..72f402beb486 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.4.4
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.4.4
@@ -10,5 +10,5 @@ RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.4
 SRC_URI=mirror://rubygems/mysql2-0.4.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=feb67353e500f0b313dcd01d4fb0d602
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.4.5 b/metadata/md5-cache/dev-ruby/mysql2-0.4.5
index d213ab135bc5..5156e9ba6dfc 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.4.5
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.4.5
@@ -10,5 +10,5 @@ RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.4
 SRC_URI=mirror://rubygems/mysql2-0.4.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=feb67353e500f0b313dcd01d4fb0d602
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.4.6 b/metadata/md5-cache/dev-ruby/mysql2-0.4.6
index 03af43156b1c..99b0d7aa8e91 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.4.6
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.4.6
@@ -10,5 +10,5 @@ RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.4
 SRC_URI=mirror://rubygems/mysql2-0.4.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=071cf1d293033b9a2a4219a06e98c6f4
diff --git a/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1 b/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
index c9b2859e9c85..6f8faa45168f 100644
--- a/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nagios-0.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3001a75c4d9d8d3a0fad66f6f6e85675
diff --git a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1 b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
index 03803af0f9bd..4fdd51765d61 100644
--- a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nagios_analyzer-0.0.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4eb0069f600956db3de556dae72eaadd
diff --git a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1 b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
index e4fb6a14b0d1..9b2c7f4e0ecd 100644
--- a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
+++ b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanotest-0.9.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4b81221c04d80b5cfa93564b4c40d9c5
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.1 b/metadata/md5-cache/dev-ruby/narray-0.6.1.1
index a47d7135420d..cd1cae84444c 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.1
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.1.tar.gz -> narray-0.6.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f73ee3ac3c0348aebbb1f9e8ff776251
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
index 6149c50d859b..b9daa2b5f9cd 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.2
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=894f2ed217501214b171de3a1a2289fd
diff --git a/metadata/md5-cache/dev-ruby/naught-1.1.0 b/metadata/md5-cache/dev-ruby/naught-1.1.0
index 3971721a5a37..6ef103b63d0b 100644
--- a/metadata/md5-cache/dev-ruby/naught-1.1.0
+++ b/metadata/md5-cache/dev-ruby/naught-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5
 SRC_URI=mirror://rubygems/naught-1.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=116d03f2b20bc7c7428dd66c151b29fc
diff --git a/metadata/md5-cache/dev-ruby/nenv-0.3.0 b/metadata/md5-cache/dev-ruby/nenv-0.3.0
index ba1da06b3983..15d314d29352 100644
--- a/metadata/md5-cache/dev-ruby/nenv-0.3.0
+++ b/metadata/md5-cache/dev-ruby/nenv-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/e2/nenv/archive/v0.3.0.tar.gz -> nenv-0.3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=19a42ff1242585d83764fb885cc38f45
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.0 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.0
index 7dc22d562d9e..073db648e730 100644
--- a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.0
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/neovim-0.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6bc2a755e4f5adcee3a2f48df7389935
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.1 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.1
index 5c4798f15107..efb9bf30c667 100644
--- a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.1
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/neovim-0.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6bc2a755e4f5adcee3a2f48df7389935
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.2 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.2
index 2d8806453d73..794b3952b919 100644
--- a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.2
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/neovim-0.3.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2f06b56dc10b36261e6f73ebb4b03316
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.4.0 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.4.0
index 30e122af11ab..67eda0f6a2a4 100644
--- a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.4.0
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/neovim-0.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2f06b56dc10b36261e6f73ebb4b03316
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
index 1e2c140b308d..5dc2a2170afe 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-digest_auth-1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0132e2324d395c17aa5b75963595f199
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
index 099d9c64d73a..2d416eec2900 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-digest_auth-1.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=87f65bb0e6c8fd083be5df6e6f5d26cb
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
index 10e79a56c29c..f84594fabd0d 100644
--- 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
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-persistent-2.9.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0912f7f125b38c929d8fc00560cb03da
diff --git a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1 b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
index 1fdf6df5cb96..d583cf7f61b2 100644
--- a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
+++ b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/net-http-pipeline-1.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=695fcd495c1a541d6d87b3208c8db690
diff --git a/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1 b/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1
index f558f2c0e225..92a21965f951 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-scp-1.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4238183e6e2966cf091defd2b59bdace
diff --git a/metadata/md5-cache/dev-ruby/net-scp-1.2.1 b/metadata/md5-cache/dev-ruby/net-scp-1.2.1
index 606ff7208651..77b30593eb0d 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-1.2.1
+++ b/metadata/md5-cache/dev-ruby/net-scp-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-scp-1.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0cf8e5e579608ae89c1fa5e2226250a7
diff --git a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2 b/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
index a39cc79d9b16..1b32719aff7b 100644
--- a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-sftp-2.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=00751fba48bf6444849fa37e85c890ba
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-2.10.0 b/metadata/md5-cache/dev-ruby/net-ssh-2.10.0
index 528e589e4582..c0cd30aa3179 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.10.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.10.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2.6
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v2.10.0.tar.gz -> net-ssh-git-2.10.0.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=51be7af97b28904ff0ffe41e5335bfc3
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-3.2.0 b/metadata/md5-cache/dev-ruby/net-ssh-3.2.0
index 0d7b3f96347a..0160ac992736 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-3.2.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v3.2.0.tar.gz -> net-ssh-git-3.2.0.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7574fc2895a53c22cf729861c675f84f
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-4.1.0 b/metadata/md5-cache/dev-ruby/net-ssh-4.1.0
index 1efe347db6fa..f40d53e842ed 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-4.1.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] sodium? ( d
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v4.1.0.tar.gz -> net-ssh-git-4.1.0.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=29e171e78041c2d89a995a2a22309b9a
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1
index 83580c9a306f..090fa163ea1a 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-ssh-gateway-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c8cb77da2c6b87b74338a7fe61640a18
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.3.0 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.3.0
index 9dbd5428a456..b210bfbf559e 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.3.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5:*[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-ssh-gateway/archive/1.3.0.tar.gz -> net-ssh-gateway-1.3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6ec8c7afdb846aa5560ce6578d602916
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
index 52bc521335d7..71fb63087eb2 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2.0
 SRC_URI=https://github.com/net-ssh/net-ssh-gateway/archive/2.0.0.tar.gz -> net-ssh-gateway-2.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b6e14d18f29b444e1ec8e0ce5d0a5ebb
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1 b/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1
index a098bf859ccf..3498d6d36060 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-ssh-multi/archive/v1.2.1.tar.gz -> net-ssh-multi-1.2.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0df1b057ae50c8f45cd1b39b2616c398
diff --git a/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1 b/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1
index c00580f815c3..fb2d682e26ce 100644
--- a/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=https://github.com/ruby/net-telnet/archive/v0.1.1.tar.gz -> net-telnet-0.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9d6aa0d6f260641b0d0182becc8653b6
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0 b/metadata/md5-cache/dev-ruby/netrc-0.11.0
index 2691a2200966..c0fa055a41ee 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/netrc-0.11.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=092fd606ce161b92dda6c6f669c43429
diff --git a/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1 b/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1
index 246d6038ea74..dc9915c058f9 100644
--- a/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/network_interface-0.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=53ecbc348ac561e8306e3a6bd9b3edec
diff --git a/metadata/md5-cache/dev-ruby/nexpose-5.3.1 b/metadata/md5-cache/dev-ruby/nexpose-5.3.1
index 48101f1fb9e1..21cb780e96de 100644
--- a/metadata/md5-cache/dev-ruby/nexpose-5.3.1
+++ b/metadata/md5-cache/dev-ruby/nexpose-5.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nexpose-5.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=413df39e485860fc6a9cf0fa83ee44e0
diff --git a/metadata/md5-cache/dev-ruby/nexpose-5.3.2 b/metadata/md5-cache/dev-ruby/nexpose-5.3.2
index 14cb462547b7..d3f5cf73b1d0 100644
--- a/metadata/md5-cache/dev-ruby/nexpose-5.3.2
+++ b/metadata/md5-cache/dev-ruby/nexpose-5.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/rapid7/nexpose-client/archive/v5.3.2.tar.gz -> nexpose-5.3.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7cc40cef015cf2103f34fe08ca7aa5d3
diff --git a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2 b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
index ca7238023c85..cb1218b30686 100644
--- a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
+++ b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/niceogiri-1.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1907cf5b8bec2f091d45a23e39dccf32
diff --git a/metadata/md5-cache/dev-ruby/nio4r-1.2.1 b/metadata/md5-cache/dev-ruby/nio4r-1.2.1
index 00375445fa63..53edd7176647 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-1.2.1
+++ b/metadata/md5-cache/dev-ruby/nio4r-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nio4r-1.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5b4496452b3defd7789373d03d75be45
diff --git a/metadata/md5-cache/dev-ruby/nio4r-1.2.1-r1 b/metadata/md5-cache/dev-ruby/nio4r-1.2.1-r1
index 0f335a4f21c4..bcf46cf62ae8 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-1.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/nio4r-1.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nio4r-1.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c35239dbe6257d9fecc340db106b9a34
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.0.0 b/metadata/md5-cache/dev-ruby/nio4r-2.0.0
index 1ca560e0cd9e..d7eb499aac6b 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.0.0
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/nio4r-2.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1c903db896402c86df60b6a266531886
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.1.0 b/metadata/md5-cache/dev-ruby/nio4r-2.1.0
new file mode 100644
index 000000000000..046fb3b6c5ca
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A high performance selector API for monitoring IO objects
+EAPI=6
+HOMEPAGE=https://github.com/socketry/nio4r
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=2
+SRC_URI=mirror://rubygems/nio4r-2.1.0.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0664cb693f5c40aeb23b52ed03a0c0be
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.8.1 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.8.1
index 67a5a08f33a6..0ee32038f6c1 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.6.8.1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.6.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.6.8.1.tar.gz -> nokogiri-1.6.8.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=922c8781a8d019f51332c1f40b8714fd
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.7.0 b/metadata/md5-cache/dev-ruby/nokogiri-1.7.0
index 126efa265e8a..fc1ec6e7167f 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.7.0
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.7.0.tar.gz -> nokogiri-1.7.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6886ac2e3ef633dd9ef3cc06b6576b57
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.7.0.1 b/metadata/md5-cache/dev-ruby/nokogiri-1.7.0.1
index a3ccc2c4c00d..cd276ba1351e 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.7.0.1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.7.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.7.0.1.tar.gz -> nokogiri-1.7.0.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3bc66314d90b931ba98e2968acd47a0c
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.7.1 b/metadata/md5-cache/dev-ruby/nokogiri-1.7.1
index a07a28015b44..58b36a32f8b3 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.7.1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.7.1.tar.gz -> nokogiri-1.7.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=67428b476cd3fc0f0878999a717655ed
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.7.2 b/metadata/md5-cache/dev-ruby/nokogiri-1.7.2
index a32d7fdab376..98196c93c579 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.7.2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.7.2.tar.gz -> nokogiri-1.7.2-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2bdb4707705ff007a999669b9cf20567
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2 b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
index 1ae772a5b30f..97c070eeb6fb 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby21] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogiri-diff-0.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e653b6383d24881615e0b32bec3adc56
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.7 b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.7
index 325bcb47b2f1..445f544cb641 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.7
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gumbo-0.10 ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.5-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogumbo-1.4.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=664836a2ef60cc9ac921df1cc8cc58b7
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.9 b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.9
index edb65e8a1a77..30ce049ed171 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.9
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gumbo-0.10 ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.5-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogumbo-1.4.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=664836a2ef60cc9ac921df1cc8cc58b7
diff --git a/metadata/md5-cache/dev-ruby/notify-0.5.2-r1 b/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
index a7d448ea3714..4798c7498c84 100644
--- a/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libnotify ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/notify-0.5.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9428cdb1e117e693c64080e3979e1c68
diff --git a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2 b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
index d1851adf765f..004e6d61bd92 100644
--- a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ntlm-http-0.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a3afb7c6a903474477e9999ef3f0cc8d
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2 b/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
index 246bd99abde9..6734c461a448 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
+++ b/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/oauth-0.4.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=884876e50118dfe1fb435854a9adeb34
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.5.1 b/metadata/md5-cache/dev-ruby/oauth-0.5.1
index ee98dad2d53c..4606ca453666 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.5.1
+++ b/metadata/md5-cache/dev-ruby/oauth-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/oauth-xx/oauth-ruby/archive/v0.5.1.tar.gz -> oauth-0.5.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4a77d3e82012b87b525bdf858df6c9e8
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.2.0 b/metadata/md5-cache/dev-ruby/oauth2-1.2.0
index e24610cd2d77..ffceda44b743 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.2.0
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/intridea/oauth2/archive/v1.2.0.tar.gz -> oauth2-1.2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2ee443f3779b3352d2794b290be96b3c
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.2.0-r1 b/metadata/md5-cache/dev-ruby/oauth2-1.2.0-r1
index e7e3106fcb0d..5ac6e7fa2cd0 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/intridea/oauth2/archive/v1.2.0.tar.gz -> oauth2-1.2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=080e79f514d972a567f1d92df1584f75
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.3.0 b/metadata/md5-cache/dev-ruby/oauth2-1.3.0
index 3a7a3bbf1e39..327b3a66301b 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.3.0
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/intridea/oauth2/archive/v1.3.0.tar.gz -> oauth2-1.3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=080e79f514d972a567f1d92df1584f75
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.3.1 b/metadata/md5-cache/dev-ruby/oauth2-1.3.1
index a84e769bd9fd..9132dc45894f 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.3.1
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/intridea/oauth2/archive/v1.3.1.tar.gz -> oauth2-1.3.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6aba53939873c96b9e6315b0761365a6
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.4.1 b/metadata/md5-cache/dev-ruby/octokit-4.4.1
index 7fe72e106feb..1393f6d328ed 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.4.1
+++ b/metadata/md5-cache/dev-ruby/octokit-4.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sawyer-0.5.3[ruby_targets_ruby21] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.4.1.tar.gz -> octokit-4.4.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dcfa00d707ad2a41ae7ecaf0e1eeaaf0
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.6.2 b/metadata/md5-cache/dev-ruby/octokit-4.6.2
index d0c53f5fe907..719f6b5e52ca 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.6.2
+++ b/metadata/md5-cache/dev-ruby/octokit-4.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby21] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.6.2.tar.gz -> octokit-4.6.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6caaa478bf2b95e568cd5b9cf1c5faad
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.7.0 b/metadata/md5-cache/dev-ruby/octokit-4.7.0
index b8540c787677..ef8f533db4ae 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.7.0
+++ b/metadata/md5-cache/dev-ruby/octokit-4.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby21] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.7.0.tar.gz -> octokit-4.7.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d3783c2a9dd8fcf085d6a0d3c2acc499
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.3.1 b/metadata/md5-cache/dev-ruby/omniauth-1.3.1
index 71588dab3c6f..9ef733ba55ed 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.3.1
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] >=dev-ruby/h
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/intridea/omniauth/archive/v1.3.1.tar.gz -> omniauth-1.3.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ae35e42be6bc048a96ef01aa9d81f993
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.3.2 b/metadata/md5-cache/dev-ruby/omniauth-1.3.2
index 640e654e5865..ea0731478008 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.3.2
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] <dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/intridea/omniauth/archive/v1.3.2.tar.gz -> omniauth-1.3.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8afa93739458a7df1b96d78e2077263a
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.4.0 b/metadata/md5-cache/dev-ruby/omniauth-1.4.0
index 073e960f1169..16bcf7d7a53f 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.4.0
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] <dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/intridea/omniauth/archive/v1.4.0.tar.gz -> omniauth-1.4.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=78a907ea2608379d987cfde8cf2ad9a7
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.6.0 b/metadata/md5-cache/dev-ruby/omniauth-1.6.0
index 7c3fe0782970..f6506ce69ba0 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.6.0
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby21] <dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/intridea/omniauth/archive/v1.6.0.tar.gz -> omniauth-1.6.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=22c0074bff5f5257786174dfd5f351d9
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.6.1 b/metadata/md5-cache/dev-ruby/omniauth-1.6.1
index eeea3e413803..11b34331d410 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.6.1
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby21] <dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/intridea/omniauth/archive/v1.6.1.tar.gz -> omniauth-1.6.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3e4d356a3ddb451221d19f43a3b6e9be
diff --git a/metadata/md5-cache/dev-ruby/open4-1.3.4 b/metadata/md5-cache/dev-ruby/open4-1.3.4
index 67a4cdbfb9f7..715194b2d4cf 100644
--- a/metadata/md5-cache/dev-ruby/open4-1.3.4
+++ b/metadata/md5-cache/dev-ruby/open4-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/open4-1.3.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=46c840168d7a646ee0141b69cada18b6
diff --git a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.1 b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.1
index a90165a70e7f..e3d9aeda7dfe 100644
--- a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.1
+++ b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.2.1
 SRC_URI=mirror://rubygems/openssl-ccm-1.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=22c5751ebb492b85beb10f9c5ff56987
diff --git a/metadata/md5-cache/dev-ruby/openvas-omp-0.0.4 b/metadata/md5-cache/dev-ruby/openvas-omp-0.0.4
index bfaf176dfba4..26e7db1022c1 100644
--- a/metadata/md5-cache/dev-ruby/openvas-omp-0.0.4
+++ b/metadata/md5-cache/dev-ruby/openvas-omp-0.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/openvas-omp-0.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3feae5328e96dfa780e54141dae94290
diff --git a/metadata/md5-cache/dev-ruby/optionable-0.2.0 b/metadata/md5-cache/dev-ruby/optionable-0.2.0
index 50b130f354d6..ba83718e89e7 100644
--- a/metadata/md5-cache/dev-ruby/optionable-0.2.0
+++ b/metadata/md5-cache/dev-ruby/optionable-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/optionable-0.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4ebecdc9da3c970dea99ca5e4dd82da4
diff --git a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12 b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
index 8954f084a741..4863a7ca89ee 100644
--- a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
+++ b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rubypants-0.2*:0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/wallyqs/org-ruby/archive/version-0.9.12.tar.gz -> org-ruby-0.9.12.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f97fc7ee59b3c4e00dd2bb1fee3f5093
diff --git a/metadata/md5-cache/dev-ruby/origin-2.2.2 b/metadata/md5-cache/dev-ruby/origin-2.2.2
index 3b37e1254397..425b73883acb 100644
--- a/metadata/md5-cache/dev-ruby/origin-2.2.2
+++ b/metadata/md5-cache/dev-ruby/origin-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/mongoid/origin/archive/v2.2.2.tar.gz -> origin-2.2.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4f768027e7d8beb1b3c7c2f7e4d01f15
diff --git a/metadata/md5-cache/dev-ruby/origin-2.3.0 b/metadata/md5-cache/dev-ruby/origin-2.3.0
index 92867340d371..a16a206a7a9c 100644
--- a/metadata/md5-cache/dev-ruby/origin-2.3.0
+++ b/metadata/md5-cache/dev-ruby/origin-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/mongoid/origin/archive/v2.3.0.tar.gz -> origin-2.3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4f768027e7d8beb1b3c7c2f7e4d01f15
diff --git a/metadata/md5-cache/dev-ruby/origin-2.3.1 b/metadata/md5-cache/dev-ruby/origin-2.3.1
index d15fffc591b4..7d4d5116195f 100644
--- a/metadata/md5-cache/dev-ruby/origin-2.3.1
+++ b/metadata/md5-cache/dev-ruby/origin-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/mongoid/origin/archive/v2.3.1.tar.gz -> origin-2.3.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=69621f358f4ad31643d578f91bc67f09
diff --git a/metadata/md5-cache/dev-ruby/ox-2.4.11 b/metadata/md5-cache/dev-ruby/ox-2.4.11
index b82da1bd1a36..a849fb3dfcfa 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.4.11
+++ b/metadata/md5-cache/dev-ruby/ox-2.4.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.4.11.tar.gz -> ox-2.4.11.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b8cf680dff74bf1017e05c984e0774e9
diff --git a/metadata/md5-cache/dev-ruby/ox-2.4.13 b/metadata/md5-cache/dev-ruby/ox-2.4.13
index abc2b39a9581..b0f31b075642 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.4.13
+++ b/metadata/md5-cache/dev-ruby/ox-2.4.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.4.13.tar.gz -> ox-2.4.13.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bc51b9cd273d846550aaa3b7a315be6c
diff --git a/metadata/md5-cache/dev-ruby/ox-2.5.0 b/metadata/md5-cache/dev-ruby/ox-2.5.0
index a4c3ad916949..438576d8af21 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ox-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.5.0.tar.gz -> ox-2.5.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bc51b9cd273d846550aaa3b7a315be6c
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.11-r1 b/metadata/md5-cache/dev-ruby/packetfu-1.1.11-r1
index 6269d67ed239..e09f141a0ef0 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.11-r1
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.11-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/network_interface:0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.1.11
 SRC_URI=mirror://rubygems/packetfu-1.1.11.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=129bf54bba2baff7d7a639af63f82341
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.13 b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
index d71796efbbdc..4d724745ecfb 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.13
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/network_interface:0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.1.13
 SRC_URI=mirror://rubygems/packetfu-1.1.13.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=82c587d75782e6872dca5f79228c233a
diff --git a/metadata/md5-cache/dev-ruby/paint-1.0.1 b/metadata/md5-cache/dev-ruby/paint-1.0.1
index 3eb328b3bb84..82f4f2b03c09 100644
--- a/metadata/md5-cache/dev-ruby/paint-1.0.1
+++ b/metadata/md5-cache/dev-ruby/paint-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( 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_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d9470a487fab33b65d55deb9ab273ec1
diff --git a/metadata/md5-cache/dev-ruby/paint-2.0.0 b/metadata/md5-cache/dev-ruby/paint-2.0.0
index e4d63a526c83..03ba8b13bc2c 100644
--- a/metadata/md5-cache/dev-ruby/paint-2.0.0
+++ b/metadata/md5-cache/dev-ruby/paint-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v2.0.0.tar.gz -> paint-2.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f228ef9d4b8f9ca4b03d51c106750cc4
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.10.0 b/metadata/md5-cache/dev-ruby/parallel-1.10.0
index 17d51200f755..201420800273 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.10.0
+++ b/metadata/md5-cache/dev-ruby/parallel-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.10.0.tar.gz -> parallel-1.10.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6e8846154fe4a983c986eec4a587f231
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.11.1 b/metadata/md5-cache/dev-ruby/parallel-1.11.1
index 97091519d826..ef107d8f4e11 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.11.1
+++ b/metadata/md5-cache/dev-ruby/parallel-1.11.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.11.1.tar.gz -> parallel-1.11.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6e8846154fe4a983c986eec4a587f231
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.11.2 b/metadata/md5-cache/dev-ruby/parallel-1.11.2
index 5340dc108816..ed18fd04b882 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.11.2
+++ b/metadata/md5-cache/dev-ruby/parallel-1.11.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.11.2.tar.gz -> parallel-1.11.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6e8846154fe4a983c986eec4a587f231
diff --git a/metadata/md5-cache/dev-ruby/parser-2.3.3.0 b/metadata/md5-cache/dev-ruby/parser-2.3.3.0
index e6e2081e39c0..b4fc4ce39452 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.3.3.0
+++ b/metadata/md5-cache/dev-ruby/parser-2.3.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby21] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/parser-2.3.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=194570a5445e2e0430364d8f29f21628
diff --git a/metadata/md5-cache/dev-ruby/parser-2.3.3.1 b/metadata/md5-cache/dev-ruby/parser-2.3.3.1
index f14984be23a7..bcbb1a31b0d9 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.3.3.1
+++ b/metadata/md5-cache/dev-ruby/parser-2.3.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby21] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/parser-2.3.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=194570a5445e2e0430364d8f29f21628
diff --git a/metadata/md5-cache/dev-ruby/parser-2.4.0.0 b/metadata/md5-cache/dev-ruby/parser-2.4.0.0
index aa4c1c1000ce..0c165d8a213d 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.4.0.0
+++ b/metadata/md5-cache/dev-ruby/parser-2.4.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby21] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/parser-2.4.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=466aab7d374e2fbac0ae75434ccd8494
diff --git a/metadata/md5-cache/dev-ruby/parslet-1.7.1 b/metadata/md5-cache/dev-ruby/parslet-1.7.1
index 23a6e4b74be6..6936e8dec787 100644
--- a/metadata/md5-cache/dev-ruby/parslet-1.7.1
+++ b/metadata/md5-cache/dev-ruby/parslet-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/blankslate-2:*[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/kschiess/parslet/archive/1.7.1.tar.gz -> parslet-1.7.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c216745721fc7d7e3c2432ae1377359e
diff --git a/metadata/md5-cache/dev-ruby/parslet-1.8.0 b/metadata/md5-cache/dev-ruby/parslet-1.8.0
index 452824dcfa83..27924f8167bd 100644
--- a/metadata/md5-cache/dev-ruby/parslet-1.8.0
+++ b/metadata/md5-cache/dev-ruby/parslet-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/kschiess/parslet/archive/1.8.0.tar.gz -> parslet-1.8.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b839bf6d404c923aa6bd568ccd591e04
diff --git a/metadata/md5-cache/dev-ruby/patch_finder-1.0.2 b/metadata/md5-cache/dev-ruby/patch_finder-1.0.2
index 0af8540e9af4..edde6e9c8b52 100644
--- a/metadata/md5-cache/dev-ruby/patch_finder-1.0.2
+++ b/metadata/md5-cache/dev-ruby/patch_finder-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/patch_finder-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6f5ea28a47e74d5f385994aac5316010
diff --git a/metadata/md5-cache/dev-ruby/path_expander-1.0.1 b/metadata/md5-cache/dev-ruby/path_expander-1.0.1
index cf6d13edf42a..f15e188f5e8f 100644
--- a/metadata/md5-cache/dev-ruby/path_expander-1.0.1
+++ b/metadata/md5-cache/dev-ruby/path_expander-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/path_expander-1.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=63d2dffcf4f22dd3a60b747e16271149
diff --git a/metadata/md5-cache/dev-ruby/pathutil-0.14.0 b/metadata/md5-cache/dev-ruby/pathutil-0.14.0
index f4959550647c..2d5937f77141 100644
--- a/metadata/md5-cache/dev-ruby/pathutil-0.14.0
+++ b/metadata/md5-cache/dev-ruby/pathutil-0.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pathutil-0.14.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=095ff19e5b3af446fbe98c35770afd18
diff --git a/metadata/md5-cache/dev-ruby/patron-0.4.18-r2 b/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
index 33dcc4638032..1654e7e04e16 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
+++ b/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.4.18.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=de5d6f09605518e5c37001ea71d2c0a7
diff --git a/metadata/md5-cache/dev-ruby/patron-0.5.0-r1 b/metadata/md5-cache/dev-ruby/patron-0.5.0-r1
index 43af9f34d697..e2895dfd263b 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=41cfc2bf7c74788358d5f8471b72982c
diff --git a/metadata/md5-cache/dev-ruby/patron-0.8.0 b/metadata/md5-cache/dev-ruby/patron-0.8.0
index bead66d545e2..56d05df089c9 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.8.0
+++ b/metadata/md5-cache/dev-ruby/patron-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ff62ae0b16b5cf7eb530a560a13b8baa
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r2 b/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r2
index 275454a42a5d..eaa0b367a9c8 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r2
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0.11
 SRC_URI=mirror://rubygems/pcaprub-0.11.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c965de986d863a327cfec1412ad8197d
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.12.1 b/metadata/md5-cache/dev-ruby/pcaprub-0.12.1
index f8010ab72ff9..bc5916bc3a35 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.12.1
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0.12
 SRC_URI=mirror://rubygems/pcaprub-0.12.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ab25b48d8f0a568ef2bfa1f92d9e1438
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.12.4 b/metadata/md5-cache/dev-ruby/pcaprub-0.12.4
index d308ba79e8e2..0bb9c695a344 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.12.4
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.12.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0.12
 SRC_URI=mirror://rubygems/pcaprub-0.12.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ab25b48d8f0a568ef2bfa1f92d9e1438
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.6.1 b/metadata/md5-cache/dev-ruby/pdf-core-0.6.1
index dcdf21c1d91d..a06814fc64e7 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.6.1
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-core-0.6.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ef755f34f0b4e8ad01f96a5aab40594b
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.6.1-r1 b/metadata/md5-cache/dev-ruby/pdf-core-0.6.1-r1
index c489706ee60f..8c91de51cdf2 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.6.1-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-core-0.6.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7143a3821a919b152f860ea4ec1be58b
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.7.0 b/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
index e0eb515d5e28..c651f9130c1e 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/prawnpdf/pdf-core/archive/0.7.0.tar.gz -> pdf-core-0.7.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=46480b2c0e78e81d76bf99fce6c4ede1
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
index b744868de1fb..360bf9ad2851 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-inspector-1.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1cda05f0496d1d8eac1786384ffa97ce
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0
index af2fbc4639d4..7c0dc699871d 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-inspector-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0f1e874dfef6fb83757bb2ea4da59ecb
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1
index 129d13325aaa..19af03f5512a 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-inspector-1.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7a77eaf67922491d5cba90252fed1414
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1-r1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1-r1
index b04d5aeb2b05..955f05b358b5 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-inspector-1.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0b4a82d022cc791a603b74f4051d6308
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
index df45049c86a5..82b3caeceb35 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-inspector-1.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7b74676c5ae9916f4329218b6ff84fd2
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1 b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1
index 01861810cc60..46f6d0681d5a 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby21] =dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/yob/pdf-reader/archive/v1.4.1.tar.gz -> pdf-reader-1.4.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8941d7f2bf0f2e6a1c0722043717a5f2
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r1 b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r1
index 53a47028d01b..b8ec919f32b8 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby21] =dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/yob/pdf-reader/archive/v1.4.1.tar.gz -> pdf-reader-1.4.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=64718dda281cc0c25e9e7f8ac7b73f79
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.0.0 b/metadata/md5-cache/dev-ruby/pdf-reader-2.0.0
index b52201371017..631dcbc0ad0b 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.0.0
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby21] =dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.0.0.tar.gz -> pdf-reader-2.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5e857f2c378762b6d6f148998af75495
diff --git a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1 b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
index 17548a4f6864..167ce0c68200 100644
--- a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
+++ b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/permutation-0.1.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0f023fa1f2c2d49288b1f4b604e55064
diff --git a/metadata/md5-cache/dev-ruby/pg-0.17.1-r1 b/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
index ca72eb828fa5..05c384aa5107 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
+++ b/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/postgresql:* ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.17.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e22d31b1d0958ae2df0a5753ec767825
diff --git a/metadata/md5-cache/dev-ruby/pg-0.18.4 b/metadata/md5-cache/dev-ruby/pg-0.18.4
index 95153e80f6b1..5302d7ebc8cc 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.18.4
+++ b/metadata/md5-cache/dev-ruby/pg-0.18.4
@@ -10,5 +10,5 @@ RDEPEND=dev-db/postgresql:* ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.18.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=70bce4a59914500480f9a7c5c8979346
diff --git a/metadata/md5-cache/dev-ruby/pg-0.18.4-r1 b/metadata/md5-cache/dev-ruby/pg-0.18.4-r1
index 235d9fc0eb22..24dac63f900b 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.18.4-r1
+++ b/metadata/md5-cache/dev-ruby/pg-0.18.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/postgresql:* ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.18.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c5e98b28db1bcc43020294ea54a97afc
diff --git a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r1 b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r1
index 3c5a1fd4f4cf..2584b56d2f69 100644
--- a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r1
+++ b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.0.9
 SRC_URI=mirror://rubygems/pg_array_parser-0.0.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ddbf420f7374fd9d8d5ae9acda356f25
diff --git a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2 b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
index 72eca8b79dc6..a4e63af87a74 100644
--- a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
+++ b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.0.9
 SRC_URI=mirror://rubygems/pg_array_parser-0.0.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f9117e3ca5f3d72d212e5869d38c1542
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.1.7 b/metadata/md5-cache/dev-ruby/pkg-config-1.1.7
index afde05410ae4..3458069b5c05 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.1.7
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.1.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/pkg-config-1.1.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6dabc25e291bfd53e090cc21802e2de0
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.1.9 b/metadata/md5-cache/dev-ruby/pkg-config-1.1.9
index 0feda58813e5..cafdcc0aeed4 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.1.9
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/pkg-config-1.1.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b627fac3e5f24a1b364ccf63d58383bf
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.2.0 b/metadata/md5-cache/dev-ruby/pkg-config-1.2.0
index 01a54162de66..d1db52a74e82 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.2.0
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/pkg-config-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b627fac3e5f24a1b364ccf63d58383bf
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.2.2 b/metadata/md5-cache/dev-ruby/pkg-config-1.2.2
new file mode 100644
index 000000000000..d8c692ce84f5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) test? ( x11-libs/cairo ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A pkg-config implementation by Ruby
+EAPI=6
+HOMEPAGE=https://github.com/rcairo/pkg-config
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
+RDEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/pkg-config-1.2.2.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b627fac3e5f24a1b364ccf63d58383bf
diff --git a/metadata/md5-cache/dev-ruby/plist-3.2.0 b/metadata/md5-cache/dev-ruby/plist-3.2.0
index d51680dd840c..e99abe49d890 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.2.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/plist-3.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=24de9005038baf329a8ceb77d4455f17
diff --git a/metadata/md5-cache/dev-ruby/plist-3.3.0 b/metadata/md5-cache/dev-ruby/plist-3.3.0
index ca8df1fe93cf..51180704a081 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.3.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/patsplat/plist/archive/v3.3.0.tar.gz -> plist-3.3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9db69d5d67ab6c6bb1c1dac55b05dfdc
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.0.2 b/metadata/md5-cache/dev-ruby/pluggaloid-1.0.2
index f0981b801fbd..e9975e8faf41 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.0.2
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/in
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pluggaloid-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2a1cf65b43586814ec99fdd577c3dd68
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1 b/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1
index a3eaca343249..1d7d45fb0887 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/in
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pluggaloid-1.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2af6a4b1a1b20c0b4f4ab522f53d8a84
diff --git a/metadata/md5-cache/dev-ruby/png-1.2.1 b/metadata/md5-cache/dev-ruby/png-1.2.1
index 347743daf30b..ff4342d17d56 100644
--- a/metadata/md5-cache/dev-ruby/png-1.2.1
+++ b/metadata/md5-cache/dev-ruby/png-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/png-1.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2ce03f5e7e0d115ce41ed4ffa9de93af
diff --git a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2 b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
index 1ded97abddc3..74d97c5a826e 100644
--- a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/ruby-mp3info[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/podcast-0.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f6bffaf570f7e2d6cad4ab8e2a027e6e
diff --git a/metadata/md5-cache/dev-ruby/poltergeist-1.10.0 b/metadata/md5-cache/dev-ruby/poltergeist-1.10.0
index f6d00a3ee642..7ad550aac379 100644
--- a/metadata/md5-cache/dev-ruby/poltergeist-1.10.0
+++ b/metadata/md5-cache/dev-ruby/poltergeist-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=www-client/phantomjs ruby_targets_ruby21? ( >=dev-ruby/cliver-0.3.1[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/jonleighton/poltergeist/archive/v1.10.0.tar.gz -> poltergeist-1.10.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6e13e2c8548d4db11eb3c4afee85f09a
diff --git a/metadata/md5-cache/dev-ruby/poltergeist-1.14.0 b/metadata/md5-cache/dev-ruby/poltergeist-1.14.0
index 49dc89d1eb29..5b718b706cab 100644
--- a/metadata/md5-cache/dev-ruby/poltergeist-1.14.0
+++ b/metadata/md5-cache/dev-ruby/poltergeist-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=www-client/phantomjs ruby_targets_ruby21? ( >=dev-ruby/cliver-0.3.1[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/jonleighton/poltergeist/archive/v1.14.0.tar.gz -> poltergeist-1.14.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6e13e2c8548d4db11eb3c4afee85f09a
diff --git a/metadata/md5-cache/dev-ruby/poltergeist-1.9.0 b/metadata/md5-cache/dev-ruby/poltergeist-1.9.0
index c303fe6062ea..3eaf4f7bead6 100644
--- a/metadata/md5-cache/dev-ruby/poltergeist-1.9.0
+++ b/metadata/md5-cache/dev-ruby/poltergeist-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=www-client/phantomjs ruby_targets_ruby21? ( >=dev-ruby/cliver-0.3.1[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jonleighton/poltergeist/archive/v1.9.0.tar.gz -> poltergeist-1.9.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3f26de21fe749c475de84b856e7118f4
diff --git a/metadata/md5-cache/dev-ruby/polyglot-0.3.5 b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
index ba47618b5b43..df4301b76a6e 100644
--- a/metadata/md5-cache/dev-ruby/polyglot-0.3.5
+++ b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/polyglot-0.3.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bb6f3b1b33bf6219e693c605d450590e
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.11 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.11
index 49802a2c6e08..d248e905167e 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.11
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/posix-spawn-0.3.11.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f3f3f7e1c2b6f157249a31018c26df89
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.12 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.12
index 371847d502f3..73aaa2e7665e 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.12
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/posix-spawn-0.3.12.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f3f3f7e1c2b6f157249a31018c26df89
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13
index 3ac0c6656719..2c990f16abf2 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/posix-spawn-0.3.13.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=347d77d07340cc91ef5ecc29335cb735
diff --git a/metadata/md5-cache/dev-ruby/postgres_ext-2.4.1 b/metadata/md5-cache/dev-ruby/postgres_ext-2.4.1
index 7c8ca6e4da44..70cc3d936d96 100644
--- a/metadata/md5-cache/dev-ruby/postgres_ext-2.4.1
+++ b/metadata/md5-cache/dev-ruby/postgres_ext-2.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=2.4
 SRC_URI=mirror://rubygems/postgres_ext-2.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7cffa2fd85bce8ff3338ccac55498089
diff --git a/metadata/md5-cache/dev-ruby/postgres_ext-3.0.0 b/metadata/md5-cache/dev-ruby/postgres_ext-3.0.0
index 25eb09c5656d..f481b67f1e03 100644
--- a/metadata/md5-cache/dev-ruby/postgres_ext-3.0.0
+++ b/metadata/md5-cache/dev-ruby/postgres_ext-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://rubygems/postgres_ext-3.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2c0afad81eafc32fd345f7d299bdde75
diff --git a/metadata/md5-cache/dev-ruby/power_assert-0.3.1 b/metadata/md5-cache/dev-ruby/power_assert-0.3.1
index d0c094fc4477..1afde89e0321 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-0.3.1
+++ b/metadata/md5-cache/dev-ruby/power_assert-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/power_assert-0.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c15671f3ddc55411a509bc6ddf373183
diff --git a/metadata/md5-cache/dev-ruby/power_assert-0.4.1 b/metadata/md5-cache/dev-ruby/power_assert-0.4.1
index ed6418104a10..f4419e556566 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-0.4.1
+++ b/metadata/md5-cache/dev-ruby/power_assert-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/power_assert-0.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6a8ecf7ed34c83db1b40afd071c6f74e
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.0.1-r1 b/metadata/md5-cache/dev-ruby/power_assert-1.0.1-r1
index 3399ac08920b..b2c528e11850 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.0.1.tar.gz -> power_assert-1.0.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=890ebe9e80b0a98429f78e032ad584f2
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.0.2 b/metadata/md5-cache/dev-ruby/power_assert-1.0.2
index bd636a9f0b6a..cf817138fe15 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.0.2
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.0.2.tar.gz -> power_assert-1.0.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=03b2072f62b7f4c9bfbaafa727c55362
diff --git a/metadata/md5-cache/dev-ruby/prawn-1.3.0 b/metadata/md5-cache/dev-ruby/prawn-1.3.0
index 3c4e394bec20..97fe0f39aa0a 100644
--- a/metadata/md5-cache/dev-ruby/prawn-1.3.0
+++ b/metadata/md5-cache/dev-ruby/prawn-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.4.0[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=https://github.com/prawnpdf/prawn/archive/1.3.0.tar.gz -> prawn-1.3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2432a64ba0b2b93d414ae4193d58b079
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.0.2 b/metadata/md5-cache/dev-ruby/prawn-2.0.2
index 4c48f5c3e7e8..148d6d407928 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.0.2
+++ b/metadata/md5-cache/dev-ruby/prawn-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.0.2.tar.gz -> prawn-2.0.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=85e75773dcb5ea8e79be8eba6ec78173
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.1.0 b/metadata/md5-cache/dev-ruby/prawn-2.1.0
index bf5c7c4250ca..99ed2ac2e7e6 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.1.0
+++ b/metadata/md5-cache/dev-ruby/prawn-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.6.1[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.1.0.tar.gz -> prawn-2.1.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a598bbfb02b0da9c3e6b9de863b82db9
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.1.0-r1 b/metadata/md5-cache/dev-ruby/prawn-2.1.0-r1
index f6d330702c99..18d403ce9635 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/prawn-2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.6.1[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.1.0.tar.gz -> prawn-2.1.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5fd33057129f8f788a4e7306ef9a5fcf
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.2.0 b/metadata/md5-cache/dev-ruby/prawn-2.2.0
index 760ba85f43a3..0b32d45cbc94 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.2.0
+++ b/metadata/md5-cache/dev-ruby/prawn-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.7.0[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.2.0.tar.gz -> prawn-2.2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ccba3f55e3f03b2dcc85106d68a4e0ad
diff --git a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2 b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2
index 5ff9550c4ccf..416d004b89d9 100644
--- a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2
+++ b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/prawn-table-0.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ed9466cc0df6eccfae3e642f50fd0dda
diff --git a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1 b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
index cd9c80048e0f..1d1f690747f0 100644
--- a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/prawn-table-0.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fdae2f7794f9c59b223e7373bd914f80
diff --git a/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2 b/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
index d839ce5a6006..fddd3dbe7504 100644
--- a/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
+++ b/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/PriorityQueue-0.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b05b4485aedbc6738dfcbeb216835868
diff --git a/metadata/md5-cache/dev-ruby/protected_attributes-1.1.3 b/metadata/md5-cache/dev-ruby/protected_attributes-1.1.3
index 8e109a5bd2c7..fa83fa534098 100644
--- a/metadata/md5-cache/dev-ruby/protected_attributes-1.1.3
+++ b/metadata/md5-cache/dev-ruby/protected_attributes-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/activemodel-4*:*[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=https://github.com/rails/protected_attributes/archive/v1.1.3.tar.gz -> protected_attributes-1.1.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2d4922401297c8457c4dd2c5e620ebd6
diff --git a/metadata/md5-cache/dev-ruby/protected_attributes-1.1.4 b/metadata/md5-cache/dev-ruby/protected_attributes-1.1.4
index 7f8d6a31b431..af72ab0ca838 100644
--- a/metadata/md5-cache/dev-ruby/protected_attributes-1.1.4
+++ b/metadata/md5-cache/dev-ruby/protected_attributes-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/activemodel-4*:*[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=https://github.com/rails/protected_attributes/archive/v1.1.4.tar.gz -> protected_attributes-1.1.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=215bac1d24842bd77a82fab242e945de
diff --git a/metadata/md5-cache/dev-ruby/pry-0.10.3 b/metadata/md5-cache/dev-ruby/pry-0.10.3
index 75211ba91e46..4678801ffe1d 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.10.3
+++ b/metadata/md5-cache/dev-ruby/pry-0.10.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby21] =de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.10.3.tar.gz -> pry-0.10.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=775a6a95b84809769565baf4ba64d1cd
diff --git a/metadata/md5-cache/dev-ruby/pry-0.10.4 b/metadata/md5-cache/dev-ruby/pry-0.10.4
index 6ae92cbd7673..0b1403c7ae0e 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.10.4
+++ b/metadata/md5-cache/dev-ruby/pry-0.10.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby21] =de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.10.4.tar.gz -> pry-0.10.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2a66137751514d1c5eecec26fc63d246
diff --git a/metadata/md5-cache/dev-ruby/psych-2.2.1 b/metadata/md5-cache/dev-ruby/psych-2.2.1
index df672b5eb48d..db9de6884a87 100644
--- a/metadata/md5-cache/dev-ruby/psych-2.2.1
+++ b/metadata/md5-cache/dev-ruby/psych-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/psych/archive/v2.2.1.tar.gz -> psych-2.2.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ab579f0e7bfe9938d1c009c6325a3698
diff --git a/metadata/md5-cache/dev-ruby/psych-2.2.2 b/metadata/md5-cache/dev-ruby/psych-2.2.2
index b17aa02ce2ce..fe5fac248aed 100644
--- a/metadata/md5-cache/dev-ruby/psych-2.2.2
+++ b/metadata/md5-cache/dev-ruby/psych-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/psych/archive/v2.2.2.tar.gz -> psych-2.2.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ab579f0e7bfe9938d1c009c6325a3698
diff --git a/metadata/md5-cache/dev-ruby/psych-2.2.4 b/metadata/md5-cache/dev-ruby/psych-2.2.4
index 8cd91af296c3..a535b798a03d 100644
--- a/metadata/md5-cache/dev-ruby/psych-2.2.4
+++ b/metadata/md5-cache/dev-ruby/psych-2.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/psych/archive/v2.2.4.tar.gz -> psych-2.2.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fa22ea9e1151ff140a52ea6a6682b455
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-2.0.5 b/metadata/md5-cache/dev-ruby/public_suffix-2.0.5
index 8d58e70a52cc..2d517a5353de 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-2.0.5
+++ b/metadata/md5-cache/dev-ruby/public_suffix-2.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/public_suffix-2.0.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4fa760d082234c268c85d73347885076
diff --git a/metadata/md5-cache/dev-ruby/pundit-1.1.0 b/metadata/md5-cache/dev-ruby/pundit-1.1.0
index 8119405b5c10..145f5708adc2 100644
--- a/metadata/md5-cache/dev-ruby/pundit-1.1.0
+++ b/metadata/md5-cache/dev-ruby/pundit-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pundit-1.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=45782d68378c4f3e4110eed5a35eae1b
diff --git a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2 b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
index 93bcc44fbb31..47e20830c674 100644
--- a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
+++ b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby21] dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pusher-client-0.6.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bcecf1d78b79ba48ab46ac7647d64cf9
diff --git a/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3 b/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3
index 9a7defb31a17..39bc570f9635 100644
--- a/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3
+++ b/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7 || ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pygments.rb-0.6.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c7731afa9c59ac6998d0e73ad7b77881
diff --git a/metadata/md5-cache/dev-ruby/qed-2.9.2 b/metadata/md5-cache/dev-ruby/qed-2.9.2
index f9d016a19c4e..faa28beb7d9a 100644
--- a/metadata/md5-cache/dev-ruby/qed-2.9.2
+++ b/metadata/md5-cache/dev-ruby/qed-2.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/ansi[ruby_targets_ruby21] dev-ruby/brass
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/qed-2.9.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5673e03bdc33b584bc2e5ac4250df966
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.11 b/metadata/md5-cache/dev-ruby/racc-1.4.11
index 2fb9d061fe9b..413ccee5e708 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.11
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.11.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0e492c225c27252dd9630274f2391132
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.14 b/metadata/md5-cache/dev-ruby/racc-1.4.14
index d5f045a4ed01..6aa4830d1f70 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.14
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.14
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.14.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0aa9e7abf6f4393882eac622e8ecfcb7
diff --git a/metadata/md5-cache/dev-ruby/rack-1.4.7 b/metadata/md5-cache/dev-ruby/rack-1.4.7
index a6aced6e7997..4cfe2880bd2b 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.4.7
+++ b/metadata/md5-cache/dev-ruby/rack-1.4.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.4
 SRC_URI=mirror://rubygems/rack-1.4.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=850512d68ad33c783e7abcc6eae5ef9b
diff --git a/metadata/md5-cache/dev-ruby/rack-1.5.5 b/metadata/md5-cache/dev-ruby/rack-1.5.5
index 2353c2d83ab6..6113d12d07be 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.5.5
+++ b/metadata/md5-cache/dev-ruby/rack-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.5
 SRC_URI=mirror://rubygems/rack-1.5.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0e7bb858424271db1c201c5d20681b39
diff --git a/metadata/md5-cache/dev-ruby/rack-1.6.4 b/metadata/md5-cache/dev-ruby/rack-1.6.4
index 27593a1e19d5..b1ab97425ec7 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.6.4
+++ b/metadata/md5-cache/dev-ruby/rack-1.6.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/rack-1.6.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3667d88b1f4039590de806dd3d9b660c
diff --git a/metadata/md5-cache/dev-ruby/rack-1.6.5 b/metadata/md5-cache/dev-ruby/rack-1.6.5
index 60f0b800a5e3..3cc1f643986e 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.6.5
+++ b/metadata/md5-cache/dev-ruby/rack-1.6.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/rack-1.6.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8059371b46f09664d8f263783473503e
diff --git a/metadata/md5-cache/dev-ruby/rack-1.6.6 b/metadata/md5-cache/dev-ruby/rack-1.6.6
index 18240624601a..fd88c1439ab2 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.6.6
+++ b/metadata/md5-cache/dev-ruby/rack-1.6.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/rack-1.6.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=19cb071261fe4b2cb75b1b284eb80d28
diff --git a/metadata/md5-cache/dev-ruby/rack-1.6.7 b/metadata/md5-cache/dev-ruby/rack-1.6.7
index c72d73b0d749..9bef02b6006a 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.6.7
+++ b/metadata/md5-cache/dev-ruby/rack-1.6.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/rack-1.6.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=19cb071261fe4b2cb75b1b284eb80d28
diff --git a/metadata/md5-cache/dev-ruby/rack-2.0.1 b/metadata/md5-cache/dev-ruby/rack-2.0.1
index f0a1f93184e0..f82e3bea828d 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.0.1
+++ b/metadata/md5-cache/dev-ruby/rack-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2.0
 SRC_URI=mirror://rubygems/rack-2.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e77335e007e84d75b17649a15cfb5453
diff --git a/metadata/md5-cache/dev-ruby/rack-2.0.2 b/metadata/md5-cache/dev-ruby/rack-2.0.2
index 3400a597b9ae..ed0b9c4b3e55 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.0.2
+++ b/metadata/md5-cache/dev-ruby/rack-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2.0
 SRC_URI=mirror://rubygems/rack-2.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e4d4203f6fe7794dec147fe707e38fbd
diff --git a/metadata/md5-cache/dev-ruby/rack-2.0.3 b/metadata/md5-cache/dev-ruby/rack-2.0.3
index 69a44b251316..4b965e32d0d8 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.0.3
+++ b/metadata/md5-cache/dev-ruby/rack-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2.0
 SRC_URI=mirror://rubygems/rack-2.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e4d4203f6fe7794dec147fe707e38fbd
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-4.4.1 b/metadata/md5-cache/dev-ruby/rack-attack-4.4.1
index 4958ced0a926..31829efdd308 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-4.4.1
+++ b/metadata/md5-cache/dev-ruby/rack-attack-4.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rack-attack-4.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c5f83f51836597763df171f99582f3b4
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.6.1 b/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
index 6d7ebbef0f20..ce8e7943c29e 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.6.1.tar.gz -> rack-cache-1.6.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9cf46be6b5d5eda9aa8d5ddcf04227d1
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.7.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.7.0
index 4caa2a397320..78acec551616 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.7.0
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.7.0.tar.gz -> rack-cache-1.7.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bd7d07cbff66f127a70ebd9078cd8c44
diff --git a/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2 b/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
index 4948f960b90b..85ba2d478520 100644
--- a/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
+++ b/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.8
 SRC_URI=https://github.com/josh/rack-mount/tarball/v0.8.3 -> rack-mount-0.8.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=16866422ff930e14c3797904509a9dc8
diff --git a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2 b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
index 7af8bac4cdb5..8a7fc1259588 100644
--- a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
+++ b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/grosser/rack-openid/archive/v1.4.2.tar.gz -> rack-openid-1.4.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ca8f776bad9413cece920b2b3ee2fb30
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-1.5.3-r1 b/metadata/md5-cache/dev-ruby/rack-protection-1.5.3-r1
index 559d148b86eb..52e4026637bc 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-1.5.3-r1
+++ b/metadata/md5-cache/dev-ruby/rack-protection-1.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/rack-protection-1.5.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5304ea13738c47a0b0cc48ab7ecdab45
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4 b/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
index 0b451d7674ba..ddb125506fbf 100644
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
+++ b/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.3
 SRC_URI=https://github.com/josh/rack-ssl/archive/v1.3.4.tar.gz -> rack-ssl-1.3.4-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3862c9885ae31a710283939bab5fa656
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1 b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
index f888cb47bb7f..6a025a59f9fb 100644
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
+++ b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.4
 SRC_URI=https://github.com/josh/rack-ssl/archive/v1.4.1.tar.gz -> rack-ssl-1.4.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3862c9885ae31a710283939bab5fa656
diff --git a/metadata/md5-cache/dev-ruby/rack-test-0.6.3 b/metadata/md5-cache/dev-ruby/rack-test-0.6.3
index f9bf0d0db47c..ff1e19079e66 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-0.6.3
+++ b/metadata/md5-cache/dev-ruby/rack-test-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/rack-test-0.6.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a7c942c08028c20e39559b68c6c5e10a
diff --git a/metadata/md5-cache/dev-ruby/radius-0.7.4-r3 b/metadata/md5-cache/dev-ruby/radius-0.7.4-r3
index 6e3d55bc9b54..085c89d17b31 100644
--- a/metadata/md5-cache/dev-ruby/radius-0.7.4-r3
+++ b/metadata/md5-cache/dev-ruby/radius-0.7.4-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/radius-0.7.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=94f61bde46a32b09746d9b96a642da91
diff --git a/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2 b/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
index c2854dea598f..1c485d05ed9b 100644
--- a/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby21] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/jpace/ragol/archive/v1.0.1.tar.gz -> ragol-git-1.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3ba6a92478bdf5506890dc28e5c71873
diff --git a/metadata/md5-cache/dev-ruby/rails-4.2.7.1 b/metadata/md5-cache/dev-ruby/rails-4.2.7.1
index 73c89be90a02..14d16a995f8a 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.2.7.1
+++ b/metadata/md5-cache/dev-ruby/rails-4.2.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/actionmailer-4.2.7.1[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=mirror://rubygems/rails-4.2.7.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c571aaa20245e9d38efcba3c56dcd775
diff --git a/metadata/md5-cache/dev-ruby/rails-4.2.8 b/metadata/md5-cache/dev-ruby/rails-4.2.8
index aa06c7c769b8..729d63ad03c1 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.2.8
+++ b/metadata/md5-cache/dev-ruby/rails-4.2.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4.2
 SRC_URI=mirror://rubygems/rails-4.2.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=44352333ac0adeecb31756c3c3d0578d
diff --git a/metadata/md5-cache/dev-ruby/rails-5.0.0.1 b/metadata/md5-cache/dev-ruby/rails-5.0.0.1
index a77c34c154c7..5ead1f4cc41f 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.0.0.1
+++ b/metadata/md5-cache/dev-ruby/rails-5.0.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actioncable-5.0.0.1[ruby_targets_ruby22
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=mirror://rubygems/rails-5.0.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=09cab1b2a3d68b90e8ff675321275b7b
diff --git a/metadata/md5-cache/dev-ruby/rails-5.0.1 b/metadata/md5-cache/dev-ruby/rails-5.0.1
index 98f8a158b0ff..4e1e67436b8d 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.0.1
+++ b/metadata/md5-cache/dev-ruby/rails-5.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actioncable-5.0.1[ruby_targets_ruby22]
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=mirror://rubygems/rails-5.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ef67a9782bb008ac3126a3017f148b9e
diff --git a/metadata/md5-cache/dev-ruby/rails-5.0.2 b/metadata/md5-cache/dev-ruby/rails-5.0.2
index 2489df04007c..90d3d370aa72 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.0.2
+++ b/metadata/md5-cache/dev-ruby/rails-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actioncable-5.0.2[ruby_targets_ruby22]
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=mirror://rubygems/rails-5.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=33e7b3bfe47336660a661457cf36b882
diff --git a/metadata/md5-cache/dev-ruby/rails-5.0.3 b/metadata/md5-cache/dev-ruby/rails-5.0.3
index 60a39b776146..593191be56b7 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actioncable-5.0.3[ruby_targets_ruby22]
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=mirror://rubygems/rails-5.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f7e781835ed23e5101317b83585fcea3
diff --git a/metadata/md5-cache/dev-ruby/rails-5.1.1 b/metadata/md5-cache/dev-ruby/rails-5.1.1
index ea5ceeec40b8..389a80b705d9 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.1.1
+++ b/metadata/md5-cache/dev-ruby/rails-5.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actioncable-5.1.1[ruby_targets_ruby22]
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=mirror://rubygems/rails-5.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f7e781835ed23e5101317b83585fcea3
diff --git a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3 b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
index cf25bbe7efeb..1b2a812b33f4 100644
--- a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rails-deprecated_sanitizer-1.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=875159af1c57993fde21ce74697b9f9b
diff --git a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3-r1 b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3-r1
index 1a0659694b36..4b058e1db10a 100644
--- a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rails-deprecated_sanitizer-1.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0c424770eb1f971a4b696a3cc98c5b9a
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.8 b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.8
index 2045b67a2c8b..bd1cc597ddae 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.8
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/activesupport:4.2[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/rails-dom-testing-1.0.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6c954bcb8af23102abb6b8cd9af93da8
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.2 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.2
index f94d226c24ed..f171ed876fc0 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.2
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/rails-dom-testing-2.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=059591b5911c1cbc4fdb2438848e861b
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3
index 0835bc592d22..df2b8d414d76 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/rails-dom-testing-2.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=53f89bd95cafd9be3b7a38b8a8605dfe
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3
index fd82e14be676..7d3aecfde864 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/loofah:0[ruby_targets_ruby21] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/rails-html-sanitizer-1.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b643e8b7e1a979648f5f4a309666fb8f
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3-r1 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3-r1
index 3c234880f58c..77eb00515365 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/loofah:0[ruby_targets_ruby21] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/rails-html-sanitizer-1.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d7a01a47f631b1333d5073caf3ab5549
diff --git a/metadata/md5-cache/dev-ruby/rails-observers-0.1.2 b/metadata/md5-cache/dev-ruby/rails-observers-0.1.2
index 5d394787e09b..57ebce0df77f 100644
--- a/metadata/md5-cache/dev-ruby/rails-observers-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rails-observers-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/activemodel-4*[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0.1
 SRC_URI=https://github.com/rails/rails-observers/archive/v0.1.2.tar.gz -> rails-observers-0.1.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5976165d92c02aff7bc4c4ef70de7b23
diff --git a/metadata/md5-cache/dev-ruby/rails_autolink-1.1.6 b/metadata/md5-cache/dev-ruby/rails_autolink-1.1.6
index 63acd07a8daa..eab99c6d3422 100644
--- a/metadata/md5-cache/dev-ruby/rails_autolink-1.1.6
+++ b/metadata/md5-cache/dev-ruby/rails_autolink-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rails-3.1[ruby_targets_ruby21] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rails_autolink-1.1.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ff16b35d800fc781b871a658ce5c732a
diff --git a/metadata/md5-cache/dev-ruby/railties-4.2.7.1 b/metadata/md5-cache/dev-ruby/railties-4.2.7.1
index e68a612390c7..26839c49b167 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.2.7.1
+++ b/metadata/md5-cache/dev-ruby/railties-4.2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.7.1.tar.gz -> rails-4.2.7.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6c6399a54078c92f6e4adc7fc1e43302
diff --git a/metadata/md5-cache/dev-ruby/railties-4.2.8 b/metadata/md5-cache/dev-ruby/railties-4.2.8
index 00b5885ca5c4..45da1a10a0cd 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.2.8
+++ b/metadata/md5-cache/dev-ruby/railties-4.2.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=03b6a8d3b3005ce0a09c36b2251576e7
diff --git a/metadata/md5-cache/dev-ruby/railties-5.0.0.1-r1 b/metadata/md5-cache/dev-ruby/railties-5.0.0.1-r1
index ef1c938b13ca..34a0eaecad8d 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.0.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/railties-5.0.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.0.1.tar.gz -> rails-5.0.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f05e034d0b82754339fe1e68b23d06d6
diff --git a/metadata/md5-cache/dev-ruby/railties-5.0.1 b/metadata/md5-cache/dev-ruby/railties-5.0.1
index 06e191be2761..1eab59db2f01 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.0.1
+++ b/metadata/md5-cache/dev-ruby/railties-5.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.1.tar.gz -> rails-5.0.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=462eb88da256ff5d3a6c22bdf66478ed
diff --git a/metadata/md5-cache/dev-ruby/railties-5.0.2 b/metadata/md5-cache/dev-ruby/railties-5.0.2
index d2b595281027..90bc9cf3181e 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.0.2
+++ b/metadata/md5-cache/dev-ruby/railties-5.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.2.tar.gz -> rails-5.0.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=462eb88da256ff5d3a6c22bdf66478ed
diff --git a/metadata/md5-cache/dev-ruby/railties-5.0.3 b/metadata/md5-cache/dev-ruby/railties-5.0.3
index 0b8af5747bee..e0e5ec71bf2e 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.0.3
+++ b/metadata/md5-cache/dev-ruby/railties-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=56bd3e7af99fadf851e1a228b99f1539
diff --git a/metadata/md5-cache/dev-ruby/railties-5.1.1 b/metadata/md5-cache/dev-ruby/railties-5.1.1
index ddefffa16976..1dc5dde5b12f 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.1.1
+++ b/metadata/md5-cache/dev-ruby/railties-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b04f74705fb85b6a7b05c59543ffd632
diff --git a/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1 b/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
index 38319f947de2..db872d6728a0 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/sickill/rainbow/archive/v1.1.4.tar.gz -> rainbow-git-1.1.4.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=68e6c6ccade121105a9ef09bb84f7593
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.0.0-r1 b/metadata/md5-cache/dev-ruby/rainbow-2.0.0-r1
index 4af024c234ec..4a2686427e48 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.0.0.tar.gz -> rainbow-git-2.0.0.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5a8426ff64886754c0cd6e9e64c2afd5
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.1.0 b/metadata/md5-cache/dev-ruby/rainbow-2.1.0
index 5f8e5adaa048..94c576fd270f 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.1.0.tar.gz -> rainbow-git-2.1.0.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=20e36ac72d377082496ed6c003081005
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.2.1 b/metadata/md5-cache/dev-ruby/rainbow-2.2.1
index 8ddee5c6e035..65324cbb14d6 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.2.1
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.2.1.tar.gz -> rainbow-git-2.2.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1855b5653347bc3fa6e17585646b9ca3
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.2.2 b/metadata/md5-cache/dev-ruby/rainbow-2.2.2
index a51de5baff6b..40ba14267ce6 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.2.2
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.2.2.tar.gz -> rainbow-git-2.2.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f0ab7701f221d7147cceb381dfeaebdb
diff --git a/metadata/md5-cache/dev-ruby/rake-0.9.6-r1 b/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
index b17f9c20684f..e09beb5489a5 100644
--- a/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
+++ b/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-0.9.6.gem
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=489e6d35b6ed9d9f729197f43d43a978
diff --git a/metadata/md5-cache/dev-ruby/rake-10.5.0 b/metadata/md5-cache/dev-ruby/rake-10.5.0
index 07b883b34fcb..5bc658bc67bb 100644
--- a/metadata/md5-cache/dev-ruby/rake-10.5.0
+++ b/metadata/md5-cache/dev-ruby/rake-10.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-10.5.0.gem
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=86c894ec6aa10a74889522a9e171b9ca
diff --git a/metadata/md5-cache/dev-ruby/rake-11.1.2 b/metadata/md5-cache/dev-ruby/rake-11.1.2
index d2b01cf3b4f5..08341013cacb 100644
--- a/metadata/md5-cache/dev-ruby/rake-11.1.2
+++ b/metadata/md5-cache/dev-ruby/rake-11.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-11.1.2.gem
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=db23fb3c3dba2ac0e5b92a89e5dfd31c
diff --git a/metadata/md5-cache/dev-ruby/rake-11.2.2-r1 b/metadata/md5-cache/dev-ruby/rake-11.2.2-r1
index 996d3a4b1e61..2251490edc2b 100644
--- a/metadata/md5-cache/dev-ruby/rake-11.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/rake-11.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v11.2.2.tar.gz -> rake-11.2.2.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=459d8b76b1e9be0c38379b10621e5bcd
diff --git a/metadata/md5-cache/dev-ruby/rake-11.3.0 b/metadata/md5-cache/dev-ruby/rake-11.3.0
index 6181e92505fa..2a38dbfeecc4 100644
--- a/metadata/md5-cache/dev-ruby/rake-11.3.0
+++ b/metadata/md5-cache/dev-ruby/rake-11.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v11.3.0.tar.gz -> rake-11.3.0.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=459d8b76b1e9be0c38379b10621e5bcd
diff --git a/metadata/md5-cache/dev-ruby/rake-12.0.0 b/metadata/md5-cache/dev-ruby/rake-12.0.0
index 7faca18b1672..b28b7ab8a999 100644
--- a/metadata/md5-cache/dev-ruby/rake-12.0.0
+++ b/metadata/md5-cache/dev-ruby/rake-12.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v12.0.0.tar.gz -> rake-12.0.0.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=38c0e13c065560bd792fdc6f4de1e055
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2-r1 b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2-r1
index cc6b31e633d6..8e3559fff965 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2-r1
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/tarball/v0.9.2 -> rake-compiler-0.9.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c2db070a38b0eef877751688c12f45bf
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.0.2 b/metadata/md5-cache/dev-ruby/rake-compiler-1.0.2
index 2dcf6f223cd0..fc47c24a890f 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.0.2
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.0.2.tar.gz -> rake-compiler-1.0.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f472b284f680231c65c5deb7a5d3a2ca
diff --git a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.1 b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.1
index 8815dd088eb6..8900a66fb4e4 100644
--- a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.1
+++ b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/open4-1.0[ruby_targets_ruby21] dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-remote_task-2.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=878f1de6e24640b606f088a3a70435af
diff --git a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.2 b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.2
index f5d90dffc837..25f7cea4900b 100644
--- a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.2
+++ b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/open4-1.0[ruby_targets_ruby21] >=dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-remote_task-2.4.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2275126282139cd5c126f63346ed122e
diff --git a/metadata/md5-cache/dev-ruby/rash-0.4.0-r2 b/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
index 5860b0c2ac6a..af116695848d 100644
--- a/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
+++ b/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rash-0.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4ad9a2668aa05697b81869c27dc5a75d
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.6 b/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.6
index 83c7de8ed9a5..22b18d82f26f 100644
--- a/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.6
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.6
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/gsl-1.15 <sci-libs/gsl-2.1 ruby_targets_ruby21? ( dev-ruby/na
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/gsl-1.16.0.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3d3de6092b9df7484e18b54392057b76
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.1 b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.1
index 914f50ac3e21..bef2de1c8976 100644
--- a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.1
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/gsl-2.3[deprecated] ruby_targets_ruby21? ( dev-ruby/narray[ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/gsl-2.1.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ab852d4d4e7dafa4f20f5de96becc434
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
index 42d645520f3d..c2b68d6aed7d 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.9.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4cd435e7d2e7b9fc087958970049d5c9
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.8 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.8
index 866e5bc6605a..426e8a7302ef 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.8
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.9.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=14de6a5c6279f1fb2b21564e59a44a48
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.3 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.3
index d9e45b859740..1e257d5f8d54 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.3
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-readline-0.5.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3b83b285f2fe041fed67ff7298731e74
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.4 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.4
index c08a63c2667e..6d8f99eb99c5 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.4
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-readline-0.5.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2dabb020a259a91f7e52b87fdc78b88c
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0 b/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0
index c147a9a8354f..5c341dbfd006 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0
+++ b/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-readline-r7-0.5.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5e2de2a4a0e6df248592fbec53eae3c2
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-4.0.1 b/metadata/md5-cache/dev-ruby/rbnacl-4.0.1
index c06a48b45729..b2619e42ba05 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-4.0.1
+++ b/metadata/md5-cache/dev-ruby/rbnacl-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libsodium ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/rbnacl-4.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=db231d12f14fe3ce143f3a4c0b0d0c5b
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-4.0.2 b/metadata/md5-cache/dev-ruby/rbnacl-4.0.2
index da206df03259..dd1edd3849d8 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-4.0.2
+++ b/metadata/md5-cache/dev-ruby/rbnacl-4.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libsodium ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/rbnacl-4.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=251010bd1344b0b2b92dd54ce72faa10
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.19.0 b/metadata/md5-cache/dev-ruby/rbpdf-1.19.0
index 3b1d0c8c1f8a..39e74db7c660 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.19.0
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.19.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/actionview:*[ruby_targets_ruby21] dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbpdf-1.19.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=383028902f7ca73ac609560cf2d5ec67
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.19.1 b/metadata/md5-cache/dev-ruby/rbpdf-1.19.1
index fddea37bcb7a..aaca2177c0d8 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.19.1
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.19.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/actionview:*[ruby_targets_ruby21] dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbpdf-1.19.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=655b04040e715800fd8017e484e9017b
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.19.2 b/metadata/md5-cache/dev-ruby/rbpdf-1.19.2
index 2c605ee00c6b..8660e3f2f173 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.19.2
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.19.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/actionview:*[ruby_targets_ruby21] dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbpdf-1.19.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=655b04040e715800fd8017e484e9017b
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.0-r1 b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.0-r1
index 853be0e7cf2d..931ca16a9f0a 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.0-r1
+++ b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbpdf-font-1.19.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=915862e18e81eb4d2fae7418372a0334
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1 b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1
index fe050506133d..c1226a986513 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1
+++ b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbpdf-font-1.19.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5458f3f8c938e64e305cee74cd99a594
diff --git a/metadata/md5-cache/dev-ruby/rbtree-0.4.2-r1 b/metadata/md5-cache/dev-ruby/rbtree-0.4.2-r1
index b346a5560d05..1292e8ab81d3 100644
--- a/metadata/md5-cache/dev-ruby/rbtree-0.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/rbtree-0.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbtree-0.4.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d573ad583da2062c25e5efc039aef0cc
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.14.3 b/metadata/md5-cache/dev-ruby/rcairo-1.14.3
index 7389a8a87c8f..022234dde3da 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.14.3
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cairo-1.14.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=16ca498eef60b70698178eeb3453e0ae
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.15.4 b/metadata/md5-cache/dev-ruby/rcairo-1.15.4
index 81495469c816..90c156b6098a 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.15.4
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.15.4
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/cairo-1.15.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=88149236dfae89603d6dd8757d4d4a8a
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.15.5 b/metadata/md5-cache/dev-ruby/rcairo-1.15.5
index b30cf155b744..9f2a9ad88144 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.15.5
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.15.5
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/cairo-1.15.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=021ce3d4af331b2f1e0a6f5b5d567d31
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.1.8 b/metadata/md5-cache/dev-ruby/rdiscount-2.1.8
index 3f45c6ec90df..bc79ea02a5fe 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.1.8
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdiscount-2.1.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3efdc43810ea6ef978287a02f47cb63e
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
index ef021b4235ec..afcb06361746 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdiscount-2.2.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=72d3eb25b018055638c2e139527c22b9
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.2.0 b/metadata/md5-cache/dev-ruby/rdoc-4.2.0
index b7b059c49599..37d10c90a565 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.2.0
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/json-1*[ruby_targets_ruby21] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-4.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d170149c1869462b4a2c4730fe5511f4
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.2.2 b/metadata/md5-cache/dev-ruby/rdoc-4.2.2
index a2e879a2d5bf..9fffbf707538 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.2.2
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-4.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=be4cec63ffe2191f261d09811a6b24c9
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.3.0 b/metadata/md5-cache/dev-ruby/rdoc-4.3.0
index 9b0c451dbc0b..50d0f7604e2a 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.3.0
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-4.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=be4cec63ffe2191f261d09811a6b24c9
diff --git a/metadata/md5-cache/dev-ruby/rdoc-5.0.0-r3 b/metadata/md5-cache/dev-ruby/rdoc-5.0.0-r3
index 9b433fbc8bcb..a2f05badfe92 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-5.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/rdoc-5.0.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-ruby-20161226 ruby_targets_ruby21? ( dev-ruby/json
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rdoc/rdoc/archive/v5.0.0.tar.gz -> rdoc-5.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=193205d674e5676c56608aa598be736e
diff --git a/metadata/md5-cache/dev-ruby/rdoc-5.1.0 b/metadata/md5-cache/dev-ruby/rdoc-5.1.0
index d2e518466fdd..5702c91e3253 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-5.1.0
+++ b/metadata/md5-cache/dev-ruby/rdoc-5.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-ruby-20161226 ruby_targets_ruby21? ( dev-ruby/json
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rdoc/rdoc/archive/v5.1.0.tar.gz -> rdoc-5.1.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=193205d674e5676c56608aa598be736e
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
index 8a09f8c7cf2c..021449296dd0 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( virtual/emacs ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdtool-0.6.38.gem
-_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7a06ac26438a538d4425e5278507de6e
diff --git a/metadata/md5-cache/dev-ruby/recog-2.0.14-r1 b/metadata/md5-cache/dev-ruby/recog-2.0.14-r1
index 2d19b3b82c3f..e7474b19602f 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.0.14-r1
+++ b/metadata/md5-cache/dev-ruby/recog-2.0.14-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] !<dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2.0.14
 SRC_URI=mirror://rubygems/recog-2.0.14.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=46e8e84a64041af6e8420512bdc96dde
diff --git a/metadata/md5-cache/dev-ruby/recog-2.1.6 b/metadata/md5-cache/dev-ruby/recog-2.1.6
index 561d419f0d2e..a803301f1d3e 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.1.6
+++ b/metadata/md5-cache/dev-ruby/recog-2.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby23? ( dev-ruby/nokogiri[ruby_targets_ruby23] !<dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby23 )
 SLOT=2.1.6
 SRC_URI=mirror://rubygems/recog-2.1.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1eea2bf13f5ff6b044ceb467b0bac0b2
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.2.3 b/metadata/md5-cache/dev-ruby/redcarpet-3.2.3
index 2408e51def61..a06ca8e54935 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.2.3
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.2.3.tar.gz -> redcarpet-3.2.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4dca31361ebf2e80374e4c46386761a8
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.3.2 b/metadata/md5-cache/dev-ruby/redcarpet-3.3.2
index f8b15b2dbc3f..05b4011ed4b5 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.3.2
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.3.2.tar.gz -> redcarpet-3.3.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9c881859b7a3a31e407e6aa913ea46be
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.3.3 b/metadata/md5-cache/dev-ruby/redcarpet-3.3.3
index a08005e9a451..b21284bd8340 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.3.3
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.3.3.tar.gz -> redcarpet-3.3.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=98c329642ce4a7f9939f2a6135fc1990
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.3.4 b/metadata/md5-cache/dev-ruby/redcarpet-3.3.4
index 1b7b79d17591..ececf6caa064 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.3.4
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.3.4.tar.gz -> redcarpet-3.3.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=319508a0f01dc53b13bc7768dc686c3a
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.4.0 b/metadata/md5-cache/dev-ruby/redcarpet-3.4.0
index 10be682ffdb1..c73c81bb3b71 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.4.0
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.4.0.tar.gz -> redcarpet-3.4.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1477c437f66bcb9b24a2f5f929c63fa4
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4 b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
index d91d620fcb26..d86c197930ee 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/tarball/v4.2.9 -> RedCloth-git-4.2.9.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6b02101c0d611875c450ae5580e26438
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.3.2 b/metadata/md5-cache/dev-ruby/redcloth-4.3.2
index 6034993a97d4..ff042dedc19f 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.3.2
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/archive/v4.3.2.tar.gz -> RedCloth-4.3.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=58823393df1d20775575e13189799283
diff --git a/metadata/md5-cache/dev-ruby/redis-3.2.2 b/metadata/md5-cache/dev-ruby/redis-3.2.2
index 82ad3e3b5218..c49ef7add3b0 100644
--- a/metadata/md5-cache/dev-ruby/redis-3.2.2
+++ b/metadata/md5-cache/dev-ruby/redis-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/redis/redis-rb/archive/v3.2.2.tar.gz -> redis-rb-3.2.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c828df1e2c58e9cd1afd9e9db5099b3b
diff --git a/metadata/md5-cache/dev-ruby/redis-3.3.0 b/metadata/md5-cache/dev-ruby/redis-3.3.0
index 8edb1a92b1d5..e8fab20d89fc 100644
--- a/metadata/md5-cache/dev-ruby/redis-3.3.0
+++ b/metadata/md5-cache/dev-ruby/redis-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/redis/redis-rb/archive/v3.3.0.tar.gz -> redis-rb-3.3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c828df1e2c58e9cd1afd9e9db5099b3b
diff --git a/metadata/md5-cache/dev-ruby/redis-3.3.1 b/metadata/md5-cache/dev-ruby/redis-3.3.1
index 80bda6a384be..8859518a1733 100644
--- a/metadata/md5-cache/dev-ruby/redis-3.3.1
+++ b/metadata/md5-cache/dev-ruby/redis-3.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/redis/redis-rb/archive/v3.3.1.tar.gz -> redis-rb-3.3.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=35112721d84d9a9cb6f2eba057eaa154
diff --git a/metadata/md5-cache/dev-ruby/redis-3.3.2 b/metadata/md5-cache/dev-ruby/redis-3.3.2
index 7daa8b8f4464..e5cd9df76368 100644
--- a/metadata/md5-cache/dev-ruby/redis-3.3.2
+++ b/metadata/md5-cache/dev-ruby/redis-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/redis/redis-rb/archive/v3.3.2.tar.gz -> redis-rb-3.3.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6abfe6c7511be588600b06b731ab9933
diff --git a/metadata/md5-cache/dev-ruby/ref-2.0.0 b/metadata/md5-cache/dev-ruby/ref-2.0.0
index 3d734e9ec8df..1512fbc819ff 100644
--- a/metadata/md5-cache/dev-ruby/ref-2.0.0
+++ b/metadata/md5-cache/dev-ruby/ref-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/ruby-concurrency/ref/archive/v2.0.0.tar.gz -> ref-2.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=47104b9e73cb2a904fd08960f376bbab
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-0.3.6 b/metadata/md5-cache/dev-ruby/regexp_parser-0.3.6
index cdb7364a626d..040dd0aedc77 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-0.3.6
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/regexp_parser-0.3.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=81dd2016c70f58921ed2571c8944b6c3
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-0.4.1 b/metadata/md5-cache/dev-ruby/regexp_parser-0.4.1
index 3d43a2ccd508..9f5166600328 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-0.4.1
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v0.4.1.tar.gz -> regexp_parser-0.4.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=077520ffe61dc6791cbf2b3c9471191e
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-0.4.3 b/metadata/md5-cache/dev-ruby/regexp_parser-0.4.3
index 0be8a30e99eb..b5ef344c47c7 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-0.4.3
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-0.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v0.4.3.tar.gz -> regexp_parser-0.4.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5447a492e9329c06954a4cf09cf7d957
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.0.5 b/metadata/md5-cache/dev-ruby/request_store-1.0.5
index a55b28e8d276..37ac67cff6ce 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.0.5
+++ b/metadata/md5-cache/dev-ruby/request_store-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.0.5
 SRC_URI=mirror://rubygems/request_store-1.0.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7f0820ca866e8213ff2febae1bd266f5
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.3.1 b/metadata/md5-cache/dev-ruby/request_store-1.3.1
index fc6c5790656c..675dd88c7f98 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.3.1
+++ b/metadata/md5-cache/dev-ruby/request_store-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/request_store-1.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a0a86c50ba505fbf66eb08b38214ac3d
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.3.2 b/metadata/md5-cache/dev-ruby/request_store-1.3.2
index 483227ba3017..f72f90ad81b7 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.3.2
+++ b/metadata/md5-cache/dev-ruby/request_store-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/request_store-1.3.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ad291ef389d85a6f08d221394cf34a88
diff --git a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r1 b/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r1
index f2d63b3bd8bf..bbe9971e441c 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rest-client-1.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3e211f7d30d005762f371e17f544e47c
diff --git a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3 b/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3
index 02fb1a96f32c..c93cb40288a3 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3
+++ b/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rest-client-1.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d4bfa732fe6c7e37a9f97687989bb2d3
diff --git a/metadata/md5-cache/dev-ruby/rest-client-2.0.1 b/metadata/md5-cache/dev-ruby/rest-client-2.0.1
index 122979df233b..ff29cdbc52e3 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-2.0.1
+++ b/metadata/md5-cache/dev-ruby/rest-client-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/rest-client-2.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=93e78d79ab1156abdee8589fd36ac63c
diff --git a/metadata/md5-cache/dev-ruby/rest-client-2.0.2 b/metadata/md5-cache/dev-ruby/rest-client-2.0.2
index aa27bc3e340d..35dd562ffd30 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-2.0.2
+++ b/metadata/md5-cache/dev-ruby/rest-client-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/rest-client-2.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b5efb9190ae72a72aa3dd15285eb034d
diff --git a/metadata/md5-cache/dev-ruby/rev-0.3.2-r1 b/metadata/md5-cache/dev-ruby/rev-0.3.2-r1
index fd201b604cd8..2bba990255cf 100644
--- a/metadata/md5-cache/dev-ruby/rev-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rev-0.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rev-0.3.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=871d0a2522bebb53fbe7135a8322bf78
diff --git a/metadata/md5-cache/dev-ruby/rex-arch-0.1.1 b/metadata/md5-cache/dev-ruby/rex-arch-0.1.1
index 777ca9b90921..d6cac3dcff77 100644
--- a/metadata/md5-cache/dev-ruby/rex-arch-0.1.1
+++ b/metadata/md5-cache/dev-ruby/rex-arch-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-arch-0.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=42c578e112f416ae67f96ce2946a927e
diff --git a/metadata/md5-cache/dev-ruby/rex-arch-0.1.2 b/metadata/md5-cache/dev-ruby/rex-arch-0.1.2
index e356472c6e23..30500fb42085 100644
--- a/metadata/md5-cache/dev-ruby/rex-arch-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rex-arch-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-arch-0.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=42c578e112f416ae67f96ce2946a927e
diff --git a/metadata/md5-cache/dev-ruby/rex-arch-0.1.4 b/metadata/md5-cache/dev-ruby/rex-arch-0.1.4
index adcd6efa52e2..a956e8b8ed91 100644
--- a/metadata/md5-cache/dev-ruby/rex-arch-0.1.4
+++ b/metadata/md5-cache/dev-ruby/rex-arch-0.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-arch-0.1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=42c578e112f416ae67f96ce2946a927e
diff --git a/metadata/md5-cache/dev-ruby/rex-arch-0.1.5 b/metadata/md5-cache/dev-ruby/rex-arch-0.1.5
index bd3b563d4758..63d82fdb2185 100644
--- a/metadata/md5-cache/dev-ruby/rex-arch-0.1.5
+++ b/metadata/md5-cache/dev-ruby/rex-arch-0.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-arch-0.1.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=42c578e112f416ae67f96ce2946a927e
diff --git a/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.2 b/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.2
index 64f509a47e11..cecfd23423c7 100644
--- a/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-bin_tools-0.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2694c62712c25d3a3c09c263aa358f62
diff --git a/metadata/md5-cache/dev-ruby/rex-core-0.1.10 b/metadata/md5-cache/dev-ruby/rex-core-0.1.10
new file mode 100644
index 000000000000..0408c99bdaa0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rex-core-0.1.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_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_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Core libraries required for the Ruby Exploitation(Rex) Suite
+EAPI=6
+HOMEPAGE=https://rubygems.org/gems/rex-core
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=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_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_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/rex-core-0.1.10.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c4ec92173b624e1cdc543150b6ad0dea
diff --git a/metadata/md5-cache/dev-ruby/rex-core-0.1.9 b/metadata/md5-cache/dev-ruby/rex-core-0.1.9
index d0ea7ad85599..26e9c5081d79 100644
--- a/metadata/md5-cache/dev-ruby/rex-core-0.1.9
+++ b/metadata/md5-cache/dev-ruby/rex-core-0.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-core-0.1.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ea7753b7b28c252286b396c3b1291283
diff --git a/metadata/md5-cache/dev-ruby/rex-encoder-0.1.3 b/metadata/md5-cache/dev-ruby/rex-encoder-0.1.3
index 188c0354a015..47703bff265e 100644
--- a/metadata/md5-cache/dev-ruby/rex-encoder-0.1.3
+++ b/metadata/md5-cache/dev-ruby/rex-encoder-0.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-encoder-0.1.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8a706a918806ecd6be75ad8fc9bfc08c
diff --git a/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.12 b/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.12
index e48b291f9acf..cda2d86b40be 100644
--- a/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.12
+++ b/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-exploitation-0.1.12.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1a5331bc6ef3786ce8ad941d749eb87d
diff --git a/metadata/md5-cache/dev-ruby/rex-java-0.1.2 b/metadata/md5-cache/dev-ruby/rex-java-0.1.2
index 2af1df1f5d8e..ddd925f3a5b2 100644
--- a/metadata/md5-cache/dev-ruby/rex-java-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rex-java-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-java-0.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=81e84daf93ac84e3545a6b19719116eb
diff --git a/metadata/md5-cache/dev-ruby/rex-mime-0.1.4 b/metadata/md5-cache/dev-ruby/rex-mime-0.1.4
index d355b0fccc0f..fff149cb4320 100644
--- a/metadata/md5-cache/dev-ruby/rex-mime-0.1.4
+++ b/metadata/md5-cache/dev-ruby/rex-mime-0.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-mime-0.1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6bd75cea3517d500e0b0f3f65fc4756f
diff --git a/metadata/md5-cache/dev-ruby/rex-nop-0.1.0 b/metadata/md5-cache/dev-ruby/rex-nop-0.1.0
index 2285725b11c6..831c7afc802e 100644
--- a/metadata/md5-cache/dev-ruby/rex-nop-0.1.0
+++ b/metadata/md5-cache/dev-ruby/rex-nop-0.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-nop-0.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ab478404e68be526e5e7b590e564ba8a
diff --git a/metadata/md5-cache/dev-ruby/rex-ole-0.1.2 b/metadata/md5-cache/dev-ruby/rex-ole-0.1.2
index 976214f74158..14a3f198ffcd 100644
--- a/metadata/md5-cache/dev-ruby/rex-ole-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rex-ole-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-ole-0.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=936b8190b6a1ad9e021687b8620caf44
diff --git a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.1-r1 b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.1-r1
index 40d7a06eb02b..e0f08a171406 100644
--- a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-powershell-0.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2b9b45541ce45e4c7e26028666aabcd2
diff --git a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.64 b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.64
index 287a45a69b1d..693576dd1bc4 100644
--- a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.64
+++ b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.64
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-powershell-0.1.64.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e0b9db2b947651a9eb57f4141fc4dcb8
diff --git a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.65 b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.65
index 0fbbe255fa44..17bb7ce41de8 100644
--- a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.65
+++ b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.65
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-powershell-0.1.65.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e0b9db2b947651a9eb57f4141fc4dcb8
diff --git a/metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.0-r1 b/metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.0-r1
index 8bb4f22af59d..04ce9d52ae14 100644
--- a/metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-random_identifier-0.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=39e7bba56e01dfc2c922425c62f9b3c0
diff --git a/metadata/md5-cache/dev-ruby/rex-registry-0.1.0-r1 b/metadata/md5-cache/dev-ruby/rex-registry-0.1.0-r1
index 9d4d34ce0c2d..04f17996d524 100644
--- a/metadata/md5-cache/dev-ruby/rex-registry-0.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/rex-registry-0.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-registry-0.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6f5eb1a4309fdd9774ad163e091e93ff
diff --git a/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.2 b/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.2
index 289630e3743d..95fb18a77b9f 100644
--- a/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-rop_builder-0.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=78b81ae6bae551887a99ab19f8d0dbb2
diff --git a/metadata/md5-cache/dev-ruby/rex-socket-0.1.5 b/metadata/md5-cache/dev-ruby/rex-socket-0.1.5
index 8095907714da..05d5e6440791 100644
--- a/metadata/md5-cache/dev-ruby/rex-socket-0.1.5
+++ b/metadata/md5-cache/dev-ruby/rex-socket-0.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-socket-0.1.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1c5f7c0b7ce372631c989b162208dcd9
diff --git a/metadata/md5-cache/dev-ruby/rex-sslscan-0.1.3 b/metadata/md5-cache/dev-ruby/rex-sslscan-0.1.3
index d3be1f1619fc..8b3041b7e054 100644
--- a/metadata/md5-cache/dev-ruby/rex-sslscan-0.1.3
+++ b/metadata/md5-cache/dev-ruby/rex-sslscan-0.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-sslscan-0.1.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0108a3d2d1267e6dac26f1f89dfd7f08
diff --git a/metadata/md5-cache/dev-ruby/rex-struct2-0.1.0 b/metadata/md5-cache/dev-ruby/rex-struct2-0.1.0
index d32fd1c4524a..cc0c61afd85c 100644
--- a/metadata/md5-cache/dev-ruby/rex-struct2-0.1.0
+++ b/metadata/md5-cache/dev-ruby/rex-struct2-0.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-struct2-0.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=32ff0c7054eec1db87185baf5b75c3c5
diff --git a/metadata/md5-cache/dev-ruby/rex-struct2-0.1.1 b/metadata/md5-cache/dev-ruby/rex-struct2-0.1.1
index ac1c6f5a89f9..2bbfa9d49615 100644
--- a/metadata/md5-cache/dev-ruby/rex-struct2-0.1.1
+++ b/metadata/md5-cache/dev-ruby/rex-struct2-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-struct2-0.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ad108796267ad1937084c41e565371d0
diff --git a/metadata/md5-cache/dev-ruby/rex-text-0.1.2 b/metadata/md5-cache/dev-ruby/rex-text-0.1.2
index 2fd71ee3dc3a..815ec3f47df8 100644
--- a/metadata/md5-cache/dev-ruby/rex-text-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rex-text-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-text-0.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d24925c9c6971ba86470414ce93c65f7
diff --git a/metadata/md5-cache/dev-ruby/rex-text-0.2.12 b/metadata/md5-cache/dev-ruby/rex-text-0.2.12
index b5118b6e7ca8..6669900337e7 100644
--- a/metadata/md5-cache/dev-ruby/rex-text-0.2.12
+++ b/metadata/md5-cache/dev-ruby/rex-text-0.2.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-text-0.2.12.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=407caea079641a52a22f1836f664445c
diff --git a/metadata/md5-cache/dev-ruby/rex-text-0.2.9 b/metadata/md5-cache/dev-ruby/rex-text-0.2.9
index 766b4d6c90ec..7725af5738cd 100644
--- a/metadata/md5-cache/dev-ruby/rex-text-0.2.9
+++ b/metadata/md5-cache/dev-ruby/rex-text-0.2.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-text-0.2.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d24925c9c6971ba86470414ce93c65f7
diff --git a/metadata/md5-cache/dev-ruby/rex-zip-0.1.0-r1 b/metadata/md5-cache/dev-ruby/rex-zip-0.1.0-r1
index 162fcb6c028e..bd140e043d8d 100644
--- a/metadata/md5-cache/dev-ruby/rex-zip-0.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/rex-zip-0.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-zip-0.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=67c7bc560ca773ca119e0b175b6fd8e0
diff --git a/metadata/md5-cache/dev-ruby/rex-zip-0.1.1 b/metadata/md5-cache/dev-ruby/rex-zip-0.1.1
index 6fc4200ca218..ab9c2cffee37 100644
--- a/metadata/md5-cache/dev-ruby/rex-zip-0.1.1
+++ b/metadata/md5-cache/dev-ruby/rex-zip-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-zip-0.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=75c4d0320b882bbbc00b6d4b37361d0d
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3 b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3
index 42fd8053317c..0ee0ce72ef6c 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3
@@ -10,5 +10,5 @@ RDEPEND=!!app-admin/rex ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rexical-1.0.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9d6de341b5baa9b3bd0c48910aead37a
diff --git a/metadata/md5-cache/dev-ruby/rgen-0.8.0 b/metadata/md5-cache/dev-ruby/rgen-0.8.0
index 4411cbf1238f..455eb266fcfa 100644
--- a/metadata/md5-cache/dev-ruby/rgen-0.8.0
+++ b/metadata/md5-cache/dev-ruby/rgen-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rgen-0.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=03adc41e0aa5c215f7f54a3d1751646a
diff --git a/metadata/md5-cache/dev-ruby/rgen-0.8.1 b/metadata/md5-cache/dev-ruby/rgen-0.8.1
index 194cd992fae0..7cecc631b716 100644
--- a/metadata/md5-cache/dev-ruby/rgen-0.8.1
+++ b/metadata/md5-cache/dev-ruby/rgen-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rgen-0.8.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3c7589aad6cdb08ce9111359290759b5
diff --git a/metadata/md5-cache/dev-ruby/rgen-0.8.2 b/metadata/md5-cache/dev-ruby/rgen-0.8.2
index d77871c29414..553f85969a35 100644
--- a/metadata/md5-cache/dev-ruby/rgen-0.8.2
+++ b/metadata/md5-cache/dev-ruby/rgen-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rgen-0.8.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3c7589aad6cdb08ce9111359290759b5
diff --git a/metadata/md5-cache/dev-ruby/riel-1.2.0-r2 b/metadata/md5-cache/dev-ruby/riel-1.2.0-r2
index 65f4f9d9ffec..0893fbf11b90 100644
--- a/metadata/md5-cache/dev-ruby/riel-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/riel-1.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby21] d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/jpace/riel/archive/v1.2.0.tar.gz -> riel-git-1.2.0.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=778f7de83c79d77d563ba7103a9d384e
diff --git a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1 b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
index e6f9bd72f3a5..7cd50636f688 100644
--- a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rightscale/right_http_connection/tarball/v1.3.0 -> right_http_connection-1.3.0.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=659cf7768fd340c601c8179dd2659e5b
diff --git a/metadata/md5-cache/dev-ruby/right_http_connection-1.5.0 b/metadata/md5-cache/dev-ruby/right_http_connection-1.5.0
index ddab6c9bdb22..e4ae38e8c6a9 100644
--- a/metadata/md5-cache/dev-ruby/right_http_connection-1.5.0
+++ b/metadata/md5-cache/dev-ruby/right_http_connection-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rightscale/right_http_connection/archive/v1.5.0.tar.gz -> right_http_connection-1.5.0.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0792fb574741d072b66dea203d1e0023
diff --git a/metadata/md5-cache/dev-ruby/rinku-1.7.3 b/metadata/md5-cache/dev-ruby/rinku-1.7.3
index ac7e708ce3f9..e9a589d393c9 100644
--- a/metadata/md5-cache/dev-ruby/rinku-1.7.3
+++ b/metadata/md5-cache/dev-ruby/rinku-1.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rinku-1.7.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b7e0d3a5b24b414f3a1d2ffb50cfd03c
diff --git a/metadata/md5-cache/dev-ruby/rinku-2.0.0 b/metadata/md5-cache/dev-ruby/rinku-2.0.0
index 01ad306041aa..5c781cfa8de1 100644
--- a/metadata/md5-cache/dev-ruby/rinku-2.0.0
+++ b/metadata/md5-cache/dev-ruby/rinku-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rinku-2.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b7e0d3a5b24b414f3a1d2ffb50cfd03c
diff --git a/metadata/md5-cache/dev-ruby/rinku-2.0.2 b/metadata/md5-cache/dev-ruby/rinku-2.0.2
index 03efd06a3f67..fa28a6a4e0ce 100644
--- a/metadata/md5-cache/dev-ruby/rinku-2.0.2
+++ b/metadata/md5-cache/dev-ruby/rinku-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rinku-2.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b7e0d3a5b24b414f3a1d2ffb50cfd03c
diff --git a/metadata/md5-cache/dev-ruby/ritex-1.0.1 b/metadata/md5-cache/dev-ruby/ritex-1.0.1
index 213d932440b6..e48cc8c79931 100644
--- a/metadata/md5-cache/dev-ruby/ritex-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ritex-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/racc[ruby_targets_ruby21] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ritex-1.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e0e69e57d356d59049d6ae840019934d
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.5.4 b/metadata/md5-cache/dev-ruby/rjb-1.5.4
index f3c280419c49..0f037daede4b 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.5.4
+++ b/metadata/md5-cache/dev-ruby/rjb-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby21? ( dev-l
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ) || ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rjb-1.5.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8531e5c508ff17b5b8f3d470508b78fb
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.5.5 b/metadata/md5-cache/dev-ruby/rjb-1.5.5
index 28b578e47fc5..14cad0bc5b11 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.5.5
+++ b/metadata/md5-cache/dev-ruby/rjb-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby21? ( dev-l
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ) || ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rjb-1.5.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=34c7260275daab5255ce4bfc2e2159a6
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
index 664a4c44f8e5..90e228018e1e 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rkelly-remix-0.0.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9b6369b1bade7561d47df3f792e2598e
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
index d544fe218574..7e1ad5497122 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rkelly-remix-0.0.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=163c95e9a793ac205aad39b4cb1fa6ab
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.13.4 b/metadata/md5-cache/dev-ruby/rmagick-2.13.4
index 87984d9932bb..8f4c892eb7da 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-2.13.4
+++ b/metadata/md5-cache/dev-ruby/rmagick-2.13.4
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/imagemagick-6.4.9:=[-hdri] =media-gfx/imagemagick-6* ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rmagick-2.13.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c176b06d4ebea7cdcba44085934fcb0b
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.15.4 b/metadata/md5-cache/dev-ruby/rmagick-2.15.4
index da3bd3444475..5a2f03cd46f2 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-2.15.4
+++ b/metadata/md5-cache/dev-ruby/rmagick-2.15.4
@@ -4,11 +4,11 @@ DESCRIPTION=An interface between Ruby and the ImageMagick(TM) image processing l
 EAPI=5
 HOMEPAGE=https://github.com/gemhome/rmagick
 IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos
 LICENSE=Artistic
 RDEPEND=>=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6* ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rmagick-2.15.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ef84bb6b66dc377259e7fbbed9aa2266
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=92f75d1c8c32a77e4ef39debef33a63a
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.16.0 b/metadata/md5-cache/dev-ruby/rmagick-2.16.0
index dc5344b18509..22739063c07d 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-2.16.0
+++ b/metadata/md5-cache/dev-ruby/rmagick-2.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6* ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rmagick-2.16.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1c808790d6bc30beb5cf78512e7d0c8a
diff --git a/metadata/md5-cache/dev-ruby/roadie-3.2.1 b/metadata/md5-cache/dev-ruby/roadie-3.2.1
index 4da30e6c9538..4fd2d1e24a47 100644
--- a/metadata/md5-cache/dev-ruby/roadie-3.2.1
+++ b/metadata/md5-cache/dev-ruby/roadie-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/Mange/roadie/archive/v3.2.1.tar.gz -> roadie-3.2.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5790cb30b6b81dccca5cab6611dc6480
diff --git a/metadata/md5-cache/dev-ruby/roadie-3.2.1-r1 b/metadata/md5-cache/dev-ruby/roadie-3.2.1-r1
index 16ce0c5540d4..5843cf212d5b 100644
--- a/metadata/md5-cache/dev-ruby/roadie-3.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/roadie-3.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/Mange/roadie/archive/v3.2.1.tar.gz -> roadie-3.2.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=34b00fb127db37bf68c47dd9b14dfe8d
diff --git a/metadata/md5-cache/dev-ruby/roadie-3.2.1-r2 b/metadata/md5-cache/dev-ruby/roadie-3.2.1-r2
new file mode 100644
index 000000000000..f803a47ee72b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/roadie-3.2.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby21] =dev-ruby/css_parser-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.4*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] ) ) 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_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_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_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Making HTML emails comfortable for the Rails rockstars
+EAPI=6
+HOMEPAGE=https://github.com/Mange/roadie
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby21] =dev-ruby/css_parser-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.4*[ruby_targets_ruby23] ) 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_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_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=https://github.com/Mange/roadie/archive/v3.2.1.tar.gz -> roadie-3.2.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a4bc4b88d8b648b434b95e12d07dddcf
diff --git a/metadata/md5-cache/dev-ruby/roadie-rails-1.1.1 b/metadata/md5-cache/dev-ruby/roadie-rails-1.1.1
index bce16edfc202..d211b20959e4 100644
--- a/metadata/md5-cache/dev-ruby/roadie-rails-1.1.1
+++ b/metadata/md5-cache/dev-ruby/roadie-rails-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Mange/roadie-rails/archive/v1.1.1.tar.gz -> roadie-rails-1.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=74a9c19ad73f780d75819677d8a09196
diff --git a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2 b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
index 4fd6df9fb1aa..2bb2f04712c8 100644
--- a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
+++ b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/robots-0.10.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=67ed7e6dc3262c4ad6a3a470a96d736c
diff --git a/metadata/md5-cache/dev-ruby/rouge-1.11.1-r1 b/metadata/md5-cache/dev-ruby/rouge-1.11.1-r1
index fbce9058e194..ba1246374ceb 100644
--- a/metadata/md5-cache/dev-ruby/rouge-1.11.1-r1
+++ b/metadata/md5-cache/dev-ruby/rouge-1.11.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jneen/rouge/archive/v1.11.1.tar.gz -> rouge-1.11.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0baa28f045fdd6a57a8eca84b4c4ea1c
diff --git a/metadata/md5-cache/dev-ruby/rouge-2.0.6 b/metadata/md5-cache/dev-ruby/rouge-2.0.6
index 4c906466dcd5..f3469399deae 100644
--- a/metadata/md5-cache/dev-ruby/rouge-2.0.6
+++ b/metadata/md5-cache/dev-ruby/rouge-2.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://rubygems/rouge-2.0.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=da9d2cb0cff2b122d80f80ee3a10b43f
diff --git a/metadata/md5-cache/dev-ruby/rouge-2.0.7 b/metadata/md5-cache/dev-ruby/rouge-2.0.7
index c956a71e4b77..98a02cd738fa 100644
--- a/metadata/md5-cache/dev-ruby/rouge-2.0.7
+++ b/metadata/md5-cache/dev-ruby/rouge-2.0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://rubygems/rouge-2.0.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1036011631c3bd03914eb07f5e5d9b43
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-0.10.1 b/metadata/md5-cache/dev-ruby/rqrcode-0.10.1
index 6462f2fde7a7..a1ef5537ce51 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-0.10.1
+++ b/metadata/md5-cache/dev-ruby/rqrcode-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/chunky_png:0[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rqrcode-0.10.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2d701d2d206b7ea4c356dce1ed846fa5
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-0.9.0 b/metadata/md5-cache/dev-ruby/rqrcode-0.9.0
index eb4ba0cd050c..74340ee52b85 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-0.9.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/chunky_png:0[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rqrcode-0.9.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=156a6755f87ea98e8cc2e89ad983afde
diff --git a/metadata/md5-cache/dev-ruby/rr-1.1.2-r1 b/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
index 4de113a716b1..5a4e9b597963 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v1.1.2.tar.gz -> rr-1.1.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c377ed365b4df0ed7eb0601c5a061339
diff --git a/metadata/md5-cache/dev-ruby/rr-1.2.0 b/metadata/md5-cache/dev-ruby/rr-1.2.0
index 20c8dd90fa3d..2449635a6bac 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rr-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v1.2.0.tar.gz -> rr-1.2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f74feb663363ca4a559d3c3c2a393e09
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
index 175044e1b264..48448233c3a5 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
@@ -10,5 +10,5 @@ RDEPEND=net-analyzer/rrdtool[graph] !!<net-analyzer/rrdtool-1.4.8-r1 ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=76873875d7f467d6eba90240f3665e25
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5
index 9182c9a50be7..0ded16606915 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=~net-analyzer/rrdtool-1.5.5[graph=] ruby_targets_ruby21? ( dev-lang/ruby
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a19cb99380e28db85f86b76d6254b678
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
index 3e2afbaf06c5..29e7cb8ed717 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=~net-analyzer/rrdtool-1.6.0[graph=] ruby_targets_ruby21? ( dev-lang/ruby
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8f4c191eaee43eedc175ccf7256342a9
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
index 00a7604a6949..af02bfd21a0c 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=~net-analyzer/rrdtool-1.7.0[graph=] ruby_targets_ruby21? ( dev-lang/ruby
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=17910981f28e4efdb394d5fca7cbed84
diff --git a/metadata/md5-cache/dev-ruby/rspec-1.3.2-r2 b/metadata/md5-cache/dev-ruby/rspec-1.3.2-r2
index 4096be85705f..e66494fa6976 100644
--- a/metadata/md5-cache/dev-ruby/rspec-1.3.2-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-1.3.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!<dev-ruby/rspec-rails-1.3.2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspec-1.3.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=041c103e3eece91c2645fe9ae8f8ee40
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1 b/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
index c070cc395da2..c180b007ab10 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby21] =
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/rspec-2.14.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7dc0e3713fbe7fa2e677d8e8934078c4
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-2.99.0
index f91dfe22b2eb..5f8e9030f69c 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-2.99.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby21] =
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/rspec-2.99.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6ce9ff823031ae96c49f2a1afd33696c
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.3.0 b/metadata/md5-cache/dev-ruby/rspec-3.3.0
index 5275a26f274d..3ce955c7195a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.3.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby21] =d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/rspec-3.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=44a2985ab0593105342164c6fa5717cd
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.4.0 b/metadata/md5-cache/dev-ruby/rspec-3.4.0
index 30fd1a8321e4..91bf3c01e0dd 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.4.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-core-3.4*[ruby_targets_ruby21] =d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/rspec-3.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1976572d258fc6346e47475f67d67036
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-3.5.0
index 19ee49987323..af85c8af973e 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-core-3.5*[ruby_targets_ruby21] =d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/rspec-3.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ebf103cb3bb2661d793d150d94b91715
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-3.6.0
index 190d94de52a9..f52c42a50a60 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby21] =d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/rspec-3.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3acd26ff4b5e2272b2dfcedb54b9b89d
diff --git a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2 b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2
index f4001a12a44b..21f7c714964c 100644
--- a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2
+++ b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-collection_matchers-1.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=311912d01e440c9144d7f53f0dbd653b
diff --git a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3 b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3
index fb3eb1e322a7..108b06c286ab 100644
--- a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3
+++ b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-collection_matchers-1.1.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=311912d01e440c9144d7f53f0dbd653b
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4 b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
index d6ee0b1255d2..e37d9251aaf2 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.14.8.tar.gz -> rspec-core-2.14.8-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d664035b6232293946d0fbd1b837f33f
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1
index 79b2ac5f8a46..6dff4460e656 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.2.tar.gz -> rspec-core-2.99.2-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=618b3a6a4e52e4803616732024c67c97
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
index 9af96664d259..e1b985d64786 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.2.tar.gz -> rspec-core-2.99.2-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6c9df3dc0955f4eb074856370d191ca2
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.3.2 b/metadata/md5-cache/dev-ruby/rspec-core-3.3.2
index a0d32983baf7..5b831fb60e4c 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.3.2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.3.2.tar.gz -> rspec-core-3.3.2-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8acd983087324ea8d5010a3e5c1efc76
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.3.2-r1 b/metadata/md5-cache/dev-ruby/rspec-core-3.3.2-r1
index ea11825e6278..7dc86ab5e1f5 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.3.2.tar.gz -> rspec-core-3.3.2-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c7e9007f992619d19cd3d9866ceda104
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.4.4 b/metadata/md5-cache/dev-ruby/rspec-core-3.4.4
index ffedaac4fc64..22b0f53a1019 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.4.4
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.4.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.4.4.tar.gz -> rspec-core-3.4.4-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0298f27f20919f07751663cf0fa4f1af
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.5.3 b/metadata/md5-cache/dev-ruby/rspec-core-3.5.3
index 48ed2c71f6f9..1e943b3c21ae 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.5.3
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.5.3.tar.gz -> rspec-core-3.5.3-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d005eb4665b48d93dc0930dec5f76615
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.5.4 b/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
index bbc86f3b2998..5fd247d69f34 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.5.4.tar.gz -> rspec-core-3.5.4-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=15d96fda00bffc7bd255775889b2003e
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-core-3.6.0
index 19fe21091f19..947b5ede7a05 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.6.0.tar.gz -> rspec-core-3.6.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f3404f417933203c2af5b47f4b51c01a
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
index 3bc61c91062d..3f3a5156f8a0 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.14.5.tar.gz -> rspec-expectations-2.14.5-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5671314fc127d0bc27adf28b01b34df6
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
index 421275d248d9..81b4d169b877 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.2.tar.gz -> rspec-expectations-2.99.2-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=082dd3f6c85ea504011afee36e097ec6
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.1
index ca4fbceb7295..cc77506652b4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] <d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.3.1.tar.gz -> rspec-expectations-3.3.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2905b6186f2d1b68cd6c4b8839e6309b
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.4.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.4.0
index 4d4d718e9ce9..05b09c2fbf35 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.4.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] <d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.4.0.tar.gz -> rspec-expectations-3.4.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7ba46a61a52d8ee3f84e9c49b56016be
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
index 6080e6a8c5ee..6733112c8c37 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] <d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.5.0.tar.gz -> rspec-expectations-3.5.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=703b9d680df56e787c89d81710f9c3fa
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.6.0
index 53161267fd09..cf30b0220e2d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] <d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.6.0.tar.gz -> rspec-expectations-3.6.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5efefed9d3864d36fdd95fd5cc4f5ec1
diff --git a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1 b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
index 81e27f662245..fe7421e1cee1 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-its-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a21025677d84669a0ea454c5a065c131
diff --git a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0 b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0
index 2b7a61ae300c..d6db9648d7e5 100644
--- a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-json_expectations-2.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ba86620d598b28e55abce9c8088a7bbc
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
index f540f3d849b7..bd8764654bc3 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.14.6.tar.gz -> rspec-mocks-2.14.6-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a37c20e7bf23ec260e614d78640d02c7
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
index b071d82f67fa..66ce12501e66 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.2.tar.gz -> rspec-mocks-2.99.2-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=301abdc14e916d6d235d8fd9e0d47ece
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.2
index 3910d1f5d17b..2bc01ab68977 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.3.2.tar.gz -> rspec-mocks-3.3.2-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=56cc179b4880fa8becbba6b5832686ff
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.0
index dfb34e9edeef..464bb1fffa3a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.4.0.tar.gz -> rspec-mocks-3.4.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=630588412a8b9e340f0494b7cf12f974
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.1
index d691e3db7c53..3d7ff0e33e0c 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.4.1.tar.gz -> rspec-mocks-3.4.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4f6d915b11a2b3db61bd1e6ea6302b46
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
index f0e08c8910e9..dfa92ec5bfd5 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.5.0.tar.gz -> rspec-mocks-3.5.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ee8981d393df23aec95f4e40f4f23ab0
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.6.0
index b25b48ec8ed1..3cf623f38d86 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.6.0.tar.gz -> rspec-mocks-3.6.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e22e719c69f4350cbf31168fb4819db2
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2 b/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
index d14e37c7dada..181bde3b8da8 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v2.14.2.tar.gz -> rspec-rails-2.14.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7506e5b2f2515f498aba51587cae78e5
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
index 280841bd4018..779a83996998 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v2.99.0.tar.gz -> rspec-rails-2.99.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3a61cd560a680b643736f2850633a485
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3 b/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3
index 0d6dbc27b704..c580a5cfda6c 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.3.3.tar.gz -> rspec-rails-3.3.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=98885f032caa3055d9d0861098191142
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.4.2 b/metadata/md5-cache/dev-ruby/rspec-rails-3.4.2
index eac6564abde0..5fc279b49aa3 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.4.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.4.2.tar.gz -> rspec-rails-3.4.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c4271afcd59ae650fc6dceaefc3bfbb0
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2 b/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2
index f5f51a7684f3..8e26d02e7d30 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.5.2.tar.gz -> rspec-rails-3.5.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=29d43e3cdf71cc0427fc4a920cf45885
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2-r1 b/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2-r1
index 3cf0b38f4e90..581152601b31 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.5.2.tar.gz -> rspec-rails-3.5.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=92b48e8f0a16aba654d816a0994fa579
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-rails-3.6.0
index 9aac370806fc..bcc39a4db72b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.6.0.tar.gz -> rspec-rails-3.6.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1e62248b6e030cac7a7795ce9a8ccc04
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.2 b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.2
index 180b7fea77cb..ae827f45e53b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.2
+++ b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspec-retry-0.5.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5dbb75f42482816c0de4553f480395c7
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.3 b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.3
index 72d799451d17..1f329471c6c0 100644
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.3
+++ b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspec-retry-0.5.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b7ce4c4d55ff7f7bc10d905b75276bfc
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.4 b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.4
index b78a8f0cc78b..99c7de6b2b65 100644
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.4
+++ b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspec-retry-0.5.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fa70b4755b9b33b9cb7f392e63e7b9b3
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.3.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.3.0
index ff5dfb06cc20..7ab2ee279556 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.3.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.3.0.tar.gz -> rspec-support-3.3.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9fa56d379f7758a00566c84d7aa547b6
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.4.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.4.0
index c5432fe83b2b..d1ea02641c34 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.4.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.4.0.tar.gz -> rspec-support-3.4.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4d5874a6b59204d537c1e65478b0ffcd
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.4.1 b/metadata/md5-cache/dev-ruby/rspec-support-3.4.1
index 12ca8fce7160..c014cfc47baa 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.4.1
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.4.1.tar.gz -> rspec-support-3.4.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ac3ea2cf847fb1e889f9127dff9ebb74
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
index c3fe5eae6d0a..f90c95bf0777 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.5.0.tar.gz -> rspec-support-3.5.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cca56cf8cc0f5a4f2e983cfe8d01f1f6
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.6.0
index 870efa2ee95c..1acc034cb7ec 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.6.0.tar.gz -> rspec-support-3.6.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=42d29bd8e974109d262aaf79725442e3
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.70.0 b/metadata/md5-cache/dev-ruby/rspectacular-0.70.0
index 8f992e85fb92..79ac23df6509 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.70.0
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.70.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby21] dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspectacular-0.70.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b0bc6d510544fa26790a42636cf314ea
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.70.7 b/metadata/md5-cache/dev-ruby/rspectacular-0.70.7
index 620eb8523a54..75bc378a8ef3 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.70.7
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.70.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby21] dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspectacular-0.70.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7b566b01850055ab2c24af845f57bc34
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-atk-3.0.8
index 9f2054948ae5..9a530f54bb48 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f053d41d7b8669635cd9d99a9f7789fe
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-atk-3.1.1
index 6981d501fbb1..d062e94d7b4c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=61d39429801b916adf8e8f89912db585
diff --git a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3 b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
index 33bf578f98ae..7672c6012bfe 100644
--- a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=app-admin/augeas-1.1.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=http://download.augeas.net/ruby/ruby-augeas-0.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4cb22db1ba88bc4b0e9bc6f95f06f9f5
diff --git a/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4 b/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4
index b943982a412e..b5fc9751c543 100644
--- a/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4
+++ b/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-beautify-0.97.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=02164bcceee78368a337d89e3e96552a
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.0.8
index 3bfc9cca9856..cf4030fdc205 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/cairo ruby_targets_ruby21? ( dev-ruby/rcairo[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b05af28a53edc6bce949d61468137203
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.1.1
index 6f3b538a02b5..83ec6963ae76 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/cairo ruby_targets_ruby21? ( dev-ruby/rcairo[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=87e0172ed3a4672058ed976b26b80c8a
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.0.8
index 06795bd2879a..fc341d6dfb82 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter ruby_targets_ruby21? ( >=dev-ruby/ruby-cairo-gobject-
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=ff16260977241c6ca88dab40f0b828d7
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.1.1
index b08c1ed0ea5a..164b6580ef92 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter ruby_targets_ruby21? ( >=dev-ruby/ruby-cairo-gobject-
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=af3ee8a1d1b57a05806de5bdb60f1701
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.1.1
index 9f05a5f1e70e..cd7e3f3f75f6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter[gtk] ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-3
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=2c475a3757a1882c750cc1010882230f
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.0.8
index 1ec1a1f814b3..e5c9760b1aa6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gst:* ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=d30b0bc9cf4bc62e5197960f60e1a756
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.1.1
index 808ef1343989..a60845c8d554 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gst:* ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=00c6787c98c8e4aec14699edc00800aa
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.0.8
index 2e2a94677051..0926e3d7fddd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gtk ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-3.
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=81fc38fa8b9704cf5ffa299b39090d36
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.1.1
index 94e4c7c34aea..51ff6868cc14 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby21? ( >=dev-ruby/ruby-clutt
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=4878e50a40fb283ee698865118964d53
diff --git a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4 b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
index 957d5f9881e7..df1c1ac50680 100644
--- a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
+++ b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=http://www.caliban.org/files/ruby/ruby-dict-0.9.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4a2218a973845c9ef2159162ccae0d95
diff --git a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8 b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
index 28cac898ee08..f011904c60e0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
@@ -10,5 +10,5 @@ RDEPEND=virtual/man ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/Flameeyes/ruby-elf/archive/1.0.8.tar.gz -> ruby-elf-1.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5ab2e3862d5dc06469179acec4f772e6
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.3 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.3
index 1d7e2f09420f..ef75128083df 100644
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.3
+++ b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/magic[ruby_targets_ruby21] ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/feed2imap/ruby-feedparser/archive/ruby_feedparser_0.9.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ac756dd5995009498138cc9306a7be57
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.4 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.4
index ca3f7b24babc..aa6acb3c0e06 100644
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.4
+++ b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/magic[ruby_targets_ruby21] ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/feed2imap/ruby-feedparser/archive/v0.9.4.tar.gz -> ruby-feedparser-0.9.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2bad9099bf348dc3e05e43f263910d97
diff --git a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1 b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1
index d45adc0596ac..4572842e9de6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1
+++ b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/file ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-filemagic-0.7.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e82846b72cf90451bcc47765c96f60fb
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.8
index 31c041e1ccbf..ffc08fca4de7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e8d36d05ddf4703920fcf161b484f3f8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.1.1
index 3050e8d59218..c491562b72cf 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=55745fae7874bf2d675b24f4ef240262
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.8
index c06f6e2defee..4170c5c6204d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6f141eca4080133013e3b27da3e2256f
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1
index 08837d1a1fb3..a9b243d5cf1e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=00e7fb125b4cab757b679f75ed85801e
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
index 4201dadee2dc..90c215c265b0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c505eb385f68c6f3fb951a4625f31b2c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
index 348c63b4cb0d..f0b7ad68b093 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=643d85d34f01efed25a20f549563d4c0
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.9 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.9
index 943f8150ce26..01339e8b4a3b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.9
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=16f4d64968eedb27fcce35c9661d17ef
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.1 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.1
index 24d7a68b0d1a..53ba74f51666 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=16f4d64968eedb27fcce35c9661d17ef
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.2 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.2
index ba48e68d7332..337b0f27f2e0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=49f334becefde3fbaae5cd366d19d3e3
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.0.8
index 6c2c4d25f76f..ae97347a827b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ee9ed57dd4f86a81f97f31210263e450
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1
index 8d29642b3489..09dfdfe160d9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=280aabcb877420151156b6dcf294bd91
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.0.8
index c333935e3eb7..25abe51228fa 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b0b5a12c30cc95f0362e689ead5f142a
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1
index 7d6c8770aeae..cb68d7cf3d12 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=37b10d016d1cb543c05dae96aa486035
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.0.8-r1 b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.0.8-r1
index 980f1198af08..f541b990e293 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.0.8-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.0.8-r1
@@ -9,5 +9,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gstreamer-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gtk-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-poppler-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-rsvg-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-vte-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-vte3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-webkit2-gtk-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gstreamer-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gtk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-poppler-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-rsvg-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-vte-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-vte3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-webkit2-gtk-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gstreamer-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gtk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-poppler-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-rsvg-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-vte-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-vte3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-webkit2-gtk-3.0.8[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ccfafac75276cfca6685c151a3c4a405
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.1.1
index d79060f568f3..50b70fc0bda7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.1.1
@@ -9,5 +9,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=615bfa9bfa187d4e32f55f140f27a6b9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.0.8
index 3624b0fca7de..faee9ada2bf0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby21? ( ~dev-ruby/ruby-gli
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d323e62eaa03fb127f4c5cb7ece3e7c9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.1.1
index 889510c3b33a..2869a4e3e584 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby21? ( ~dev-ruby/ruby-gli
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fcb2e2d574b82753e8af525c05122265
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.0.8
index bb02493ea299..d5bd7b8799fc 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=39b6b7bc8a6c80f031f55fd29eaa8fc1
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.1.1
index 97b70775a280..16170f2e8057 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=04feb9acef73d786ecb6f452cbea7cc9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.0.8
index ba56604c09ae..fed9deb46d5b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=7b6d20880e346f63696b38854ef45883
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.1
index e3cf67007c14..c700cfe5fa8a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=8f04542ba7ed560e1d6b25097a5b2934
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.0.8
index 96034571ae13..e5fce4f4960b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.0.8[ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=85ec3d166f42311ebced897bcb1f2ba5
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.1.1
index bfd660a789d7..f1161037251e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.1.1[ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=46c23e7f9855ed40110d691f6800680d
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.0.8
index 1d0dca28e800..9027cfd05b63 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk2-3
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=714a4151b12ecc597034eb6166859174
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.1.1
index 15bfd95852f2..40f9a8b427af 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk2-3
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=09b2a1db739dd522730e5a3b25ccbe07
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.8
index 70e31dff8543..a36476f2452d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-3
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=57bfe128facff567020ea413c546d3b1
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.1.1
index 53f9dec1e858..a498b62003cb 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-3
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=8a27d3fcbc591c93e409729d54e5988f
diff --git a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1 b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
index 9ce78157b9c8..5630eda62153 100644
--- a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-hmac-0.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f3a86986e6441135f88543ebf2857d77
diff --git a/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2 b/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2
index 75b7a78424f8..fec7fb2828e8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://gregoire.lejeune.free.fr/ruby-inifile_2.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=110d2551e6cb412a4e4974b742eb2145
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
index fd2da42c38d4..f9f47758bc64 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ldap-0.9.17.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d8af7dc3f612c81217f9a924c95ee0af
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.18 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.18
index b82db0335a36..91d325047c9d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.18
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ldap-0.9.18.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b66539ae15797b9265e2d3d3746c9d8b
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.19 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.19
index 7b566c48701b..27cb56c2b5ca 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.19
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.19
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ldap-0.9.19.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b66539ae15797b9265e2d3d3746c9d8b
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
index 93d79952f361..1b8a2db62d59 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/moumar/ruby-mp3info/archive/v0.8.10.tar.gz -> ruby-mp3info-0.8.10-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f25db65ef8681e54baa2d386c19e2503
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9
index c7b3eccd67d3..d026c3f5f1b4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/moumar/ruby-mp3info/archive/v0.8.9.tar.gz -> ruby-mp3info-0.8.9-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f25db65ef8681e54baa2d386c19e2503
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.14.0 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.14.0
index f87f594a90fb..1e2bd7625801 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.14.0
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-ldap-0.14.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6bc17ee83cf168952ee0f635a7e2d374
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.15.0 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.15.0
index 647efabef8fa..f81870c2841c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.15.0
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-ldap-0.15.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=889928bb0e6ebc3e3a43288f57166fcf
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.0 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.0
index cc5a75cde05c..f896c3569391 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.0
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-ldap-0.16.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=175de70a1213c4c3f4a01421c2696ae5
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8
index 4a51db6bbed8..91d8519567d1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8
@@ -10,5 +10,5 @@ RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby21? ( dev-lang/ruby:2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.1.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=922ac70a44a27f1afbf16cface837947
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.1 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.1
index 03508badd8ce..6fcd202d3872 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.1
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby21? ( dev-lang/ruby:2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5b4a7e9416952b35ae3178b503458927
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.2 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.2
index 9a5199416164..615b7caffddd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby21? ( dev-lang/ruby:2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5b4a7e9416952b35ae3178b503458927
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.3
index 1085e7e87c2d..c018b5f375e3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby21? ( dev-lang/ruby:2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.2.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=eb007c4136475d3badba7a89f08c4883
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997-r1 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997-r1
index 2a5160284703..11e92bb09c70 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99997.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2015f406e9ade168713c400040c0560c
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99998 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99998
index c5c9137fe78a..9269e3f8573c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99998
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99998
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99998.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=23830ddbdae4723006485c2f4103392e
diff --git a/metadata/md5-cache/dev-ruby/ruby-oembed-0.10.1 b/metadata/md5-cache/dev-ruby/ruby-oembed-0.10.1
index 752093abf6a1..756253b4f568 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oembed-0.10.1
+++ b/metadata/md5-cache/dev-ruby/ruby-oembed-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oembed-0.10.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8ab9d054ff51e5657e416111c08bd381
diff --git a/metadata/md5-cache/dev-ruby/ruby-oembed-0.12.0 b/metadata/md5-cache/dev-ruby/ruby-oembed-0.12.0
index 28f017d13bbc..12ac6e41939b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oembed-0.12.0
+++ b/metadata/md5-cache/dev-ruby/ruby-oembed-0.12.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oembed-0.12.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e7e16c9dc7120362d96bc4a4baf22b56
diff --git a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12 b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12
index 54f780345b6c..ddd3f44c64a6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12
+++ b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ole-1.2.12.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7aca6bfec73e9a3bae1573157b55c283
diff --git a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.1 b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.1
index 614673112190..8cc48164f600 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.1
+++ b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ole-1.2.12.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e42971de991a338f9b49a92d8902cf43
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
index b2f7d0792986..b14c5b23052b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby21? ( dev-lang/ruby:
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/opengl-0.9.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2efd5321f8df6a3003ee523e4a3be250
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2-r1 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2-r1
index 167d10b291eb..834d5b6e0ee3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby21? ( dev-lang/ruby:
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/opengl-0.9.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b6c2de1801a601334c21b3ab10ae9bcf
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0 b/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0
index dbe42e7ec4cb..973f3823f286 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/openid/ruby-openid/archive/v2.7.0.tar.gz -> ruby-openid-2.7.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6d7b920dc1f6ee67ddfe29733b52ad02
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-pango-3.0.8
index ba52040c5a74..aef6d72adb09 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c8c5c207fe2708e7d80e5d2eb8ff6ba6
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-pango-3.1.1
index 8cc8e23662ae..e26df0228fc6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9160c1efd75d59ab15f8f93434c9e969
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.8
index 456eb42d9a93..cc278ed93327 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[cairo] ruby_targets_ruby21? ( dev-ruby/ruby-gdkpixbuf2[
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0678b0cf89df37d0544772edd7cc55e7
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.1.1
index d365e5c679fb..8b4cbf0467fb 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[cairo] ruby_targets_ruby21? ( dev-ruby/ruby-gdkpixbuf2[
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ad87e5252d295b821db3a472ca812756
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-0.15.9 b/metadata/md5-cache/dev-ruby/ruby-prof-0.15.9
index b73e5e8e56e5..51652890b100 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-0.15.9
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-0.15.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/v0.15.9.tar.gz -> ruby-prof-0.15.9.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=354b83c4fbbaf4d39e3c5af281651701
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-0.16.2 b/metadata/md5-cache/dev-ruby/ruby-prof-0.16.2
index 9ef194d59125..421919eb2bf5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-0.16.2
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-0.16.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/v0.16.2.tar.gz -> ruby-prof-0.16.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f24cd31bbf02a26e820815517a90acaf
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
index f0e1b3c4a299..f8005be85856 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-1.4.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7792a6370aea90c926ed8de57e8fafc7
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5
index f55ac4861b0f..d024d364ed2c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-1.7.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d81765f37213a6ed7fce408e89b5e3fb
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.8.1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.8.1
index e6bf5494321d..f0c36335afce 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.8.1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-1.8.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a858d7dc8a75eba2eb8ff0cce82821c6
diff --git a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2 b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
index 82892e47831b..bd2a691643f5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-rc4-0.1.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4b4a556b1ea981e683bd9752d35dbb27
diff --git a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6 b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
index dd5d6aa6cf15..292e69780f4a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
+++ b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=http://0xcc.net/ruby-romkan/ruby-romkan-0.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b416286d735b3f4c664fcdbd8cbc29a8
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.0.8
index bdca1c22ce8e..063cd3c71386 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/librsvg-2.16.1 ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpi
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d7fd6238656150ae292367ed95d5420d
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.1.1
index 580f07514a3f..b7f9ff7a6046 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/librsvg-2.16.1 ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpi
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1e5fa94ad298c4918435cb97b2887c74
diff --git a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2 b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
index df58c1c3b14d..b12ce18db8df 100644
--- a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ohai/rubysdl/archive/rel-2-1-2.tar.gz -> ruby-sdl-2.1.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bb54405b5ec666981a45c1c9cf9e9a4e
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
index 872b5fb633d3..121ec7f38fc7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-shadow-2.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e72f8d1c30218e4aa15d55ea56086e94
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2
index 409a1961ac8e..0b77516c188e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-shout-2.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2551866bf8df72938cc264f07601db99
diff --git a/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r3 b/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r3
index f644fa9ddca1..cdfa8cea786f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r3
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libident sys-apps/tcp-wrappers ruby_targets_ruby21? ( dev-lang/
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://shugo.net/archive/ruby-tcpwrap/ruby-tcpwrap-0.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b0cab9b6d14c4198d7da42bbad79bc9c
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1
index a1b64a2342e9..e21c983802aa 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/arika/ruby-termios/archive/version_1_0_0.tar.gz -> ruby-termios-1.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=821d9099e0d7ad702af82f7208705712
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
index 16605632e411..546319a2c8d5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-termios-1.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=30e37b6757d4d1ad23b4b7c19939fe61
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-vte-3.0.8
index 37ccf4cb9ace..d5aca9147c56 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk2-3.0.
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c141e8f5592486526be6ab5516531afd
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-vte-3.1.1
index 09209b1da572..983c05c1d591 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk2-3.1.
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8e7e82c8f3700fb195a25e0d451dcca7
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.0.8-r1 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.0.8-r1
index 6013f00f91ed..05adbf874147 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-3.0.8-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-3.0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/vte:2.91 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=4272312fc0eecdc708cb351b42af8e1f
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1
index b5c6896cacb2..d3dd4af06f43 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/vte:2.91 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=26c06d3d424818595f86e5691f26b499
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.0.8
index 403650124f95..37b8a2f5d88c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:4 ruby_targets_ruby21? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=b4c6bca949857efb8451ca3edc9a3a19
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.1.1
index a273915692d5..44763b6af2bf 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:4 ruby_targets_ruby21? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=0fe00bca1a83007b3e50716d7c01eff8
diff --git a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3 b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3
index be19051b279b..e4fa3b9836b3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxslt-1.1.12 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-xslt-0.9.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7b13526d407e456c6b0fa580804bbcf6
diff --git a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2 b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
index c6698eba890d..7929d34c5b90 100644
--- a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-yadis-0.3.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=083fb81c14e89ed26e62ef8a59c23ddb
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.0 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.0
index eea9ecba36dc..37910f58abd2 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.0
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=94080c1d17eb2d5eb58480a5b027a6a1
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.1 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.1
index c5ff98d7b6fa..09b434579ec8 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.1
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d565883c52d73e1868e14eb026c0f1b9
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2
index dc1e6fca0899..d9e60c7cd9c1 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.3.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1d82e2d18065b3084714ed1cffba3c44
diff --git a/metadata/md5-cache/dev-ruby/ruby_dep-1.3.1 b/metadata/md5-cache/dev-ruby/ruby_dep-1.3.1
index 74e957722277..ba1e67102397 100644
--- a/metadata/md5-cache/dev-ruby/ruby_dep-1.3.1
+++ b/metadata/md5-cache/dev-ruby/ruby_dep-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/ruby_dep-1.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2ef07249fb7c57b50f944df7a659c5dc
diff --git a/metadata/md5-cache/dev-ruby/ruby_dep-1.4.0 b/metadata/md5-cache/dev-ruby/ruby_dep-1.4.0
index b4db8fa7a9f8..91b2f0c65441 100644
--- a/metadata/md5-cache/dev-ruby/ruby_dep-1.4.0
+++ b/metadata/md5-cache/dev-ruby/ruby_dep-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/ruby_dep-1.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=68ccdbc1e3dc8e3e1e67857d9b3a2b44
diff --git a/metadata/md5-cache/dev-ruby/ruby_dep-1.5.0 b/metadata/md5-cache/dev-ruby/ruby_dep-1.5.0
index 853652118700..2f4f55e366f2 100644
--- a/metadata/md5-cache/dev-ruby/ruby_dep-1.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby_dep-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/ruby_dep-1.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9ab91ac2fc7012b24062d18b5b46b07d
diff --git a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4 b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
index e227342fc37e..148f52bf5eac 100644
--- a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
+++ b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby_gntp-0.3.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6121b6ab226be619902c06d4a0978df8
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.2 b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.2
index dcad7944d753..ac55c97e043c 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.2
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.8.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3437a3dd69285056ca0b08873bcaaaca
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.3 b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.3
index b0d1a6a4b75b..3c3ed90c6f97 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.3
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.8.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=801cdb68ce50b5d2b9965767d63c2a3a
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.4 b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.4
index ecfb85f274a4..c900dfb58092 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.4
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.8.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9bbf8d1f4d7fdcbd2cb1a48004737357
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.9.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.9.0
index 1bb833f92331..825dc845aaa6 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.9.0
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.9.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3122594437481b86139dc678c4f034c7
diff --git a/metadata/md5-cache/dev-ruby/ruby_smb-0.0.12 b/metadata/md5-cache/dev-ruby/ruby_smb-0.0.12
index 9207a549d474..e94442b77d4e 100644
--- a/metadata/md5-cache/dev-ruby/ruby_smb-0.0.12
+++ b/metadata/md5-cache/dev-ruby/ruby_smb-0.0.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0.0.12
 SRC_URI=mirror://rubygems/ruby_smb-0.0.12.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a88028c262dccdca1767ff18fd3dfad1
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.2.5-r1 b/metadata/md5-cache/dev-ruby/rubygems-2.2.5-r1
index 4a1f78737245..e8d197572ddf 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.2.5-r1
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://production.cf.rubygems.org/rubygems/rubygems-2.2.5.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d5e3dc5625199c7159b089f44fa5d241
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.5.2 b/metadata/md5-cache/dev-ruby/rubygems-2.5.2
index 00573af98426..a6fd882ca6df 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.5.2
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.5.2
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.5.2.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fa026e35d6e57ba9d4c03ea3d7c8280d
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.6.11 b/metadata/md5-cache/dev-ruby/rubygems-2.6.11
index 6e10e1b0ad1a..29160f22fa84 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.6.11
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.6.11
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.6.11.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2f942031ebe8aad1e9638c11765400fc
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.6.12 b/metadata/md5-cache/dev-ruby/rubygems-2.6.12
index 0a8426ec3505..dbd2ed4f1e32 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.6.12
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.6.12
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.6.12.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=88c7f2d26d031550dc53d807f29b8254
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.6.8 b/metadata/md5-cache/dev-ruby/rubygems-2.6.8
index 6743159af9eb..e647e9f26873 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.6.8
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.6.8
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.6.8.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=363d9ee4fc7af3e102ff1254073f683c
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.6.9 b/metadata/md5-cache/dev-ruby/rubygems-2.6.9
index 4bcff6016e24..7c5fcd16e1a7 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.6.9
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.6.9
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.6.9.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=363d9ee4fc7af3e102ff1254073f683c
diff --git a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.1 b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.1
index 527dac9d275d..f0fe6db66dca 100644
--- a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.1
+++ b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubyntlm-0.6.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=855a20854ae4721bc4c9f0b6130f2717
diff --git a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.2 b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.2
index f1855f1998d4..fd54e0de888a 100644
--- a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.2
+++ b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubyntlm-0.6.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=221e007ab31809364f5ac5e80fd20267
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5 b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
index 48c320007bf3..9de23da71599 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubypants-0.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dbbed420df32635afd83b2cd3bf3b756
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.5.0 b/metadata/md5-cache/dev-ruby/rubypants-0.5.0
index 4114ae3c9e4c..ee4917428dde 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.5.0
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubypants-0.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=09ffc9a5cd72bc431a45f3ddbba54975
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.5.1 b/metadata/md5-cache/dev-ruby/rubypants-0.5.1
index eb959ae0db03..387b03d1811f 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.5.1
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubypants-0.5.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=09ffc9a5cd72bc431a45f3ddbba54975
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.6.0 b/metadata/md5-cache/dev-ruby/rubypants-0.6.0
index 641007704298..f18b99a81baf 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.6.0
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubypants-0.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a98b4912ff979799cfc51c89bce8f708
diff --git a/metadata/md5-cache/dev-ruby/rubytest-0.8.1 b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
index 429df2945fa3..0e8416cb2eb3 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-0.8.1
+++ b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/ansi[ruby_targets_ruby21] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubytest-0.8.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d92b026414353332f76cce6044a7a0f2
diff --git a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0 b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
index b45aec326d06..39bfd7bf6a4e 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
+++ b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/ansi[ruby_targets_ruby21] >=dev-ruby/rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubytest-cli-0.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9e24499dd07903ec06452aeef25e35b1
diff --git a/metadata/md5-cache/dev-ruby/rubytter-1.5.1 b/metadata/md5-cache/dev-ruby/rubytter-1.5.1
index 76aaf7bcc3e7..1ef9f4d2c02f 100644
--- a/metadata/md5-cache/dev-ruby/rubytter-1.5.1
+++ b/metadata/md5-cache/dev-ruby/rubytter-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby21] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubytter-1.5.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2be146db0ecce91658215878b13e1901
diff --git a/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r1 b/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r1
index 422f549aa789..edd02f8a78e9 100644
--- a/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.1.3:*[ruby_targets_ruby21] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubytter-1.5.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=86fdb99f76e09a80282eb1d12fa1be22
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.2.1 b/metadata/md5-cache/dev-ruby/rubyzip-1.2.1
index 60f746708b20..25fe581cd342 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.2.1
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.2.1.tar.gz -> rubyzip-1.2.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=90cd7351ba9974e8bf06507e3307cace
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
index 0948edba5948..554295fb0845 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/safe_yaml-1.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5b8722ae1bbc8b20ec21a9da25a055a3
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2
index 7cc7f9e073c6..d171a92c840e 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/safe_yaml-1.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f7c45e4f9dd4d2bdb129604d07b136a2
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r3 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r3
index 8e5f5cdbc268..833539fa2081 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r3
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/safe_yaml-1.0.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ae78bce8d6531cc182373cd676dedf23
diff --git a/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2 b/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2
index bf697fa42878..6c306c0a6b3c 100644
--- a/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2
+++ b/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/samuel-0.3.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=42dd72c9b04bc2f5ce8340add9cbb2c7
diff --git a/metadata/md5-cache/dev-ruby/sanitize-2.1.0 b/metadata/md5-cache/dev-ruby/sanitize-2.1.0
index 6cc1be93fb7a..41808f432d73 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-2.1.0
+++ b/metadata/md5-cache/dev-ruby/sanitize-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sanitize-2.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b56163d66ab08e248a15cb788bf86572
diff --git a/metadata/md5-cache/dev-ruby/sanitize-4.2.0 b/metadata/md5-cache/dev-ruby/sanitize-4.2.0
index 883c0e047572..107dcedd7131 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-4.2.0
+++ b/metadata/md5-cache/dev-ruby/sanitize-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby21] =dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=https://github.com/rgrove/sanitize/archive/v4.2.0.tar.gz -> sanitize-4.2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=03ff97d22f422bb253b1f3c87aed2553
diff --git a/metadata/md5-cache/dev-ruby/sanitize-4.3.0 b/metadata/md5-cache/dev-ruby/sanitize-4.3.0
index 834c7f69b32a..e9c53b83621b 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-4.3.0
+++ b/metadata/md5-cache/dev-ruby/sanitize-4.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby21] =dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=https://github.com/rgrove/sanitize/archive/v4.3.0.tar.gz -> sanitize-4.3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9f3949c86d159d6bbf965339e2e442d8
diff --git a/metadata/md5-cache/dev-ruby/sanitize-4.4.0 b/metadata/md5-cache/dev-ruby/sanitize-4.4.0
index 8d9c10757647..9db21767f770 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-4.4.0
+++ b/metadata/md5-cache/dev-ruby/sanitize-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby21] =dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=https://github.com/rgrove/sanitize/archive/v4.4.0.tar.gz -> sanitize-4.4.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9f3949c86d159d6bbf965339e2e442d8
diff --git a/metadata/md5-cache/dev-ruby/sass-3.2.19-r2 b/metadata/md5-cache/dev-ruby/sass-3.2.19-r2
index 3c40327f7ffd..b849cac85c37 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.2.19-r2
+++ b/metadata/md5-cache/dev-ruby/sass-3.2.19-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/listen-0.7.2:0[ruby_targets_ruby21] !!
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sass-3.2.19.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1c33282f1538e25529b3ccc61ef9524b
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.15 b/metadata/md5-cache/dev-ruby/sass-3.4.15
index 9b703af08f4f..b5add40e64a7 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.15
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.15
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby21] !!
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=3.4
 SRC_URI=mirror://rubygems/sass-3.4.15.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f0c55a5c911cf7fb836e27891195c669
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.23 b/metadata/md5-cache/dev-ruby/sass-3.4.23
index 99b8f3951b79..133c7872f1ab 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.23
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.23
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby21] !!
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3.4
 SRC_URI=mirror://rubygems/sass-3.4.23.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=29d5f82d17524f4b632a7a1836f63382
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.24 b/metadata/md5-cache/dev-ruby/sass-3.4.24
index 36fc34c190b4..77e5f9f3743b 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.24
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.24
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby21] !!
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3.4
 SRC_URI=mirror://rubygems/sass-3.4.24.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=54056d81fe11a6bdf8b637ab53392699
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-4.0.5 b/metadata/md5-cache/dev-ruby/sass-rails-4.0.5
index 07c159b34aca..8e4fb0c266cc 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-4.0.5
+++ b/metadata/md5-cache/dev-ruby/sass-rails-4.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4.0
 SRC_URI=mirror://rubygems/sass-rails-4.0.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4efa80ece70b99a53128626e58e85344
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.4-r1 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.4-r1
index e495e12d18f1..909f9ef7d6c3 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.4.tar.gz -> sass-rails-5.0.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b7e1eb0c75eefae2773a4b415356d22c
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5
index 5e7ced27fbcf..77f671c34c0d 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.5.tar.gz -> sass-rails-5.0.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3bb4e79c908ac798bd84f63b25d22330
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r1 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r1
index 9677c12938e6..bc5aba4a139a 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.5.tar.gz -> sass-rails-5.0.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dbd16df933ab1feba044c2fab5d6e735
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r2 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r2
index 7a40adffa13a..8396218815d2 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r2
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.5.tar.gz -> sass-rails-5.0.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c5113d995fd40701af7be747f65b3e28
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.6 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.6
index 703561d8784d..80d529087c7d 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.6
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.6.tar.gz -> sass-rails-5.0.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=24ee16f5069e1e4205dfaa6191df6f45
diff --git a/metadata/md5-cache/dev-ruby/sawyer-0.7.0 b/metadata/md5-cache/dev-ruby/sawyer-0.7.0
index 49920c6e95f6..664eed040ff2 100644
--- a/metadata/md5-cache/dev-ruby/sawyer-0.7.0
+++ b/metadata/md5-cache/dev-ruby/sawyer-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( <dev-ruby/faraday-0.10[ruby_targets_ruby21] <dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sawyer-0.7.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=490447626b454f8f2436648ea2630fd6
diff --git a/metadata/md5-cache/dev-ruby/sawyer-0.7.0-r1 b/metadata/md5-cache/dev-ruby/sawyer-0.7.0-r1
index 60100fa54efe..cf824814dd54 100644
--- a/metadata/md5-cache/dev-ruby/sawyer-0.7.0-r1
+++ b/metadata/md5-cache/dev-ruby/sawyer-0.7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( <dev-ruby/faraday-0.10[ruby_targets_ruby21] <dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sawyer-0.7.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=621b056ee5a976c937d3b7e16f516afe
diff --git a/metadata/md5-cache/dev-ruby/sawyer-0.8.0 b/metadata/md5-cache/dev-ruby/sawyer-0.8.0
index f93c868b2c7c..d4f6f2b2260c 100644
--- a/metadata/md5-cache/dev-ruby/sawyer-0.8.0
+++ b/metadata/md5-cache/dev-ruby/sawyer-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( <dev-ruby/faraday-0.10[ruby_targets_ruby21] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sawyer-0.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c812a2b9018dabb31a4e5beecda82480
diff --git a/metadata/md5-cache/dev-ruby/sawyer-0.8.1 b/metadata/md5-cache/dev-ruby/sawyer-0.8.1
index d24f5bfb751a..291ece30a95c 100644
--- a/metadata/md5-cache/dev-ruby/sawyer-0.8.1
+++ b/metadata/md5-cache/dev-ruby/sawyer-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( <dev-ruby/faraday-1.0[ruby_targets_ruby21] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sawyer-0.8.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3e303cab958ec1f51b5ee3d9c0186ad1
diff --git a/metadata/md5-cache/dev-ruby/sdoc-0.4.1 b/metadata/md5-cache/dev-ruby/sdoc-0.4.1
index 98343d98f91a..3bc82822248c 100644
--- a/metadata/md5-cache/dev-ruby/sdoc-0.4.1
+++ b/metadata/md5-cache/dev-ruby/sdoc-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby21] =dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sdoc-0.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2ec794fd2c697ad7561e453493125d7d
diff --git a/metadata/md5-cache/dev-ruby/sdoc-0.4.2 b/metadata/md5-cache/dev-ruby/sdoc-0.4.2
index 9a5b449c239c..7a1a44b33349 100644
--- a/metadata/md5-cache/dev-ruby/sdoc-0.4.2
+++ b/metadata/md5-cache/dev-ruby/sdoc-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby21] =dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sdoc-0.4.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2ec794fd2c697ad7561e453493125d7d
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.6 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.6
index 2a9d2586ebc3..55db2bfdd84d 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.3.6
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/mbleigh/seed-fu/archive/v.2.3.6.tar.gz -> seed-fu-2.3.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4bd9f49482c98e4316bd324884a88553
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.53.4-r1 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.53.4-r1
index f2b946b04606..5f1822b3ebc1 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.53.4-r1
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.53.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/selenium-webdriver-2.53.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=81b4be5d1785a49f411ab02021b68e6f
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.0.8 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.0.8
index 5599e49744b0..d95d3dd605b3 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.0.8
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.0.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4cef6faab64da716d25a16974e41fe78
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.1.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.1.0
index 0e0ce8152e6c..2b4378b26376 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.1.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4cef6faab64da716d25a16974e41fe78
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.2.2 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.2.2
index 021f388e3420..318f5a7b8e08 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.2.2
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4cef6faab64da716d25a16974e41fe78
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.3.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.3.0
index 9b6af9b719d4..7efa9d840596 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.3.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4cef6faab64da716d25a16974e41fe78
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.0
index 7ab11e190946..b698896c8064 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1d9d3d27c2892592a83f89f2c5abe085
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-0.1.3 b/metadata/md5-cache/dev-ruby/semantic_puppet-0.1.3
index 4028ab90067c..e8c387392fa3 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-0.1.3
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/semantic_puppet-0.1.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=19bfa0d833618223c554e0a86a51172e
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.1 b/metadata/md5-cache/dev-ruby/serialport-1.3.1
index 7121301d7725..e21a9d7f4b99 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.1
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/serialport-1.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5a82d6016e86b4b3bc896f00b8fdb09e
diff --git a/metadata/md5-cache/dev-ruby/session-3.1.2 b/metadata/md5-cache/dev-ruby/session-3.1.2
index 473b4d04ac17..ddc3cd3964b1 100644
--- a/metadata/md5-cache/dev-ruby/session-3.1.2
+++ b/metadata/md5-cache/dev-ruby/session-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/session-3.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0b28cca934e4ac1c41b46e41be960af5
diff --git a/metadata/md5-cache/dev-ruby/session-3.2.0 b/metadata/md5-cache/dev-ruby/session-3.2.0
index 41a00f8c2e24..aa09dafc5a9b 100644
--- a/metadata/md5-cache/dev-ruby/session-3.2.0
+++ b/metadata/md5-cache/dev-ruby/session-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/session-3.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=57e28d8bc5afcb1f2bcbde2bada667e4
diff --git a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9 b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
index b5f6075b4e5c..f53544a1101c 100644
--- a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
+++ b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/settingslogic-2.0.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=25ae44c0cbb3efc2720062dda3c2caa2
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0
index 8774d89d9564..e294186a57b6 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.7.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4148ee20013c0926916b34bb73647e20
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.8.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.8.0
index b7933e698c1c..52bcedb86224 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.8.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=95efa1b7eef0034a088b6626dcfe0a09
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.9.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.9.0
index e846795d9e0b..09b5bf393a7a 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.9.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.9.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5751fb00d27ed1b4ddf859a79bf90997
diff --git a/metadata/md5-cache/dev-ruby/sfl-2.2-r1 b/metadata/md5-cache/dev-ruby/sfl-2.2-r1
index 146186a0a382..88dcf94ad10a 100644
--- a/metadata/md5-cache/dev-ruby/sfl-2.2-r1
+++ b/metadata/md5-cache/dev-ruby/sfl-2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sfl-2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=83fd84635c4c3b74a77a8b30cb573b93
diff --git a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2 b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
index 8c01c13b7058..af6d6cd945da 100644
--- a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/shorturl-1.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=df60d03436bf1f1a110567f071fc63f4
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9.1 b/metadata/md5-cache/dev-ruby/shotgun-0.9.1
index e135bd745ad9..26cbff8681fa 100644
--- a/metadata/md5-cache/dev-ruby/shotgun-0.9.1
+++ b/metadata/md5-cache/dev-ruby/shotgun-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack[ruby_targets_ruby21] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/shotgun-0.9.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0c4a4c116848d4d08ced74a3910cda9f
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9.2 b/metadata/md5-cache/dev-ruby/shotgun-0.9.2
index 41b216461bec..c0b65e36891b 100644
--- a/metadata/md5-cache/dev-ruby/shotgun-0.9.2
+++ b/metadata/md5-cache/dev-ruby/shotgun-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/shotgun-0.9.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2d132931f5efa23b9812bdbaea450ba0
diff --git a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2 b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
index ae64297ac178..819ad1f78aaf 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/shoulda/tarball/v2.11.3 -> shoulda-2.11.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e7737585150e5121a2749b1bca4e6b18
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2 b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
index 9c9a970e5940..a56275549627 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.5.0.tar.gz -> shoulda-3.5.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=982751ef6d528f98feb82435aedde0b0
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3 b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3
index a7bfc80e8605..a25290670e12 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.5.0.tar.gz -> shoulda-3.5.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=441a20ffa855b6388d2548fbcdce95e2
diff --git a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.1 b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.1
index ca4d714570a0..d33524b37d19 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.1
+++ b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/shoulda-context-1.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cdc6f8d6dd1e376f2df312f110966215
diff --git a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2 b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2
index 83964ed36608..605048fdd992 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2
+++ b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/shoulda-context-1.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=948eb5e19855fbc7b05ad516ee5da2c8
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0
index 954d556a3184..1b32ae8c827b 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/shoulda-matchers-2.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6c1bc32690da80d17f81f640085f20a0
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0-r1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0-r1
index 3c1d2902b3c9..265aa63dd8b8 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/shoulda-matchers-2.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2e3a9e1aa267ff86d31f40a9f21073bc
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.0
index 638ebfe0775c..14f15865509a 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/shoulda-matchers-3.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=33cb685c38b948bbc83c1532b1ea35fd
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1
index 466a3e783a10..c129736ad74f 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/shoulda-matchers-3.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=33cb685c38b948bbc83c1532b1ea35fd
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1-r1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1-r1
index 94c64e9fc83d..49c9e8cb47e9 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/shoulda-matchers-3.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe0970d7dbac7b682c56482842ae5a4d
diff --git a/metadata/md5-cache/dev-ruby/sigar-0.7.3 b/metadata/md5-cache/dev-ruby/sigar-0.7.3
index 581d438a575c..311771c28d41 100644
--- a/metadata/md5-cache/dev-ruby/sigar-0.7.3
+++ b/metadata/md5-cache/dev-ruby/sigar-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sigar-0.7.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f617354410bc519718ce334b6ac775e3
diff --git a/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1 b/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1
index 51e711f182e4..f43146aa497e 100644
--- a/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/simple-rss-1.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=12fa2a722b87a25f4f0475cd8677250c
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1 b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
index a486f2f94d2b..81665911cdb3 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/laserlemon/simple_oauth/archive/v0.3.1.tar.gz -> simple_oauth-0.3.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e441c0f071c156daf2f7ec117c69d361
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.11.2 b/metadata/md5-cache/dev-ruby/simplecov-0.11.2
index d1763ebc4712..e3fce60a0442 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.11.2
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.11.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby21] de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-0.11.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dacfe8cdd946b59b17a23899a61f041c
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.12.0 b/metadata/md5-cache/dev-ruby/simplecov-0.12.0
index 107e30c6329e..7c19a94b1c6a 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.12.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.12.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.8[ruby_targets_ruby21] <dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-0.12.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=60fab6af00d1576e14c7b260874a37bd
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.13.0 b/metadata/md5-cache/dev-ruby/simplecov-0.13.0
index e9983310b035..9980cf5620cd 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.13.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.13.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby21] <dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-0.13.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=beba26760782ee2a6d34800079e7aa09
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.14.0 b/metadata/md5-cache/dev-ruby/simplecov-0.14.0
index f2d64e8288c4..ecf8e352cab3 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.14.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby21] <dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-0.14.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=beba26760782ee2a6d34800079e7aa09
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.14.1 b/metadata/md5-cache/dev-ruby/simplecov-0.14.1
index 1d706f8a8fd0..1f5a2ca5269a 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.14.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.14.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby21] <dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-0.14.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=beba26760782ee2a6d34800079e7aa09
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.0 b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.0
index da8b287a87e7..4a84859bc3f3 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.10
 SRC_URI=mirror://rubygems/simplecov-html-0.10.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c64b7b4b457da2452bb26b77fac91c71
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.1 b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.1
index e7f8ec762c55..96189e2f0c5e 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.10
 SRC_URI=mirror://rubygems/simplecov-html-0.10.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=96c4bce7d02946ee6c2df98669fcaae2
diff --git a/metadata/md5-cache/dev-ruby/sinatra-1.4.7 b/metadata/md5-cache/dev-ruby/sinatra-1.4.7
index 7f910b7fcb44..cb9a1ec55cc9 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-1.4.7
+++ b/metadata/md5-cache/dev-ruby/sinatra-1.4.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rack-1*:*[ruby_targets_ruby21] >=dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sinatra-1.4.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=36a8dab83e37ca07748359af78c6f43e
diff --git a/metadata/md5-cache/dev-ruby/six-0.2.0 b/metadata/md5-cache/dev-ruby/six-0.2.0
index 2fa55270f2d2..90c59539a3ad 100644
--- a/metadata/md5-cache/dev-ruby/six-0.2.0
+++ b/metadata/md5-cache/dev-ruby/six-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/randx/six/archive/v0.2.0.tar.gz -> six-0.2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b89ec959d09c58ed20f73b7d777d4649
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.7-r1 b/metadata/md5-cache/dev-ruby/slim-3.0.7-r1
index 55d0e20f1574..e80fca669a34 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.7-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby21] <dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/slim-3.0.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2437a6e93304f87371beaef24eb8c5b7
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.8 b/metadata/md5-cache/dev-ruby/slim-3.0.8
index 2f284ee6a68e..109bf8f2e024 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.8
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby21] <dev
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/slim-3.0.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6e56758647d0760216dcc1b001533bf6
diff --git a/metadata/md5-cache/dev-ruby/slop-3.6.0 b/metadata/md5-cache/dev-ruby/slop-3.6.0
index f2859fb5dfb0..685a66307489 100644
--- a/metadata/md5-cache/dev-ruby/slop-3.6.0
+++ b/metadata/md5-cache/dev-ruby/slop-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/injekt/slop/archive/v3.6.0.tar.gz -> slop-3.6.0.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ca3fea8ac352ff908f4649a3805d94a7
diff --git a/metadata/md5-cache/dev-ruby/slop-4.4.1 b/metadata/md5-cache/dev-ruby/slop-4.4.1
index f126e84a7d73..2b222057ad2e 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.4.1
+++ b/metadata/md5-cache/dev-ruby/slop-4.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.4.1.tar.gz -> slop-4.4.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=412f084a5ae200b6d1f74df93e7f5ce1
diff --git a/metadata/md5-cache/dev-ruby/slop-4.4.3 b/metadata/md5-cache/dev-ruby/slop-4.4.3
index 388a7eecf87f..343d3f6db71f 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.4.3
+++ b/metadata/md5-cache/dev-ruby/slop-4.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.4.3.tar.gz -> slop-4.4.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c3f092ecbe11b8897179b4faee845300
diff --git a/metadata/md5-cache/dev-ruby/slop-4.5.0 b/metadata/md5-cache/dev-ruby/slop-4.5.0
index e241a9487bc2..0ebb621bf020 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.5.0
+++ b/metadata/md5-cache/dev-ruby/slop-4.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.5.0.tar.gz -> slop-4.5.0.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c3f092ecbe11b8897179b4faee845300
diff --git a/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1 b/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1
index 69efa30da8e6..fae75f6b69aa 100644
--- a/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/snmp-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=17b0bfb6d4ddaccbb213bec1578b80b2
diff --git a/metadata/md5-cache/dev-ruby/source_map-3.0.1 b/metadata/md5-cache/dev-ruby/source_map-3.0.1
index 6d024c240271..dcb6140a709f 100644
--- a/metadata/md5-cache/dev-ruby/source_map-3.0.1
+++ b/metadata/md5-cache/dev-ruby/source_map-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/source_map-3.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e2d6e8b075be662e84e610dcb84e0200
diff --git a/metadata/md5-cache/dev-ruby/sourcemap-0.1.1 b/metadata/md5-cache/dev-ruby/sourcemap-0.1.1
index 6ab430b3a280..fbfcf9f0b550 100644
--- a/metadata/md5-cache/dev-ruby/sourcemap-0.1.1
+++ b/metadata/md5-cache/dev-ruby/sourcemap-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/sourcemap-0.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9168a72d89ab8a5bb948c1db30de7b31
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
index 44e4cdff3e36..10c24cfe193e 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
@@ -10,5 +10,5 @@ RDEPEND=dev-ruby/rmagick ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sparklines-0.5.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5f76d380bc220b892a04331d72b9ae7c
diff --git a/metadata/md5-cache/dev-ruby/spork-0.9.2-r2 b/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
index 884f025ffa4a..d0d76d89d892 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
+++ b/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/spork-0.9.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=180aa73657c7bc230fcd2ec05b045289
diff --git a/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9 b/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9
index 8cf04b071426..db573bc95310 100644
--- a/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9
+++ b/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby21] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/spreadsheet-0.6.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe112d638261bb4b4ab91d6f65ecb5a1
diff --git a/metadata/md5-cache/dev-ruby/spring-1.6.4 b/metadata/md5-cache/dev-ruby/spring-1.6.4
index 07d5ac06460f..09204569b930 100644
--- a/metadata/md5-cache/dev-ruby/spring-1.6.4
+++ b/metadata/md5-cache/dev-ruby/spring-1.6.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v1.6.4.tar.gz -> spring-1.6.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dcca1c2c088307f02320fbf62a1672e6
diff --git a/metadata/md5-cache/dev-ruby/spring-1.7.1 b/metadata/md5-cache/dev-ruby/spring-1.7.1
index fe3541f833e7..adf90a1096a8 100644
--- a/metadata/md5-cache/dev-ruby/spring-1.7.1
+++ b/metadata/md5-cache/dev-ruby/spring-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v1.7.1.tar.gz -> spring-1.7.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dcca1c2c088307f02320fbf62a1672e6
diff --git a/metadata/md5-cache/dev-ruby/spring-1.7.2 b/metadata/md5-cache/dev-ruby/spring-1.7.2
index 4d694966a6a4..d185d227429a 100644
--- a/metadata/md5-cache/dev-ruby/spring-1.7.2
+++ b/metadata/md5-cache/dev-ruby/spring-1.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v1.7.2.tar.gz -> spring-1.7.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=73b72a8c8b8c244a29e1dce8d0a5799c
diff --git a/metadata/md5-cache/dev-ruby/spring-2.0.0 b/metadata/md5-cache/dev-ruby/spring-2.0.0
index 98e51185b285..f892e59b4474 100644
--- a/metadata/md5-cache/dev-ruby/spring-2.0.0
+++ b/metadata/md5-cache/dev-ruby/spring-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v2.0.0.tar.gz -> spring-2.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d22953e7a2417bf4948d9dfba80329c4
diff --git a/metadata/md5-cache/dev-ruby/spring-2.0.1 b/metadata/md5-cache/dev-ruby/spring-2.0.1
index ca9dc0f3901b..cf430a6f1ad4 100644
--- a/metadata/md5-cache/dev-ruby/spring-2.0.1
+++ b/metadata/md5-cache/dev-ruby/spring-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v2.0.1.tar.gz -> spring-2.0.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=52d2a5977cfb466ebc41fdf1ff2822e2
diff --git a/metadata/md5-cache/dev-ruby/sprockets-2.11.3 b/metadata/md5-cache/dev-ruby/sprockets-2.11.3
index aa90cc3afa79..ccd253f41724 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-2.11.3
+++ b/metadata/md5-cache/dev-ruby/sprockets-2.11.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/hike-1*[ruby_targets_ruby21] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=2.11
 SRC_URI=https://github.com/sstephenson/sprockets/archive/v2.11.3.tar.gz -> sprockets-2.11.3-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1f99562e99536a0a98eea4fd6546f79b
diff --git a/metadata/md5-cache/dev-ruby/sprockets-2.12.3-r1 b/metadata/md5-cache/dev-ruby/sprockets-2.12.3-r1
index 61f9cb9cd931..9d24e7946897 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-2.12.3-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-2.12.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/hike-1*:0[ruby_targets_ruby21] >=dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/sstephenson/sprockets/archive/v2.12.3.tar.gz -> sprockets-2.12.3-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=61039d84cfb350eb30b64c78500eb303
diff --git a/metadata/md5-cache/dev-ruby/sprockets-2.2.3 b/metadata/md5-cache/dev-ruby/sprockets-2.2.3
index 40d84d6d07b5..699bdfb24800 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-2.2.3
+++ b/metadata/md5-cache/dev-ruby/sprockets-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/hike-1.2:0[ruby_targets_ruby21] =dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=2.2
 SRC_URI=https://github.com/sstephenson/sprockets/archive/v2.2.3.tar.gz -> sprockets-2.2.3-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bfd2b30c25034f251bc92eb585e18754
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.4.1 b/metadata/md5-cache/dev-ruby/sprockets-3.4.1
index 422c307d116a..02cf454428b4 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.4.1
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rack-1*:*[ruby_targets_ruby21] !!<dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.4.1.tar.gz -> sprockets-3.4.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=74fcb69ff2646ce152eb28a535623aa7
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.5.2 b/metadata/md5-cache/dev-ruby/sprockets-3.5.2
index 138461eaae10..27f0877bbfc3 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.5.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] =
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.5.2.tar.gz -> sprockets-3.5.2-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9acb322823b7ae59e2a0a185b1e4fad3
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.6.3 b/metadata/md5-cache/dev-ruby/sprockets-3.6.3
index 3a08b4510bd9..de176799d8aa 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.6.3
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.6.3.tar.gz -> sprockets-3.6.3-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=611cab020aa1154a3f9bf274dade6c5d
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.0 b/metadata/md5-cache/dev-ruby/sprockets-3.7.0
index c92a6d894876..2d3db566d683 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.7.0.tar.gz -> sprockets-3.7.0-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=611cab020aa1154a3f9bf274dade6c5d
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.1 b/metadata/md5-cache/dev-ruby/sprockets-3.7.1
index 634328bb8a53..97a2df0e8455 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.1
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.7.1.tar.gz -> sprockets-3.7.1-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9acaa3e55ebabff9db2e71b04183b1a8
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.0.0 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.0.0
index a22891ed8ac1..692ce4ed59c6 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.0.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-3.0[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=2.0
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.0.0.tar.gz -> sprockets-rails-2.0.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1529090a4afc44eb014f4dcf01c89974
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.1.3 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.1.3
index 574664b7a30c..768232c2e77d 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.1.3
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-3.0[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=2.1
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.1.3.tar.gz -> sprockets-rails-2.1.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1529090a4afc44eb014f4dcf01c89974
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.4 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.4
index 4f4a4dc83669..3b22e60e7221 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.4
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-3.0[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=2.2
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.2.4.tar.gz -> sprockets-rails-2.2.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1529090a4afc44eb014f4dcf01c89974
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3-r1 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3-r1
index 7de4f24c9fc3..cf6de0405379 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2.3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.3.3.tar.gz -> sprockets-rails-2.3.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4044362cacb614e98646609e34f13aed
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4
index e05521c461ab..9055c2511807 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.0.4.tar.gz -> sprockets-rails-3.0.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a87688907e6d1fbb7fa94c65905bab4a
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4-r1 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4-r1
index 90cf5458245e..20302ce8d7fa 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.0.4.tar.gz -> sprockets-rails-3.0.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0327021202c90e8ca97d0a122e5114ee
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.1.1 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.1.1
index 5661179edb8f..0a5256e5c785 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.1.1
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.1.1.tar.gz -> sprockets-rails-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0327021202c90e8ca97d0a122e5114ee
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0
index 82e4e39d1844..3ca6f9d312ea 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.2.0.tar.gz -> sprockets-rails-3.2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6096540a3c5e0dc8487cd25682d8374e
diff --git a/metadata/md5-cache/dev-ruby/spy-0.4.2 b/metadata/md5-cache/dev-ruby/spy-0.4.2
index 0d7bafb70149..7f3fc0421d80 100644
--- a/metadata/md5-cache/dev-ruby/spy-0.4.2
+++ b/metadata/md5-cache/dev-ruby/spy-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/spy-0.4.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a82cacdc50a75084b507c586101b2e7b
diff --git a/metadata/md5-cache/dev-ruby/spy-0.4.3 b/metadata/md5-cache/dev-ruby/spy-0.4.3
index 740fa308399a..63d77c1cc149 100644
--- a/metadata/md5-cache/dev-ruby/spy-0.4.3
+++ b/metadata/md5-cache/dev-ruby/spy-0.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/spy-0.4.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a82cacdc50a75084b507c586101b2e7b
diff --git a/metadata/md5-cache/dev-ruby/spy-0.4.5 b/metadata/md5-cache/dev-ruby/spy-0.4.5
index 4f7bdd1a3d0d..644e518a4191 100644
--- a/metadata/md5-cache/dev-ruby/spy-0.4.5
+++ b/metadata/md5-cache/dev-ruby/spy-0.4.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/spy-0.4.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ed712e45fb86ef73da5138634ae2bdbf
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.11 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
index 405e903646a1..5b38a03e6713 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sqlite3-1.3.11.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6a296a83b97319abf4e9bb3839fdfa36
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.12 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.12
index 512b0e848b5a..f81c83576684 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.12
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sqlite3-1.3.12.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=58583aea789300af56fbc87f45e6a3d7
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.13 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.13
index ccae774dd228..6941d0562c58 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.13
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.13
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sqlite3-1.3.13.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0bcdb70e001117906ff2afe20b7f04de
diff --git a/metadata/md5-cache/dev-ruby/sshkey-1.8.0 b/metadata/md5-cache/dev-ruby/sshkey-1.8.0
index 911c6d61a137..1e6f36eba28f 100644
--- a/metadata/md5-cache/dev-ruby/sshkey-1.8.0
+++ b/metadata/md5-cache/dev-ruby/sshkey-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/sshkey-1.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ca3c182a24041f8ad71674756eac7e93
diff --git a/metadata/md5-cache/dev-ruby/sshkey-1.9.0 b/metadata/md5-cache/dev-ruby/sshkey-1.9.0
index 95984874c8bc..b6de2902af70 100644
--- a/metadata/md5-cache/dev-ruby/sshkey-1.9.0
+++ b/metadata/md5-cache/dev-ruby/sshkey-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/sshkey-1.9.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5a83ef18d3b31de297092eb4fe958566
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.11.4 b/metadata/md5-cache/dev-ruby/sshkit-1.11.4
index fa4ae0ede3d0..ced60f11bc86 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.11.4
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.11.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sshkit-1.11.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5215a9cfe1a2f4ae33681ce02d80d12b
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.11.5 b/metadata/md5-cache/dev-ruby/sshkit-1.11.5
index 668f986e779f..48671bfb157f 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.11.5
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.11.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sshkit-1.11.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6568eb3c32aa8596ffa317fb9938b4de
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.12.0 b/metadata/md5-cache/dev-ruby/sshkit-1.12.0
index 412e3b100fa7..cdfb6841ab8a 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.12.0
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sshkit-1.12.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=eb44c20edaf0993021b1adc18c08787c
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.13.1 b/metadata/md5-cache/dev-ruby/sshkit-1.13.1
index 5f429fb3bb2f..4fb222163eac 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.13.1
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/sshkit-1.13.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=eb44c20edaf0993021b1adc18c08787c
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.6.0 b/metadata/md5-cache/dev-ruby/stamp-0.6.0
index a60ee1acc69c..8f98a9976a13 100644
--- a/metadata/md5-cache/dev-ruby/stamp-0.6.0
+++ b/metadata/md5-cache/dev-ruby/stamp-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/jeremyw/stamp/archive/v0.6.0.tar.gz -> stamp-0.6.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=73877c773dda4a5437e2e43717ddd7a8
diff --git a/metadata/md5-cache/dev-ruby/state_machine-1.2.0 b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
index e3fc289ef643..34fe1ca867fe 100644
--- a/metadata/md5-cache/dev-ruby/state_machine-1.2.0
+++ b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/state_machine-1.2.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8872405c825721e64bbbffb009dc9b59
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.3.4 b/metadata/md5-cache/dev-ruby/stomp-1.3.4
index a387069993a3..82ec1a54238b 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.3.4
+++ b/metadata/md5-cache/dev-ruby/stomp-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.3.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=afcf0f7a99ae84ccb0ebbdd49b53022c
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.3.5 b/metadata/md5-cache/dev-ruby/stomp-1.3.5
index db049cff6831..88acc96b636c 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.3.5
+++ b/metadata/md5-cache/dev-ruby/stomp-1.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.3.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fd41a170873f57035a67262eccc4338d
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.0 b/metadata/md5-cache/dev-ruby/stomp-1.4.0
index fc1a3ed7ebea..f630a6d66bbf 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.0
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ed1cbca73c67ddbcc1f11fd9da01ba2c
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.1 b/metadata/md5-cache/dev-ruby/stomp-1.4.1
index 2e03ee05f7a5..ca1b4f090981 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.1
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ed1cbca73c67ddbcc1f11fd9da01ba2c
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.3 b/metadata/md5-cache/dev-ruby/stomp-1.4.3
index a2b00bfed483..9f475c4635a7 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.3
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.4.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9d985b22d1bb45490638cc5321ddc08d
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.6.1 b/metadata/md5-cache/dev-ruby/stringex-2.6.1
index 4e4ad4ff8768..96490b574dbe 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.6.1
+++ b/metadata/md5-cache/dev-ruby/stringex-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/stringex-2.6.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9f65fadf155df59cadd4b85394558133
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.7.0 b/metadata/md5-cache/dev-ruby/stringex-2.7.0
index 50165e54c329..25b15121a40f 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.7.0
+++ b/metadata/md5-cache/dev-ruby/stringex-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/stringex-2.7.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cc81916b0fc547768dccb8353cc11a62
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.7.1 b/metadata/md5-cache/dev-ruby/stringex-2.7.1
index 3ef610fbd284..d3caabd3d137 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.7.1
+++ b/metadata/md5-cache/dev-ruby/stringex-2.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/stringex-2.7.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9791006e3b8b3a24b7dbdf0fd7e24cf7
diff --git a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1 b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
index 69f087ad5502..3ac9b14082a4 100644
--- a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/nulayer/subexec/archive/v0.2.3.tar.gz -> subexec-0.2.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2d9873e5fd422102b17b610dc033e04d
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1 b/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1
index 484751b92f44..b16160f63577 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/dblock/syntax/archive/v1.2.0.tar.gz -> syntax-1.2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=96ecf04f2d83fc85cd73da02a5169bfe
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.1 b/metadata/md5-cache/dev-ruby/syntax-1.2.1
index 7ac5e1bbd083..7899f0282b3d 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.1
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/dblock/syntax/archive/v1.2.1.tar.gz -> syntax-1.2.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=40e38821f2dc4bcafc1103c1223b73aa
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.4 b/metadata/md5-cache/dev-ruby/syslogger-1.6.4
index 8153a4ab7821..5db1b1796dd4 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.4
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/syslogger-1.6.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0fee2aba52c288ac98fd9caa073b6e59
diff --git a/metadata/md5-cache/dev-ruby/systemu-2.6.5 b/metadata/md5-cache/dev-ruby/systemu-2.6.5
index e0080ae9e883..5c03e125fe1e 100644
--- a/metadata/md5-cache/dev-ruby/systemu-2.6.5
+++ b/metadata/md5-cache/dev-ruby/systemu-2.6.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/systemu-2.6.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2f51e52e1cf0a9116f3eae51ecfdd5d3
diff --git a/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1 b/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1
index 1b096507b289..9dc6aa390f38 100644
--- a/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tdiff-0.3.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=94fbfced1785e5303cb52cd73c2a8958
diff --git a/metadata/md5-cache/dev-ruby/temple-0.6.10 b/metadata/md5-cache/dev-ruby/temple-0.6.10
index ec2dc711b936..aa6b5e57cb17 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.6.10
+++ b/metadata/md5-cache/dev-ruby/temple-0.6.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/temple-0.6.10.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a45dcdcc0705fb269c4e773b7ffda1ff
diff --git a/metadata/md5-cache/dev-ruby/temple-0.7.7 b/metadata/md5-cache/dev-ruby/temple-0.7.7
index 497483fae728..53005630533f 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.7.7
+++ b/metadata/md5-cache/dev-ruby/temple-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.7
 SRC_URI=mirror://rubygems/temple-0.7.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4953170bae6e9e930722cdf370521d92
diff --git a/metadata/md5-cache/dev-ruby/temple-0.8.0 b/metadata/md5-cache/dev-ruby/temple-0.8.0
index de86ade1ade7..544496604379 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.8.0
+++ b/metadata/md5-cache/dev-ruby/temple-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0.7
 SRC_URI=mirror://rubygems/temple-0.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4e814f2cdc202a3f19394c43b3935dbc
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
index de466d86cc24..927650d07ad0 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f7336fbd655b14e9772bc1cb03324dc0
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
index 687bd89a59d9..a51a25724963 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=14901fee840670ad33d04173307cb69e
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.4.0 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.4.0
index a15495ecca99..1fe110721a48 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.4.0
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/tins-1.0[ruby_targets_ruby21] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=764ec9f22a5f0575855ee47835b4b921
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.4.1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.4.1
index 13a8fa32f028..8d16d269cb74 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.4.1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/tins-1.0[ruby_targets_ruby21] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b1591c8fb859667d001262fe5d02c027
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.5.0 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.5.0
index 45e135b73efd..f484a1316778 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.5.0
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/tins-1.0[ruby_targets_ruby21] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b1591c8fb859667d001262fe5d02c027
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.6.0 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.6.0
index bfcf377071a0..b63057fae447 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.6.0
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/tins-1.0[ruby_targets_ruby21] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=89f528b147aa5fa3ab01651d8503f891
diff --git a/metadata/md5-cache/dev-ruby/termcolor-1.2.2 b/metadata/md5-cache/dev-ruby/termcolor-1.2.2
index 0221f22b095b..3ce07bc15cde 100644
--- a/metadata/md5-cache/dev-ruby/termcolor-1.2.2
+++ b/metadata/md5-cache/dev-ruby/termcolor-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/termcolor-1.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c3293ff6f1419211713a068173cd351c
diff --git a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r3 b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r3
index 3e0732bff433..baf526d0a455 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r3
+++ b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-1.2.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=04bcdaf813de8b3100b41cc278c938a3
diff --git a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2 b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
index 30e620f3d5b9..d01ac3d0c7e8 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
+++ b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-2.5.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=096b784cca3159bce601db392946b679
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.1.9 b/metadata/md5-cache/dev-ruby/test-unit-3.1.9
index 22de7a7b2226..324069fb8b8a 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.1.9
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/power_assert[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.1.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=880a907ddaf9d68fe23f31d4373007c4
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.2.2 b/metadata/md5-cache/dev-ruby/test-unit-3.2.2
index 696ce12a924f..f57e38b37732 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.2.2
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/power_assert[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f643f58cce91e23667302a8c5af457ff
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.2.3 b/metadata/md5-cache/dev-ruby/test-unit-3.2.3
index 65b778a28061..b6902ceabccd 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.2.3
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/power_assert[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.2.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9fe409d848d6f4b1eeca9b9ddd08b917
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.2.3-r1 b/metadata/md5-cache/dev-ruby/test-unit-3.2.3-r1
index 781f2d37c7a0..21d14416b7c2 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/power_assert[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.2.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=83a2fa9a81d10cdcfc06ae8a6132fedc
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.2.4 b/metadata/md5-cache/dev-ruby/test-unit-3.2.4
index cc79f448dca9..3ef8ff724107 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.2.4
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/power_assert[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.2.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8eecc345abb229f97c10e865f7a807a7
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
index 04d02aa7ad43..234053914035 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby21] >=dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-rr-1.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0c5628b6ee8dc27f6dfb4ceff84405f0
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
index 104073a4d28c..bd55275bd52c 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby21] >=dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-rr-1.0.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3a61d1743b3a4eada580bee71f7b77fd
diff --git a/metadata/md5-cache/dev-ruby/test_construct-2.0.1 b/metadata/md5-cache/dev-ruby/test_construct-2.0.1
index 353744cb9957..f9d6a41a075b 100644
--- a/metadata/md5-cache/dev-ruby/test_construct-2.0.1
+++ b/metadata/md5-cache/dev-ruby/test_construct-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/test_construct-2.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7d9f72d6ea0c92bde8899b609a2a3286
diff --git a/metadata/md5-cache/dev-ruby/test_construct-2.0.1-r1 b/metadata/md5-cache/dev-ruby/test_construct-2.0.1-r1
index 61dacc3b4823..f3aa9392e734 100644
--- a/metadata/md5-cache/dev-ruby/test_construct-2.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/test_construct-2.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/test_construct-2.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1ee80f7cec4cf6b4e681f531233735a1
diff --git a/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2 b/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
index d97f32e0deef..bf897997d13e 100644
--- a/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
+++ b/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/svenfuchs/test_declarative/tarball/v0.0.5 -> test_declarative-0.0.5.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=41e4bf1114211ae6cf2ae11eacd83331
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.1 b/metadata/md5-cache/dev-ruby/text-1.3.1
index d3ba5f89c57f..c78bb48b176f 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.1
+++ b/metadata/md5-cache/dev-ruby/text-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5153b70ae0260ba832143658422c40d9
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
index 3624aa778d47..1a08e5d71561 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-hyphen-1.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6b301c09dccddb1f6ad27b4f452f0a09
diff --git a/metadata/md5-cache/dev-ruby/textpow-1.4.0 b/metadata/md5-cache/dev-ruby/textpow-1.4.0
index 31ebe98d80d3..70c54ecadbc9 100644
--- a/metadata/md5-cache/dev-ruby/textpow-1.4.0
+++ b/metadata/md5-cache/dev-ruby/textpow-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby21] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/grosser/textpow/archive/v1.4.0.tar.gz -> textpow-1.4.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3bce8734d97b01927a11f5131e089d03
diff --git a/metadata/md5-cache/dev-ruby/thor-0.19.1 b/metadata/md5-cache/dev-ruby/thor-0.19.1
index 128cd2febadc..4cddc5fb63fd 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.19.1
+++ b/metadata/md5-cache/dev-ruby/thor-0.19.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/erikhuda/thor/archive/v0.19.1.tar.gz -> thor-git-0.19.1.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2dd97647d68c8b57497f5c0a4aaab801
diff --git a/metadata/md5-cache/dev-ruby/thread_order-1.1.0 b/metadata/md5-cache/dev-ruby/thread_order-1.1.0
index 57318ddd1394..b99f622a874e 100644
--- a/metadata/md5-cache/dev-ruby/thread_order-1.1.0
+++ b/metadata/md5-cache/dev-ruby/thread_order-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/thread_order-1.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dfe41518542af1c45ab9e5c3d203167c
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.5 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.5
index 6396424fdd20..158abe0dfb62 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.5
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/thread_safe-0.3.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dd5fc0fef25e1fe289518b1556b9e56a
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
index 85856cbebfd2..26720a55ed82 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/thread_safe-0.3.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d1513eb6611b1ee542b400af3273b0c8
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3
index 678daffea72b..490b4c338bc4 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy-ext-0.1.14.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0305568b20ab929706520fbfa9b7e341
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
index 2514a50a69bc..ec65f2803938 100644
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
+++ b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy_table-0.0.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e316ef325cdaa4634e13a2b32298f770
diff --git a/metadata/md5-cache/dev-ruby/tilt-1.4.1 b/metadata/md5-cache/dev-ruby/tilt-1.4.1
index 93090eec7323..f727432cf993 100644
--- a/metadata/md5-cache/dev-ruby/tilt-1.4.1
+++ b/metadata/md5-cache/dev-ruby/tilt-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/builder-2.0.0[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/tilt-1.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8f47fcd07c30efc8f693b37a99c3bcd3
diff --git a/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2 b/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2
index 32c6d655c011..268ab82e4a4e 100644
--- a/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2
+++ b/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/builder-2.0.0[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/tilt-1.4.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=87f5ffb3fe3398fbff495f5a2603fd4b
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.5 b/metadata/md5-cache/dev-ruby/tilt-2.0.5
index f4a112b5d2d9..5e31d93c787b 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.5
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby21] !
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/tilt-2.0.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ab7ed9f8b783f5fc979ebf79f5d5f2d7
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.7.1 b/metadata/md5-cache/dev-ruby/timecop-0.7.1
index 40e6f7370e6f..996a6f85500e 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.7.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.7.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3771cad34ec85b1a4fe202744f0dab75
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.8.0 b/metadata/md5-cache/dev-ruby/timecop-0.8.0
index 0907b1c77962..32da1b21e4a2 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.8.0
+++ b/metadata/md5-cache/dev-ruby/timecop-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6a2d3f214c04f589e8e2149b9d05383f
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.8.1 b/metadata/md5-cache/dev-ruby/timecop-0.8.1
index c7e7ec347be8..0ae060fdf9f8 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.8.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.8.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b271159dc1e00e520ff5add945ca0cb9
diff --git a/metadata/md5-cache/dev-ruby/timers-4.0.1 b/metadata/md5-cache/dev-ruby/timers-4.0.1
index a815c26dd2a0..b7087126d98b 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.0.1
+++ b/metadata/md5-cache/dev-ruby/timers-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/hitimes[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/timers-4.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2084882749881e88a7c98ce3081a16a2
diff --git a/metadata/md5-cache/dev-ruby/timers-4.1.0 b/metadata/md5-cache/dev-ruby/timers-4.1.0
index 3ad0162beee6..dc8162c03b2c 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.1.0
+++ b/metadata/md5-cache/dev-ruby/timers-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/hitimes[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/timers-4.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f8369ed94a1036750fc350c1efc608e5
diff --git a/metadata/md5-cache/dev-ruby/timers-4.1.1 b/metadata/md5-cache/dev-ruby/timers-4.1.1
index c3d5adabc7af..9796f0d08819 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.1.1
+++ b/metadata/md5-cache/dev-ruby/timers-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/hitimes[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/timers-4.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2084882749881e88a7c98ce3081a16a2
diff --git a/metadata/md5-cache/dev-ruby/timers-4.1.2 b/metadata/md5-cache/dev-ruby/timers-4.1.2
index 7613c601dcc2..adb89e85edf6 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.1.2
+++ b/metadata/md5-cache/dev-ruby/timers-4.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/hitimes[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/timers-4.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2084882749881e88a7c98ce3081a16a2
diff --git a/metadata/md5-cache/dev-ruby/tins-1.13.0 b/metadata/md5-cache/dev-ruby/tins-1.13.0
index 5cfdde7b1e88..f87e9ecf6ed2 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.13.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.13.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3b54f7b365f5e4bd16881cd57323b9e1
diff --git a/metadata/md5-cache/dev-ruby/tins-1.13.2 b/metadata/md5-cache/dev-ruby/tins-1.13.2
index 5c6e6751c0fc..b6db26b14837 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.13.2
+++ b/metadata/md5-cache/dev-ruby/tins-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.13.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3b54f7b365f5e4bd16881cd57323b9e1
diff --git a/metadata/md5-cache/dev-ruby/tins-1.13.3 b/metadata/md5-cache/dev-ruby/tins-1.13.3
index 5022a5179abe..d7c75a81bae9 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.13.3
+++ b/metadata/md5-cache/dev-ruby/tins-1.13.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.13.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=210396e6e0a4f8c01de5b0d2206453ff
diff --git a/metadata/md5-cache/dev-ruby/tins-1.14.0 b/metadata/md5-cache/dev-ruby/tins-1.14.0
index dc1ca03b3bcf..4e686a87e598 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.14.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.14.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=210396e6e0a4f8c01de5b0d2206453ff
diff --git a/metadata/md5-cache/dev-ruby/tins-1.6.0 b/metadata/md5-cache/dev-ruby/tins-1.6.0
index 7c45e5fcbb3d..4f57b892ba45 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.6.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.6.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=85196c7069932a218272e906946de9a6
diff --git a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0 b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
index d21afc66a1fe..5a999465f8ae 100644
--- a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
+++ b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
@@ -10,5 +10,5 @@ RDEPEND=dev-db/tokyocabinet ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/tokyocabinet-1.32.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e2653e68415ced5a5cc7a3c5172543a8
diff --git a/metadata/md5-cache/dev-ruby/toml-0.1.2 b/metadata/md5-cache/dev-ruby/toml-0.1.2
index 0745890dacc5..f693a7338bd6 100644
--- a/metadata/md5-cache/dev-ruby/toml-0.1.2
+++ b/metadata/md5-cache/dev-ruby/toml-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/parslet[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jm/toml/archive/v0.1.2.tar.gz -> toml-0.1.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=edee6bdf6ae67f99bb78a2ea7b65f715
diff --git a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0 b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
index 6178ad5c5e8f..b5beb085212c 100644
--- a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
+++ b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/totoridipjp-0.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=17c8f7a7d30697566c813080665e0832
diff --git a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2 b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
index 13d1c5c6af61..86b587d1cee8 100644
--- a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/transaction-simple-1.4.0.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3bde7641473cec88c87079847d7b2d51
diff --git a/metadata/md5-cache/dev-ruby/travis-1.8.6-r1 b/metadata/md5-cache/dev-ruby/travis-1.8.6-r1
index c0bf69d94b81..e5892bbdce56 100644
--- a/metadata/md5-cache/dev-ruby/travis-1.8.6-r1
+++ b/metadata/md5-cache/dev-ruby/travis-1.8.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/git ruby_targets_ruby21? ( dev-ruby/backports[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/travis-1.8.6.gem
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=444a8281e2334857e5c26806ec7d6e6a
diff --git a/metadata/md5-cache/dev-ruby/travis-1.8.8 b/metadata/md5-cache/dev-ruby/travis-1.8.8
index 2921f33cd42e..7f797573febd 100644
--- a/metadata/md5-cache/dev-ruby/travis-1.8.8
+++ b/metadata/md5-cache/dev-ruby/travis-1.8.8
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/git ruby_targets_ruby21? ( dev-ruby/backports[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/travis-1.8.8.gem
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a2cc0f318cf1f66bf961219d81c9346f
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.6.5 b/metadata/md5-cache/dev-ruby/treetop-1.6.5
index 77e073f801b0..c6e9e41f4577 100644
--- a/metadata/md5-cache/dev-ruby/treetop-1.6.5
+++ b/metadata/md5-cache/dev-ruby/treetop-1.6.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/treetop-1.6.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=11b42635153338f132bdebcba6d14c46
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.6.8 b/metadata/md5-cache/dev-ruby/treetop-1.6.8
index 20611fd4140b..21f447e08d69 100644
--- a/metadata/md5-cache/dev-ruby/treetop-1.6.8
+++ b/metadata/md5-cache/dev-ruby/treetop-1.6.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/treetop-1.6.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5e2020c24eefe535849dcca1f7618374
diff --git a/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4 b/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4
index 943d2c5ff6cb..f0692cfae5cd 100644
--- a/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4
+++ b/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/trollop-1.16.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4656b83cd9d49421ce20e127eed7b3f8
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.1.2 b/metadata/md5-cache/dev-ruby/trollop-2.1.2
index ccf84bf084d8..59567ff7cac8 100644
--- a/metadata/md5-cache/dev-ruby/trollop-2.1.2
+++ b/metadata/md5-cache/dev-ruby/trollop-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/trollop-2.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cb697aa4cffd1983eba025acd4c64ebf
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.2.1 b/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
index 9690bbaaea45..0cbd2a0bd6d1 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.2
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.2.1.tar.gz -> ttfunk-1.2.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe76c5d86d568bdb90244083b9faac2d
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.4.0 b/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
index a532bdd960be..ed2bd1eef8e3 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.4
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.4.0.tar.gz -> ttfunk-1.4.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe76c5d86d568bdb90244083b9faac2d
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.5.0 b/metadata/md5-cache/dev-ruby/ttfunk-1.5.0
index c1a6c6daa19b..a145d1878792 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.5.0
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.5
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.5.0.tar.gz -> ttfunk-1.5.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=caad10a92c4a4c0be8747ac3bec025e5
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.5.1 b/metadata/md5-cache/dev-ruby/ttfunk-1.5.1
index 91a90d04f6a0..bd8c8f62b34f 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.5.1
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.5
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.5.1.tar.gz -> ttfunk-1.5.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=caad10a92c4a4c0be8747ac3bec025e5
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-2.5.3 b/metadata/md5-cache/dev-ruby/turbolinks-2.5.3
index b4a53f9bdb08..be34b395598c 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-2.5.3
+++ b/metadata/md5-cache/dev-ruby/turbolinks-2.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/coffee-rails[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/turbolinks-2.5.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f0eed0f809b5f4ec4f1591b2202e6f3c
diff --git a/metadata/md5-cache/dev-ruby/twitter-5.16.0 b/metadata/md5-cache/dev-ruby/twitter-5.16.0
index f56f6c44e5d4..386e9311e00a 100644
--- a/metadata/md5-cache/dev-ruby/twitter-5.16.0
+++ b/metadata/md5-cache/dev-ruby/twitter-5.16.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=5
 SRC_URI=https://github.com/sferik/twitter/archive/v5.16.0.tar.gz -> twitter-5.16.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dadf050be6b4ec52a68ed92c890cbaa6
diff --git a/metadata/md5-cache/dev-ruby/twitter-5.17.0 b/metadata/md5-cache/dev-ruby/twitter-5.17.0
index 1d917e5eb916..d9302ac9d391 100644
--- a/metadata/md5-cache/dev-ruby/twitter-5.17.0
+++ b/metadata/md5-cache/dev-ruby/twitter-5.17.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=5
 SRC_URI=https://github.com/sferik/twitter/archive/v5.17.0.tar.gz -> twitter-5.17.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b8fb882448cee8f1f2664c25ff91448d
diff --git a/metadata/md5-cache/dev-ruby/twitter-5.17.0-r1 b/metadata/md5-cache/dev-ruby/twitter-5.17.0-r1
index a1c60f834ea3..590912653a0f 100644
--- a/metadata/md5-cache/dev-ruby/twitter-5.17.0-r1
+++ b/metadata/md5-cache/dev-ruby/twitter-5.17.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5
 SRC_URI=https://github.com/sferik/twitter/archive/v5.17.0.tar.gz -> twitter-5.17.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=192c366ff7a825f1429d66d01a4bdd2c
diff --git a/metadata/md5-cache/dev-ruby/twitter-6.1.0 b/metadata/md5-cache/dev-ruby/twitter-6.1.0
index b0e46e9cf043..1145635c1a5d 100644
--- a/metadata/md5-cache/dev-ruby/twitter-6.1.0
+++ b/metadata/md5-cache/dev-ruby/twitter-6.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.5[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=6
 SRC_URI=https://github.com/sferik/twitter/archive/v6.1.0.tar.gz -> twitter-6.1.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fd1c456e5bf18c65ecbc2935d77d1cd5
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-1.14.2 b/metadata/md5-cache/dev-ruby/twitter-text-1.14.2
index 1ec89d44d312..cfea3888eb49 100644
--- a/metadata/md5-cache/dev-ruby/twitter-text-1.14.2
+++ b/metadata/md5-cache/dev-ruby/twitter-text-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/unf-0.1*[ruby_targets_ruby21] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/twitter-text-1.14.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9fe31a40d5798e3b445e542d412a74ab
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-1.14.5 b/metadata/md5-cache/dev-ruby/twitter-text-1.14.5
index 7471bd53dd0a..e6215f583bb3 100644
--- a/metadata/md5-cache/dev-ruby/twitter-text-1.14.5
+++ b/metadata/md5-cache/dev-ruby/twitter-text-1.14.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( =dev-ruby/unf-0.1*[ruby_targets_ruby21] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/twitter-text-1.14.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4192237f5d6929cf711065ba405b3d9b
diff --git a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1 b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
index fe230d49b4b0..b2b357bf7ebe 100644
--- a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/typed-array-0.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=656eb75bdaf11031ba71fb5a0ce53385
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-0.6.9 b/metadata/md5-cache/dev-ruby/typhoeus-0.6.9
index 7131b6acf35c..2c1363249d16 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-0.6.9
+++ b/metadata/md5-cache/dev-ruby/typhoeus-0.6.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ethon-0.7.1[ruby_targets_ruby21] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/typhoeus-0.6.9.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=221746b76cfc25ec3ff617db9cb2a1d3
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.1.2 b/metadata/md5-cache/dev-ruby/typhoeus-1.1.2
index 21d86c80e39f..f9d0e8ed1ddc 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-1.1.2
+++ b/metadata/md5-cache/dev-ruby/typhoeus-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby21] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/typhoeus-1.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=030afe772f997c09a3a2410e4d9fbfa0
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-0.3.52 b/metadata/md5-cache/dev-ruby/tzinfo-0.3.52
index 3ec270e47992..2f7f987c96b1 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-0.3.52
+++ b/metadata/md5-cache/dev-ruby/tzinfo-0.3.52
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tzinfo-0.3.52.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fdc0b3f438e7d92fc8f8c4adbd6a4bc9
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.2 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
index 358c790855d0..99b82a728e96 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/timezone-data ruby_targets_ruby21? ( >=dev-ruby/thread_safe-0.1
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/tzinfo-1.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c5fea2d7b1551255c36b81d2be8f215e
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.3 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.3
index aa5ff1abd471..d5a7af41e095 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.3
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/timezone-data ruby_targets_ruby21? ( >=dev-ruby/thread_safe-0.1
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/tzinfo-1.2.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e043653bc9f2b38bce41df03812b6a55
diff --git a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2 b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
index bb56671b5bb1..d726b4079e57 100644
--- a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
+++ b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=http://www.yoshidam.net/uconv-0.6.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=48a114f0a16b7307e491f749e0bad656
diff --git a/metadata/md5-cache/dev-ruby/uglifier-2.7.2 b/metadata/md5-cache/dev-ruby/uglifier-2.7.2
index 9c851f189f4d..7e2b538cdbcb 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-2.7.2
+++ b/metadata/md5-cache/dev-ruby/uglifier-2.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] >=
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/uglifier-2.7.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=82cb03836c1c7f9e8d6f6cbab89cbb7f
diff --git a/metadata/md5-cache/dev-ruby/uglifier-3.0.4 b/metadata/md5-cache/dev-ruby/uglifier-3.0.4
index fe66e23ed648..3ed332d06a6a 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-3.0.4
+++ b/metadata/md5-cache/dev-ruby/uglifier-3.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/lautis/uglifier/archive/v3.0.4.tar.gz -> uglifier-3.0.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=354cd6c5218387ced6b9b8e4143a3cc5
diff --git a/metadata/md5-cache/dev-ruby/uglifier-3.1.1 b/metadata/md5-cache/dev-ruby/uglifier-3.1.1
index 2710e0df95e8..8bfd7211d81c 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-3.1.1
+++ b/metadata/md5-cache/dev-ruby/uglifier-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/lautis/uglifier/archive/v3.1.1.tar.gz -> uglifier-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe934f62f5bb5bdedb18b1ebbc183bb6
diff --git a/metadata/md5-cache/dev-ruby/uglifier-3.1.12 b/metadata/md5-cache/dev-ruby/uglifier-3.1.12
index c79b12333513..e769d9a0f914 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-3.1.12
+++ b/metadata/md5-cache/dev-ruby/uglifier-3.1.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/lautis/uglifier/archive/v3.1.12.tar.gz -> uglifier-3.1.12.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe934f62f5bb5bdedb18b1ebbc183bb6
diff --git a/metadata/md5-cache/dev-ruby/uglifier-3.1.3 b/metadata/md5-cache/dev-ruby/uglifier-3.1.3
index 7e5309778660..91a11e3073cf 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-3.1.3
+++ b/metadata/md5-cache/dev-ruby/uglifier-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/lautis/uglifier/archive/v3.1.3.tar.gz -> uglifier-3.1.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe934f62f5bb5bdedb18b1ebbc183bb6
diff --git a/metadata/md5-cache/dev-ruby/uglifier-3.1.6 b/metadata/md5-cache/dev-ruby/uglifier-3.1.6
index c447b854ba18..0b1f54e6666d 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-3.1.6
+++ b/metadata/md5-cache/dev-ruby/uglifier-3.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/lautis/uglifier/archive/v3.1.6.tar.gz -> uglifier-3.1.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe934f62f5bb5bdedb18b1ebbc183bb6
diff --git a/metadata/md5-cache/dev-ruby/uglifier-3.1.7 b/metadata/md5-cache/dev-ruby/uglifier-3.1.7
index 868856034f53..e2af9131d551 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-3.1.7
+++ b/metadata/md5-cache/dev-ruby/uglifier-3.1.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/lautis/uglifier/archive/v3.1.7.tar.gz -> uglifier-3.1.7.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe934f62f5bb5bdedb18b1ebbc183bb6
diff --git a/metadata/md5-cache/dev-ruby/uglifier-3.1.9 b/metadata/md5-cache/dev-ruby/uglifier-3.1.9
index 644d4a10c1e7..e6f5dc86935e 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-3.1.9
+++ b/metadata/md5-cache/dev-ruby/uglifier-3.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/lautis/uglifier/archive/v3.1.9.tar.gz -> uglifier-3.1.9.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe934f62f5bb5bdedb18b1ebbc183bb6
diff --git a/metadata/md5-cache/dev-ruby/uglifier-3.2.0 b/metadata/md5-cache/dev-ruby/uglifier-3.2.0
index edbb02155420..d64f817b39aa 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-3.2.0
+++ b/metadata/md5-cache/dev-ruby/uglifier-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/lautis/uglifier/archive/v3.2.0.tar.gz -> uglifier-3.2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe934f62f5bb5bdedb18b1ebbc183bb6
diff --git a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1 b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
index 9cf7777564a3..fe2c19d8e3fe 100644
--- a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ultraviolet-1.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a0e402cc6c7957d511f5e1a4122f8baf
diff --git a/metadata/md5-cache/dev-ruby/unf-0.1.4 b/metadata/md5-cache/dev-ruby/unf-0.1.4
index be5997c24195..19267340991e 100644
--- a/metadata/md5-cache/dev-ruby/unf-0.1.4
+++ b/metadata/md5-cache/dev-ruby/unf-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/unf_ext[ruby_targets_ruby21] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf-0.1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cafda2d7abe16687941572d1bc1b2370
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1
index d34141758b83..68312affee4a 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.0.7.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4c3ea3430868482dd981381715d56b58
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.2 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.2
index a9be931cf398..f42c40afd783 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.2
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.0.7.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=42f94146bfc0a342b82ea0eaae784c73
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.3 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.3
index 406a11dbecc8..bc7b3e2d8790 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.3
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.0.7.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e8f9097c2af2e59c8598e786ae344ec4
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.4 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.4
index b0339f857570..24035aa250fb 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.4
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.0.7.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=267c97cf33f08521d339e17db5fe9479
diff --git a/metadata/md5-cache/dev-ruby/unindent-1.0 b/metadata/md5-cache/dev-ruby/unindent-1.0
index 212333c835d6..07ed44146f65 100644
--- a/metadata/md5-cache/dev-ruby/unindent-1.0
+++ b/metadata/md5-cache/dev-ruby/unindent-1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/unindent-1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bf428fed5d1450e72f84ad71084ca171
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
index cacf099fd874..5683d4e2b3e7 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/uuidtools-2.1.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=12476790942cedd4126cbd1d3b3ec743
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.2.13 b/metadata/md5-cache/dev-ruby/vcard-0.2.13
index bc1c4295524b..f61094ccdf03 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.2.13
+++ b/metadata/md5-cache/dev-ruby/vcard-0.2.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/vcard-0.2.13.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c2d25c22109c27f09eedf4cf7e641dd5
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.2.14 b/metadata/md5-cache/dev-ruby/vcard-0.2.14
index c81bd70c6202..f7197c5f1b6e 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.2.14
+++ b/metadata/md5-cache/dev-ruby/vcard-0.2.14
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/vcard-0.2.14.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c2d25c22109c27f09eedf4cf7e641dd5
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.2.15 b/metadata/md5-cache/dev-ruby/vcard-0.2.15
index a533cb1f4454..19014af1c285 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.2.15
+++ b/metadata/md5-cache/dev-ruby/vcard-0.2.15
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/vcard-0.2.15.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c2d25c22109c27f09eedf4cf7e641dd5
diff --git a/metadata/md5-cache/dev-ruby/vcr-1.11.3 b/metadata/md5-cache/dev-ruby/vcr-1.11.3
index 3163027105b4..48798db02d9a 100644
--- a/metadata/md5-cache/dev-ruby/vcr-1.11.3
+++ b/metadata/md5-cache/dev-ruby/vcr-1.11.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/vcr-1.11.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8000d740e664742ef8d6fbea796ec0ed
diff --git a/metadata/md5-cache/dev-ruby/vcr-2.9.3 b/metadata/md5-cache/dev-ruby/vcr-2.9.3
index 39d3940746c1..8a188dc7c4b0 100644
--- a/metadata/md5-cache/dev-ruby/vcr-2.9.3
+++ b/metadata/md5-cache/dev-ruby/vcr-2.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://rubygems/vcr-2.9.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c24e8ad5ccd4ad08a4a790e053c2a9d2
diff --git a/metadata/md5-cache/dev-ruby/vcr-3.0.1 b/metadata/md5-cache/dev-ruby/vcr-3.0.1
index 4e7b1d59f2b0..962ac007e911 100644
--- a/metadata/md5-cache/dev-ruby/vcr-3.0.1
+++ b/metadata/md5-cache/dev-ruby/vcr-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/vcr/vcr/archive/v3.0.1.tar.gz -> vcr-3.0.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=57088c7c76e75e37932fb0b749620caf
diff --git a/metadata/md5-cache/dev-ruby/vcr-3.0.3 b/metadata/md5-cache/dev-ruby/vcr-3.0.3
index 850808e5c8f3..704e0e17eb3e 100644
--- a/metadata/md5-cache/dev-ruby/vcr-3.0.3
+++ b/metadata/md5-cache/dev-ruby/vcr-3.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/vcr/vcr/archive/v3.0.3.tar.gz -> vcr-3.0.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ccb31e9d8bfd4e3060cb6003295f7032
diff --git a/metadata/md5-cache/dev-ruby/virtus-1.0.5 b/metadata/md5-cache/dev-ruby/virtus-1.0.5
index 547c8c11c558..7b9df84a64f6 100644
--- a/metadata/md5-cache/dev-ruby/virtus-1.0.5
+++ b/metadata/md5-cache/dev-ruby/virtus-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby21] <
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/virtus-1.0.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=03d1ba02eb65729b4469a2ec6f386cdf
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.7.0 b/metadata/md5-cache/dev-ruby/vlad-2.7.0
index 773c0bc8c038..9f2016fcb67b 100644
--- a/metadata/md5-cache/dev-ruby/vlad-2.7.0
+++ b/metadata/md5-cache/dev-ruby/vlad-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/vlad-2.7.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d7688d11c751c5f2417789c8b5ab70c3
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.6 b/metadata/md5-cache/dev-ruby/warden-1.2.6
index 4f8205fc9165..2aea81bb7a1c 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.6
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/warden-1.2.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6ade31b296551210ebe8b82665060424
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.7 b/metadata/md5-cache/dev-ruby/warden-1.2.7
index 1950b77a9f3d..4c81c9d023a2 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.7
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/warden-1.2.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b2bae6019f5db41b38e009fba1346813
diff --git a/metadata/md5-cache/dev-ruby/web-console-2.3.0 b/metadata/md5-cache/dev-ruby/web-console-2.3.0
index 0aa3bcc5e9e2..51819ab20632 100644
--- a/metadata/md5-cache/dev-ruby/web-console-2.3.0
+++ b/metadata/md5-cache/dev-ruby/web-console-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/rails/web-console/archive/v2.3.0.tar.gz -> web-console-2.3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fdd4277df2273b6e0389b494aa3dc6d1
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.3.1 b/metadata/md5-cache/dev-ruby/web-console-3.3.1
index f02327e6d046..487e1e2f1b91 100644
--- a/metadata/md5-cache/dev-ruby/web-console-3.3.1
+++ b/metadata/md5-cache/dev-ruby/web-console-3.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby22]
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rails/web-console/archive/v3.3.1.tar.gz -> web-console-3.3.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e0db78a9da67b7b646fe204459056308
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.4.0 b/metadata/md5-cache/dev-ruby/web-console-3.4.0
index ff1b10dded92..8c9696e935ff 100644
--- a/metadata/md5-cache/dev-ruby/web-console-3.4.0
+++ b/metadata/md5-cache/dev-ruby/web-console-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby22]
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rails/web-console/archive/v3.4.0.tar.gz -> web-console-3.4.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e0db78a9da67b7b646fe204459056308
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.20.3 b/metadata/md5-cache/dev-ruby/webmock-1.20.3
index 1b07b6dbaf11..ba92a9b66c6f 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.20.3
+++ b/metadata/md5-cache/dev-ruby/webmock-1.20.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/webmock-1.20.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8567136c7b30ff2a280a1854216e988d
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.24.6 b/metadata/md5-cache/dev-ruby/webmock-1.24.6
index 725ac40a00a3..701199e58e0e 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.24.6
+++ b/metadata/md5-cache/dev-ruby/webmock-1.24.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/webmock-1.24.6.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=88ec98e1765f9bff650ece4516c87566
diff --git a/metadata/md5-cache/dev-ruby/webmock-2.1.0 b/metadata/md5-cache/dev-ruby/webmock-2.1.0
index 843b7ab131dc..4afcacae851e 100644
--- a/metadata/md5-cache/dev-ruby/webmock-2.1.0
+++ b/metadata/md5-cache/dev-ruby/webmock-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/webmock-2.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=72381a88341752819fd0b6b9886928d9
diff --git a/metadata/md5-cache/dev-ruby/webmock-2.3.1 b/metadata/md5-cache/dev-ruby/webmock-2.3.1
index 376d8bcb41f2..dd29a81ec299 100644
--- a/metadata/md5-cache/dev-ruby/webmock-2.3.1
+++ b/metadata/md5-cache/dev-ruby/webmock-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/webmock-2.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=df0a9b7f9f34992baedd9cd67472e57f
diff --git a/metadata/md5-cache/dev-ruby/webmock-2.3.2 b/metadata/md5-cache/dev-ruby/webmock-2.3.2
index a6fd829fa77e..28231d863093 100644
--- a/metadata/md5-cache/dev-ruby/webmock-2.3.2
+++ b/metadata/md5-cache/dev-ruby/webmock-2.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/webmock-2.3.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5999d86c89352fdb5a26aacbe20151f8
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.0.1 b/metadata/md5-cache/dev-ruby/webmock-3.0.1
index c83085d8858d..dbdf1bce5689 100644
--- a/metadata/md5-cache/dev-ruby/webmock-3.0.1
+++ b/metadata/md5-cache/dev-ruby/webmock-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/webmock-3.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bc9edb76b669b5f52eb6ac4dee6d2571
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
index 63d928b61762..928138b0e9c4 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/webrobots-0.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6fe1acdff34d5764a75d3254aaf13ff8
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.2
index ad44c395e157..d7a3e072019b 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.2
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/webrobots-0.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e2a489e527e9ddbf727abee1a61b5679
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.3 b/metadata/md5-cache/dev-ruby/websocket-1.2.3
index 3cb3ca14bcf7..471c8cdfd19f 100644
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.3
+++ b/metadata/md5-cache/dev-ruby/websocket-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/websocket-1.2.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=17864324da8e18c2a865948209d95c54
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.4 b/metadata/md5-cache/dev-ruby/websocket-1.2.4
index 1d78682d4d16..94e2fe2aed4e 100644
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.4
+++ b/metadata/md5-cache/dev-ruby/websocket-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/websocket-1.2.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ffecd7a3a1e761bd765b4df46e901a79
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.4 b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.4
index 693f5dee9e0c..10a044af56b5 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.4
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.6.4.tar.gz -> websocket-driver-0.6.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5549bdead3cc48648072acdf34e1068e
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5 b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5
index 906e86453500..1fc1d07138a8 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.6.5.tar.gz -> websocket-driver-0.6.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=909c112d421dea532911453515464ae8
diff --git a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.2 b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.2
index 8c9e6e7a027a..00b5b6205fd0 100644
--- a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.2
+++ b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-extensions-ruby/archive/0.1.2.tar.gz -> websocket-extensions-0.1.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d334a534fe5c619b3bd49a2422d28076
diff --git a/metadata/md5-cache/dev-ruby/wikicloth-0.8.3 b/metadata/md5-cache/dev-ruby/wikicloth-0.8.3
index c2711520914c..f0bd06edca6c 100644
--- a/metadata/md5-cache/dev-ruby/wikicloth-0.8.3
+++ b/metadata/md5-cache/dev-ruby/wikicloth-0.8.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/builder:*[ruby_targets_ruby21] dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/nricciar/wikicloth/archive/v0.8.3.tar.gz -> wikicloth-0.8.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=10f77b1385005ab295e3b88693d763c5
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.1.0 b/metadata/md5-cache/dev-ruby/will_paginate-3.1.0
index e16ded553b34..59a62936c6a9 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.1.0
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/will_paginate-3.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8f129e45a6975223ded2b15950f42cdc
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.1.0-r1 b/metadata/md5-cache/dev-ruby/will_paginate-3.1.0-r1
index 0771cb13ef5b..181f0ca0d182 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/will_paginate-3.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cbc1dabf898dfe1938c4ad6f74178c23
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.1.5 b/metadata/md5-cache/dev-ruby/will_paginate-3.1.5
index 47090af62142..11d41e300740 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.1.5
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.1.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/will_paginate-3.1.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cbc1dabf898dfe1938c4ad6f74178c23
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.1 b/metadata/md5-cache/dev-ruby/windows_error-0.1.1
index afefc070c0ed..c519c7815c52 100644
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.1
+++ b/metadata/md5-cache/dev-ruby/windows_error-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0.1
 SRC_URI=mirror://rubygems/windows_error-0.1.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c17ef3dbdd3ed316ffec279842f26a13
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.2 b/metadata/md5-cache/dev-ruby/windows_error-0.1.2
index 5055682fe966..c391710d747c 100644
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.2
+++ b/metadata/md5-cache/dev-ruby/windows_error-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.1
 SRC_URI=mirror://rubygems/windows_error-0.1.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d851281ed389d8d3930394ca5e701a34
diff --git a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4 b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
index 7b667ae28cfe..9d6d7d2b9372 100644
--- a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
+++ b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/wirble-0.1.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3e63548a8d486ab6f2f4d5ce72d1f997
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.5 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
index 6ee7294b5c52..1fa6be4c4879 100644
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
+++ b/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/maik/xml-simple/archive/v1.1.5.tar.gz -> xml-simple-1.1.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ede6c0e82303635587fec1dc0ea05ec6
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.2.1 b/metadata/md5-cache/dev-ruby/xmlrpc-0.2.1
index 9740f9118d06..22427fb6c5a8 100644
--- a/metadata/md5-cache/dev-ruby/xmlrpc-0.2.1
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.2.1.tar.gz -> xmlrpc-0.2.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4b6941598c83279a9b473836bacfad60
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0 b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
index be951f0daeb5..44ea14512fc2 100644
--- a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.3.0.tar.gz -> xmlrpc-0.3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=208e8641a527d41c8689a99db4240256
diff --git a/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1 b/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
index 0a77a21a28ff..58a59758ac7c 100644
--- a/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/xpath-0.1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=02358bb1777256e28ecab80064338fc9
diff --git a/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1 b/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
index dc8a835186fd..ef444c17904c 100644
--- a/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/xpath-2.0.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=147f9c7dc551a71e2596fa5efa71f268
diff --git a/metadata/md5-cache/dev-ruby/xpath-2.1.0 b/metadata/md5-cache/dev-ruby/xpath-2.1.0
index 0260311e57af..851b35208248 100644
--- a/metadata/md5-cache/dev-ruby/xpath-2.1.0
+++ b/metadata/md5-cache/dev-ruby/xpath-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/xpath-2.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=180219c809bbe15e7d525c1350aff361
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1
index eaf27d487a6f..f11fbc7d115f 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/yajl ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.1.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fe044491fb9a2b06577517dea168f201
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1
index 3c1821301014..a189795130bf 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/yajl ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.2.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=546bac5b02f2a2e53efc2d9261e81ec6
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0
index 8cd34f0c9424..e2fc4351bdee 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/yajl ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.3.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=546bac5b02f2a2e53efc2d9261e81ec6
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.7.3 b/metadata/md5-cache/dev-ruby/yard-0.8.7.3
index eff039b5d595..553e9c2c0b11 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.8.7.3
+++ b/metadata/md5-cache/dev-ruby/yard-0.8.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/0.8.7.3.tar.gz -> yard-0.8.7.3-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=66afe70b6c11f1b4f6854d51633f23b4
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.7.6 b/metadata/md5-cache/dev-ruby/yard-0.8.7.6
index 767bd6d093bc..5d049142d64f 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.8.7.6
+++ b/metadata/md5-cache/dev-ruby/yard-0.8.7.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.8.7.6.tar.gz -> yard-0.8.7.6-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8f8e1abe781f9e2b335530efae4e58f7
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.4 b/metadata/md5-cache/dev-ruby/yard-0.9.4
index 3149ec8952f0..063bf78e66d3 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.4
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.4.tar.gz -> yard-0.9.4-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8de4a8cdc58db75df783b5c6d9db31ea
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.8 b/metadata/md5-cache/dev-ruby/yard-0.9.8
index d91fbf212203..d0b863f62b08 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.8
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.8.tar.gz -> yard-0.9.8-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fdaaf89395b7021e28cf9e67c61cb0c8
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.9 b/metadata/md5-cache/dev-ruby/yard-0.9.9
index fd2a6c5ec5e5..1794d145c5f7 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.9
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.9.tar.gz -> yard-0.9.9-git.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=249e4187cd528e842ce00045e9dfdb7f
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.11.0 b/metadata/md5-cache/dev-ruby/zentest-4.11.0
index 803b93cb4103..2879d1860c20 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.11.0
+++ b/metadata/md5-cache/dev-ruby/zentest-4.11.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ZenTest-4.11.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c4bbf183ae9ad47d72e77c6745abd762
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.11.1 b/metadata/md5-cache/dev-ruby/zentest-4.11.1
index 2a4da4e98e72..a52f5ec599dd 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.11.1
+++ b/metadata/md5-cache/dev-ruby/zentest-4.11.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ZenTest-4.11.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cb22e5ccf03b98830ff580d6a689c1f2
diff --git a/metadata/md5-cache/dev-util/aruba-0.5.4-r1 b/metadata/md5-cache/dev-util/aruba-0.5.4-r1
index 0cee8ffd7fb3..dc19d1d74a37 100644
--- a/metadata/md5-cache/dev-util/aruba-0.5.4-r1
+++ b/metadata/md5-cache/dev-util/aruba-0.5.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.5.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=10a289c19f106c55569d35e3a30a5af4
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.2 b/metadata/md5-cache/dev-util/aruba-0.6.2
index b6309795c8a9..dcef0ef6fada 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.6.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b29a4945c1ab659c6343c0cc7eac10f3
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.2-r1 b/metadata/md5-cache/dev-util/aruba-0.6.2-r1
index 65ad1a453991..d40743b353a5 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2-r1
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.6.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e80397106c11a006ffd16f5282044a55
diff --git a/metadata/md5-cache/dev-util/aruba-0.7.4 b/metadata/md5-cache/dev-util/aruba-0.7.4
index f815787aa44c..23c521a36e31 100644
--- a/metadata/md5-cache/dev-util/aruba-0.7.4
+++ b/metadata/md5-cache/dev-util/aruba-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.7.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d94bb0449c918dbb8666a88c060b8987
diff --git a/metadata/md5-cache/dev-util/aruba-0.8.1 b/metadata/md5-cache/dev-util/aruba-0.8.1
index 26110e8acf27..c350796fd7e7 100644
--- a/metadata/md5-cache/dev-util/aruba-0.8.1
+++ b/metadata/md5-cache/dev-util/aruba-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby21
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.8.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=650216c9db591ea030f30a3e6759e1cd
diff --git a/metadata/md5-cache/dev-util/cdiff-9999 b/metadata/md5-cache/dev-util/cdiff-9999
index a589a870692c..22eacb3f4137 100644
--- a/metadata/md5-cache/dev-util/cdiff-9999
+++ b/metadata/md5-cache/dev-util/cdiff-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!<app-misc/colordiff-1.0.13-r1 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sys-apps/less python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=!<app-misc/colordiff-1.0.13-r1 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/less 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Term based view of colored, incremental diff in a Git/Mercurial/Svn workspace
 EAPI=5
 HOMEPAGE=https://github.com/ymattw/cdiff
-IUSE=python_targets_python2_7 python_targets_python3_4
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=BSD
-RDEPEND=!<app-misc/colordiff-1.0.13-r1 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sys-apps/less python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=!<app-misc/colordiff-1.0.13-r1 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/less 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b6296cac549408835d61290e00a7f1e7
+_md5_=60ac108c69179abe1590825556ddd60f
diff --git a/metadata/md5-cache/dev-util/cucumber-1.3.20-r1 b/metadata/md5-cache/dev-util/cucumber-1.3.20-r1
index 857c0a91e228..b9ecbe3d5ec5 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.3.20-r1
+++ b/metadata/md5-cache/dev-util/cucumber-1.3.20-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.3.20.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b89abe0bf6a63c25c594bff427535604
diff --git a/metadata/md5-cache/dev-util/cucumber-2.4.0 b/metadata/md5-cache/dev-util/cucumber-2.4.0
index 9634a90ac2ca..b8cb2bc9d56e 100644
--- a/metadata/md5-cache/dev-util/cucumber-2.4.0
+++ b/metadata/md5-cache/dev-util/cucumber-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-2.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c3db480882b9166392ccda2365d03cfa
diff --git a/metadata/md5-cache/dev-util/cucumber-2.4.0-r1 b/metadata/md5-cache/dev-util/cucumber-2.4.0-r1
index cc4f717eb1dc..de4f45b552ab 100644
--- a/metadata/md5-cache/dev-util/cucumber-2.4.0-r1
+++ b/metadata/md5-cache/dev-util/cucumber-2.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-2.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7de8eb30ac6e97cfe6270449840e1553
diff --git a/metadata/md5-cache/dev-util/cucumber-core-1.4.0 b/metadata/md5-cache/dev-util/cucumber-core-1.4.0
index abc814ae73fd..95ae776cd6ac 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-1.4.0
+++ b/metadata/md5-cache/dev-util/cucumber-core-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/gherkin-3.2.0:3[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-core-1.4.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fb895eb712d952931067a22f2be55352
diff --git a/metadata/md5-cache/dev-util/cucumber-core-1.5.0 b/metadata/md5-cache/dev-util/cucumber-core-1.5.0
index 9257074b6235..bb408192138d 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-1.5.0
+++ b/metadata/md5-cache/dev-util/cucumber-core-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby21] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-core-1.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8110512e66476f49e276a69702e8c25c
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.4.5 b/metadata/md5-cache/dev-util/cucumber-rails-1.4.5
index 40aa4d0b447b..11770bd4d7ae 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.4.5
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.4.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-rails-1.4.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8eb35dd378f43f902e72b953f6f5d339
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.5.0 b/metadata/md5-cache/dev-util/cucumber-rails-1.5.0
index 586a531ad7a0..eac7d8bebc2a 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.5.0
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-rails-1.5.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6a321b58766759b15b5c6887012d0916
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1 b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1
index 8dfd32238901..2844a06a7c1a 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-wire-0.0.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4fc593457d0c73f79416771da6dacfcf
diff --git a/metadata/md5-cache/dev-util/heaptrack-9999 b/metadata/md5-cache/dev-util/heaptrack-9999
index c0ea6d6189d1..d58ee6ed735b 100644
--- a/metadata/md5-cache/dev-util/heaptrack-9999
+++ b/metadata/md5-cache/dev-util/heaptrack-9999
@@ -7,5 +7,5 @@ IUSE=+qt5 debug test
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost:= sys-libs/libunwind sys-libs/zlib qt5? ( >=kde-frameworks/kconfig-5.29.0 >=kde-frameworks/kconfigwidgets-5.29.0 >=kde-frameworks/kcoreaddons-5.29.0 >=kde-frameworks/ki18n-5.29.0 >=kde-frameworks/kio-5.29.0 >=kde-frameworks/kitemmodels-5.29.0 >=kde-frameworks/kwidgetsaddons-5.29.0 >=kde-frameworks/threadweaver-5.29.0 >=dev-qt/qtcore-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/kdiagram:5 ) qt5? ( >=kde-frameworks/kf-env-4 )
 SLOT=0
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=996bee619798b39bb19d46470652a19c
diff --git a/metadata/md5-cache/dev-util/idea-ultimate-2017.1.3.171.4424.56 b/metadata/md5-cache/dev-util/idea-ultimate-2017.1.3.171.4424.56
new file mode 100644
index 000000000000..699eb4e40938
--- /dev/null
+++ b/metadata/md5-cache/dev-util/idea-ultimate-2017.1.3.171.4424.56
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=!dev-util/idea-ultimate:14 !dev-util/idea-ultimate:15
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=5
+HOMEPAGE=https://www.jetbrains.com/idea
+IUSE=-custom-jdk
+KEYWORDS=~amd64 ~x86
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=!dev-util/idea-ultimate:14 !dev-util/idea-ultimate:15 >=virtual/jdk-1.7:*
+SLOT=0
+SRC_URI=https://download.jetbrains.com/idea/ideaIU-2017.1.3.tar.gz -> ideaIU-171.4424.56.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0c8d69e0ed5c3c7a1a205726286aa140
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.1.0 b/metadata/md5-cache/dev-util/kdevelop-5.1.0
index 6ea6b744e122..a8a0b2090df1 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.1.0
+++ b/metadata/md5-cache/dev-util/kdevelop-5.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.0/src/kdevelop-5.1.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=50f21ef3ad69fdcff04e5cbe8bd15ae2
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.0.0-r1 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.0.0-r1
index 185be2a530eb..68c5de9dd58c 100644
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.0.0-r1
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=!dev-util/kdevelop-pg-qt:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable//2.0.0/src/kdevelop-pg-qt-2.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8009fac19aa17990da516a2a267dada2
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.1.0 b/metadata/md5-cache/dev-util/kdevelop-php-5.1.0
index 4590c2055d90..e45a6ac79761 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.1.0
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/threadweaver-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-util/kdevelop-pg-qt:5 >=dev-util/kdevplatform-5.1.0:5 !dev-util/kdevelop-php-docs dev-util/kdevelop:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.0/src/kdev-php-5.1.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=db9245e754422c5e05ad3f1c00859bb7
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.1.0-r1 b/metadata/md5-cache/dev-util/kdevelop-python-5.1.0-r1
index b4fb3cd5fd29..9c1b08bdc307 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.1.0-r1
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.0/src/kdev-python-5.1.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5076ecc991ab2151e2d7da2f9712aa3f
diff --git a/metadata/md5-cache/dev-util/kdevplatform-5.1.0 b/metadata/md5-cache/dev-util/kdevplatform-5.1.0
index cbc45d6c9944..0d451ba43838 100644
--- a/metadata/md5-cache/dev-util/kdevplatform-5.1.0
+++ b/metadata/md5-cache/dev-util/kdevplatform-5.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( welcomepage )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.0/src/kdevplatform-5.1.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9d76e24c6fb27f342d6c8dd707be8687
diff --git a/metadata/md5-cache/dev-util/qbs-1.8.0-r1 b/metadata/md5-cache/dev-util/qbs-1.8.0-r1
index d60bd7dfdcfb..eb4c329ab382 100644
--- a/metadata/md5-cache/dev-util/qbs-1.8.0-r1
+++ b/metadata/md5-cache/dev-util/qbs-1.8.0-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev
 SLOT=0
 SRC_URI=https://github.com/qt-labs/qbs/archive/v1.8.0.tar.gz -> qbs-1.8.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	40a2ae377c3111aa116512aaf010f6ff	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=fbe2021cb975970e0c6f47ddd24c1e67
+_md5_=5aa23cdf9c2086c8966570fe9e210e03
diff --git a/metadata/md5-cache/dev-util/umockdev-0.8.11 b/metadata/md5-cache/dev-util/umockdev-0.8.11
index 486b9acc22ff..db9c0f4f529f 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.8.11
+++ b/metadata/md5-cache/dev-util/umockdev-0.8.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/libgudev:= virtual/libudev:= >=dev-libs/glib-2.32:2 test? ( || ( dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) app-arch/xz-utils virtual/pkgconfig >=app-portage/elt-patches-20170317
+DEPEND=virtual/libgudev:= virtual/libudev:= >=dev-libs/glib-2.32:2 test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) app-arch/xz-utils virtual/pkgconfig >=app-portage/elt-patches-20170317
 DESCRIPTION=Mock hardware devices for creating unit tests
 EAPI=5
 HOMEPAGE=https://github.com/martinpitt/umockdev/
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/umockdev/trunk/0.8.11/+download/umockdev-0.8.11.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=3f301cf8e4262009918655d8b1489ece
+_md5_=f482c0ad79dcea87d6ad323e1c1a5bf6
diff --git a/metadata/md5-cache/dev-util/watchr-0.7 b/metadata/md5-cache/dev-util/watchr-0.7
index d12fabba4af4..ad60579eba64 100644
--- a/metadata/md5-cache/dev-util/watchr-0.7
+++ b/metadata/md5-cache/dev-util/watchr-0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rev[ruby_targets_ruby21] ) ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/watchr-0.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=eae2839e684e513ca1d579f9b3f47936
diff --git a/metadata/md5-cache/dev-vcs/git-imerge-1.0.0 b/metadata/md5-cache/dev-vcs/git-imerge-1.0.0
index b55ef680aec7..c66446d9dc1b 100644
--- a/metadata/md5-cache/dev-vcs/git-imerge-1.0.0
+++ b/metadata/md5-cache/dev-vcs/git-imerge-1.0.0
@@ -3,12 +3,12 @@ DEPEND=dev-python/docutils
 DESCRIPTION=Incremental merge for git
 EAPI=6
 HOMEPAGE=https://github.com/mhagger/git-imerge
-IUSE=python_targets_python2_7 python_targets_python3_4
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-vcs/git
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/mhagger/git-imerge/archive/v1.0.0.tar.gz -> git-imerge-1.0.0.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=700006910e91c562b2c279d8ba0648a7
+_md5_=3e89bceb7305e1c4de2f39f7ad85d2eb
diff --git a/metadata/md5-cache/dev-vcs/git-num-2.0.1 b/metadata/md5-cache/dev-vcs/git-num-2.0.1
index b1716ec44a69..f98ffb1d0f8e 100644
--- a/metadata/md5-cache/dev-vcs/git-num-2.0.1
+++ b/metadata/md5-cache/dev-vcs/git-num-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/schreifels/git-num/archive/v2.0.1.tar.gz -> git-num-2.0.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7de402b3fdf86ce45bbde2e6557c9a50
diff --git a/metadata/md5-cache/dev-vcs/gitsh-0.11.2 b/metadata/md5-cache/dev-vcs/gitsh-0.11.2
index 9d2ffd60ebdc..904af6422006 100644
--- a/metadata/md5-cache/dev-vcs/gitsh-0.11.2
+++ b/metadata/md5-cache/dev-vcs/gitsh-0.11.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline ruby_targets_ruby21? ( dev-ruby/bundler[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/gitsh/archive/v0.11.2.tar.gz -> gitsh-0.11.2.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bf3b445920ae65def0ef6be7d068a2b8
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0 b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
index 34efaf8abc32..6bf866b984b7 100644
--- a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
+++ b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[sqlite] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion !dev-vcs/kdesvn:4 !kde-apps/kdesdk-kioslaves:4[subversion(-)] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdesvn/2.0.0/kdesvn-2.0.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c3f7d32c1a96e482d5229a2d3ff1127f
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.8.17 b/metadata/md5-cache/dev-vcs/subversion-1.8.17
index bb1dfcdf2e48..df073fcf30ca 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.8.17
+++ b/metadata/md5-cache/dev-vcs/subversion-1.8.17
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) http? ( >=net-libs/serf-1.2.1 ) kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kwallet? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( 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(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) http? ( >=net-libs/serf-1.2.1 ) kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kwallet? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( 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(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Advanced version control system
 EAPI=5
 HOMEPAGE=http://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Subversion GPL-2
-RDEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) http? ( >=net-libs/serf-1.2.1 ) kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kwallet? ( kde-apps/kwalletd:4 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) http? ( >=net-libs/serf-1.2.1 ) kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kwallet? ( || ( ( >=kde-frameworks/kwallet-5.34.0-r1 ) ( kde-apps/kwalletd:4 ) ) ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.8.17.tar.bz2
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	depend.apache	0917334d570e07f9743a04ff85b3bf1b	distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=25f67af52f7f4e107fccdd58cc809931
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	depend.apache	0917334d570e07f9743a04ff85b3bf1b	distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=e581812623bc128a89d1c300bd7956f0
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.9.5 b/metadata/md5-cache/dev-vcs/subversion-1.9.5
index 0ef905e2d786..c2982a481ba7 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.9.5
+++ b/metadata/md5-cache/dev-vcs/subversion-1.9.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kwallet? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( 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(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.3 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kwallet? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( 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(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Advanced version control system
 EAPI=5
 HOMEPAGE=http://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Subversion GPL-2
-RDEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kwallet? ( kde-apps/kwalletd:4 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.3 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kwallet? ( || ( ( >=kde-frameworks/kwallet-5.34.0-r1 ) ( kde-apps/kwalletd:4 ) ) ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.9.5.tar.bz2
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	depend.apache	0917334d570e07f9743a04ff85b3bf1b	distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=84d35fa1b6b306f8cddcea7de3d388a8
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	depend.apache	0917334d570e07f9743a04ff85b3bf1b	distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=83b5efa317fb95b1f6a0c6587246129f
diff --git a/metadata/md5-cache/games-engines/gemrb-0.8.3-r1 b/metadata/md5-cache/games-engines/gemrb-0.8.3-r1
index c361ce13f385..f3ceb8f1b6df 100644
--- a/metadata/md5-cache/games-engines/gemrb-0.8.3-r1
+++ b/metadata/md5-cache/games-engines/gemrb-0.8.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Reimplementation of the Infinity engine
 EAPI=6
 HOMEPAGE=http://gemrb.sourceforge.net/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/freetype media-libs/libpng:0= >=media-libs/libsdl-1.2[video] media-libs/libvorbis media-libs/openal media-libs/sdl-mixer sys-libs/zlib 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/gemrb/gemrb-0.8.3.tar.gz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ec08f2856962681f8bfb6088ff2ae3b7
+_md5_=c9866e85958efdbae768e1779bc98991
diff --git a/metadata/md5-cache/games-misc/lolcat-42.1.43 b/metadata/md5-cache/games-misc/lolcat-42.1.43
index dabcb2562c22..b9aad04cb01c 100644
--- a/metadata/md5-cache/games-misc/lolcat-42.1.43
+++ b/metadata/md5-cache/games-misc/lolcat-42.1.43
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby21] >
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/lolcat-42.1.43.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6bc82bb4d513a324d40a69c98715cb7f
diff --git a/metadata/md5-cache/games-puzzle/sgt-puzzles-20170314 b/metadata/md5-cache/games-puzzle/sgt-puzzles-20170314
index 0cad70e541eb..735c37a0ed17 100644
--- a/metadata/md5-cache/games-puzzle/sgt-puzzles-20170314
+++ b/metadata/md5-cache/games-puzzle/sgt-puzzles-20170314
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
 DEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) dev-lang/perl virtual/pkgconfig doc? ( >=app-doc/halibut-1.0 ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170317 !<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=Simon Tatham's Portable Puzzle Collection
 EAPI=6
-HOMEPAGE=http://www.chiark.greenend.org.uk/~sgtatham/puzzles/
+HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/
 IUSE=+doc gtk3
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-misc/xdg-utils
 SLOT=0
-SRC_URI=http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-20170314.eedea41.tar.gz
+SRC_URI=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-20170314.eedea41.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7eeb51301d3391769b73924496e24f84
+_md5_=84a12a27533df7c5cfd16db1467842da
diff --git a/metadata/md5-cache/games-puzzle/sgt-puzzles-20170506 b/metadata/md5-cache/games-puzzle/sgt-puzzles-20170514
similarity index 78%
rename from metadata/md5-cache/games-puzzle/sgt-puzzles-20170506
rename to metadata/md5-cache/games-puzzle/sgt-puzzles-20170514
index db7c5ca98561..29fd3e053370 100644
--- a/metadata/md5-cache/games-puzzle/sgt-puzzles-20170506
+++ b/metadata/md5-cache/games-puzzle/sgt-puzzles-20170514
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) dev-lang/perl virtual/pkgconfig doc? ( >=app-doc/halibut-1.0 ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170317 !<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=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) dev-lang/perl virtual/pkgconfig doc? ( >=app-doc/halibut-1.2 ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170317 !<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=Simon Tatham's Portable Puzzle Collection
 EAPI=6
-HOMEPAGE=http://www.chiark.greenend.org.uk/~sgtatham/puzzles/
+HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/
 IUSE=+doc gtk3
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-misc/xdg-utils
 SLOT=0
-SRC_URI=http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-20170506.23a5372.tar.gz
+SRC_URI=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-20170514.7bdfda8.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=943e13f7019267dc43f48eed0b99a580
+_md5_=1d4287a266e9014e80607e08c226c792
diff --git a/metadata/md5-cache/games-puzzle/sgt-puzzles-99999999 b/metadata/md5-cache/games-puzzle/sgt-puzzles-99999999
index ab6233b6b5be..22847372b733 100644
--- a/metadata/md5-cache/games-puzzle/sgt-puzzles-99999999
+++ b/metadata/md5-cache/games-puzzle/sgt-puzzles-99999999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) dev-lang/perl virtual/pkgconfig doc? ( >=app-doc/halibut-1.0 ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) dev-lang/perl virtual/pkgconfig doc? ( >=app-doc/halibut-1.2 ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Simon Tatham's Portable Puzzle Collection
 EAPI=6
-HOMEPAGE=http://www.chiark.greenend.org.uk/~sgtatham/puzzles/
+HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/
 IUSE=+doc gtk3
 LICENSE=MIT
 RDEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/sgt-puzzles/sgt-puzzles-icons-20160315.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=943e13f7019267dc43f48eed0b99a580
+_md5_=1d4287a266e9014e80607e08c226c792
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.22.2 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.22.2
index 5bc63610dae8..0a9a0c313058 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.22.2
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.22.2
@@ -11,4 +11,4 @@ REQUIRED_USE=input_devices_wacom? ( udev ) smartcard? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.22/gnome-settings-daemon-3.22.2.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f83bb83794c9d41a81cdc8e722aa40eb
+_md5_=d3b78279c9af37d9bc5c3e0878e710a7
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.0 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.0
index 920dd5c28402..ac2de672e642 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.0
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.0
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gtk+-3.15.3:3 >=gnome-base/gnome-desktop-3.11.1:3= >=gnome-base/gsettings-desktop-schemas-3.23.3 >=gnome-base/librsvg-2.36.2:2 media-fonts/cantarell media-libs/alsa-lib media-libs/fontconfig media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 >=sys-power/upower-0.99:= x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3:= x11-libs/libX11 x11-libs/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc x11-misc/xkeyboard-config >=app-misc/geoclue-2.3.1:2.0 >=dev-libs/libgweather-3.9.5:2= >=sci-geosciences/geocode-glib-3.10 >=sys-auth/polkit-0.103 colord? ( >=media-libs/lcms-2.2:2 >=x11-misc/colord-1.0.2:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20 x11-drivers/xf86-input-wacom virtual/libgudev:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( virtual/libgudev:= ) wayland? ( dev-libs/wayland ) cups? ( sys-apps/sed ) test? ( || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.5 dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) gnome-base/gnome-session ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig x11-proto/inputproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 >=app-portage/elt-patches-20170317 !<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 virtual/pkgconfig virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gtk+-3.15.3:3[X] >=gnome-base/gnome-desktop-3.11.1:3= >=gnome-base/gsettings-desktop-schemas-3.23.3 >=gnome-base/librsvg-2.36.2:2 media-fonts/cantarell media-libs/alsa-lib media-libs/fontconfig media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 >=sys-power/upower-0.99:= x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3:= x11-libs/libX11 x11-libs/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc x11-misc/xkeyboard-config >=app-misc/geoclue-2.3.1:2.0 >=dev-libs/libgweather-3.9.5:2= >=sci-geosciences/geocode-glib-3.10 >=sys-auth/polkit-0.103 colord? ( >=media-libs/lcms-2.2:2 >=x11-misc/colord-1.0.2:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20 x11-drivers/xf86-input-wacom virtual/libgudev:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( virtual/libgudev:= ) wayland? ( dev-libs/wayland ) cups? ( sys-apps/sed ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) || ( ( dev-lang/python:3.6 dev-python/dbusmock[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/dbusmock[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/dbusmock[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbusmock[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) gnome-base/gnome-session ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig x11-proto/inputproto x11-proto/xf86miscproto x11-proto/kbproto >=x11-proto/xproto-7.0.15 >=app-portage/elt-patches-20170317 !<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 virtual/pkgconfig virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Gnome Settings Daemon
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-settings-daemon
 IUSE=+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gtk+-3.15.3:3 >=gnome-base/gnome-desktop-3.11.1:3= >=gnome-base/gsettings-desktop-schemas-3.23.3 >=gnome-base/librsvg-2.36.2:2 media-fonts/cantarell media-libs/alsa-lib media-libs/fontconfig media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 >=sys-power/upower-0.99:= x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3:= x11-libs/libX11 x11-libs/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc x11-misc/xkeyboard-config >=app-misc/geoclue-2.3.1:2.0 >=dev-libs/libgweather-3.9.5:2= >=sci-geosciences/geocode-glib-3.10 >=sys-auth/polkit-0.103 colord? ( >=media-libs/lcms-2.2:2 >=x11-misc/colord-1.0.2:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20 x11-drivers/xf86-input-wacom virtual/libgudev:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( virtual/libgudev:= ) wayland? ( dev-libs/wayland ) gnome-base/dconf !openrc-force? ( sys-apps/systemd ) !<gnome-base/gnome-control-center-2.22 !<gnome-extra/gnome-color-manager-3.1.1 !<gnome-extra/gnome-power-manager-3.1.3 !<gnome-base/gnome-session-3.23.2
+RDEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gtk+-3.15.3:3[X] >=gnome-base/gnome-desktop-3.11.1:3= >=gnome-base/gsettings-desktop-schemas-3.23.3 >=gnome-base/librsvg-2.36.2:2 media-fonts/cantarell media-libs/alsa-lib media-libs/fontconfig media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 >=sys-power/upower-0.99:= x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3:= x11-libs/libX11 x11-libs/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc x11-misc/xkeyboard-config >=app-misc/geoclue-2.3.1:2.0 >=dev-libs/libgweather-3.9.5:2= >=sci-geosciences/geocode-glib-3.10 >=sys-auth/polkit-0.103 colord? ( >=media-libs/lcms-2.2:2 >=x11-misc/colord-1.0.2:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20 x11-drivers/xf86-input-wacom virtual/libgudev:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( virtual/libgudev:= ) wayland? ( dev-libs/wayland ) gnome-base/dconf !openrc-force? ( sys-apps/systemd ) !<gnome-base/gnome-control-center-2.22 !<gnome-extra/gnome-color-manager-3.1.1 !<gnome-extra/gnome-power-manager-3.1.3 !<gnome-base/gnome-session-3.23.2
 REQUIRED_USE=input_devices_wacom? ( udev ) smartcard? ( udev )
+RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.0.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ae164a45eb27a1146716a0c2acdb7493
+_md5_=93f416e93e55921028e42ced15b22d15
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.8.0 b/metadata/md5-cache/gnome-extra/nm-applet-1.8.0
new file mode 100644
index 000000000000..92adf90823c6
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-crypt/libsecret >=dev-libs/glib-2.32:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.4:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:= ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.3 ) >=dev-util/gtk-doc-am-1.0 >=dev-util/intltool-0.50.1 virtual/pkgconfig >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME applet for NetworkManager
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=+introspection gcr modemmanager selinux teamd
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+PDEPEND=virtual/notification-daemon
+RDEPEND=app-crypt/libsecret >=dev-libs/glib-2.32:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.4:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:= ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.0.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=4a03fdef184f8989fd8730cd00085d2a
diff --git a/metadata/md5-cache/kde-apps/akonadi-17.04.1 b/metadata/md5-cache/kde-apps/akonadi-17.04.1
index 2ee09cb4ebff..9cd3c3c4b823 100644
--- a/metadata/md5-cache/kde-apps/akonadi-17.04.1
+++ b/metadata/md5-cache/kde-apps/akonadi-17.04.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( sqlite mysql postgres ) test? ( tools )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/akonadi-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=92c08be39fa1ca18c9c67ac8a12c2f49
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-17.04.1 b/metadata/md5-cache/kde-apps/akonadi-calendar-17.04.1
index 88e1335c037b..98a8ec1aa291 100644
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-17.04.1
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/akonadi-calendar-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=456a8767f183eed2a9880290ad262a27
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-17.04.1 b/metadata/md5-cache/kde-apps/akonadi-contacts-17.04.1
index 7524d1397461..4ee83337d12f 100644
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-17.04.1
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/akonadi-contacts-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=96d5c4236e3ec25bd6da7569b0e8f8b8
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.04.1 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.04.1
index 7657914b8059..5bcea88267a7 100644
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.04.1
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kidentitymanagement-17.04.1:5 >=kde-apps/kmailtransport-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=kde-apps/mailcommon-17.04.1:5 >=kde-apps/mailimporter-17.04.1:5 >=kde-apps/messagelib-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/akonadi-import-wizard-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a60317535390c06e7f0a4ddc54b15878
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-17.04.1 b/metadata/md5-cache/kde-apps/akonadi-mime-17.04.1
index 0913c0d68bb3..023caa2cea51 100644
--- a/metadata/md5-cache/kde-apps/akonadi-mime-17.04.1
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/akonadi-mime-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6c7f50cdec14d9f3c44d88aa36bf0257
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-17.04.1 b/metadata/md5-cache/kde-apps/akonadi-notes-17.04.1
index 44b0f63937f7..678e248e145b 100644
--- a/metadata/md5-cache/kde-apps/akonadi-notes-17.04.1
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/ki18n-5.32.0:5 >=kde-apps/kmime-17.04.1:5 >=dev-qt/qtgu
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/akonadi-notes-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b22ea9689e925a459ddfb91afaae3068
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-17.04.1 b/metadata/md5-cache/kde-apps/akonadi-search-17.04.1
index 2d4b67a1b45d..30a73db889f6 100644
--- a/metadata/md5-cache/kde-apps/akonadi-search-17.04.1
+++ b/metadata/md5-cache/kde-apps/akonadi-search-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/krunner-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-mime-17.04.1:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kmime-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/akonadi-search:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/akonadi-search-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=36acdef9ea362c55b944d7dc733cc10e
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-17.04.1 b/metadata/md5-cache/kde-apps/akonadiconsole-17.04.1
index d8871182c39d..46633d24f940 100644
--- a/metadata/md5-cache/kde-apps/akonadiconsole-17.04.1
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-contacts-17.04.1:5 >=kde-apps/calendarsupport-17.04.1:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kmime-17.04.1:5 >=kde-apps/kpimtextedit-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=kde-apps/messagelib-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/akonadiconsole-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a96ebf6a4ba5a49d428e00a6a979fb20
diff --git a/metadata/md5-cache/kde-apps/akregator-17.04.1 b/metadata/md5-cache/kde-apps/akregator-17.04.1
index b69093948e28..d3085519f1f1 100644
--- a/metadata/md5-cache/kde-apps/akregator-17.04.1
+++ b/metadata/md5-cache/kde-apps/akregator-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/knotifyconfig-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/grantleetheme-17.04.1:5 >=kde-apps/kontactinterface-17.04.1:5 >=kde-apps/kpimtextedit-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=kde-apps/messagelib-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=kde-apps/syndication-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5= >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/akregator-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e51fde181b692ebabf43d517f2e716c3
diff --git a/metadata/md5-cache/kde-apps/analitza-16.12.3 b/metadata/md5-cache/kde-apps/analitza-16.12.3
index 455e2d9da7b6..821639ec1e4f 100644
--- a/metadata/md5-cache/kde-apps/analitza-16.12.3
+++ b/metadata/md5-cache/kde-apps/analitza-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 eigen? ( dev-cpp/eigen:3 ) opengl? ( >=dev-qt/qtopengl-5.6.1:5 virtual/opengl ) >=kde-frameworks/kf-env-4 !kde-apps/analitza:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/analitza-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=99be4abe5bd6220da55c3401c12705ae
diff --git a/metadata/md5-cache/kde-apps/analitza-17.04.1 b/metadata/md5-cache/kde-apps/analitza-17.04.1
index b62bd852d7f0..6030e345978a 100644
--- a/metadata/md5-cache/kde-apps/analitza-17.04.1
+++ b/metadata/md5-cache/kde-apps/analitza-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 !kde-apps/analitza:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/analitza-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7fc60d7456393ed47612bdb53ea9c6f0
diff --git a/metadata/md5-cache/kde-apps/ark-16.12.3 b/metadata/md5-cache/kde-apps/ark-16.12.3
index 442b76102f6c..bab9657f6718 100644
--- a/metadata/md5-cache/kde-apps/ark-16.12.3
+++ b/metadata/md5-cache/kde-apps/ark-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ark-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=74837c56754bd266c55f80ea412da158
diff --git a/metadata/md5-cache/kde-apps/ark-17.04.1 b/metadata/md5-cache/kde-apps/ark-17.04.1
index 8e2601a28194..bfbef85982c3 100644
--- a/metadata/md5-cache/kde-apps/ark-17.04.1
+++ b/metadata/md5-cache/kde-apps/ark-17.04.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kpty-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib?] zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.6.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.32.0:5 handbook? ( >=kde-frameworks/kdoctools-5.32.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kpty-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-arch/libarchive-3.2.0:=[bzip2?,lzma?,zlib?] zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.6.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.32.0:5 handbook? ( >=kde-frameworks/kdoctools-5.32.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Archiving tool
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark
 IUSE=bzip2 lzma zip zlib test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kpty-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib?] zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
+RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kpty-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-arch/libarchive-3.2.0:=[bzip2?,lzma?,zlib?] zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ark-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=6d4b19b063f407b67656147dbc7e7a61
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=0270603f8b5af420dd553c4eda91a12c
diff --git a/metadata/md5-cache/kde-apps/artikulate-16.12.3 b/metadata/md5-cache/kde-apps/artikulate-16.12.3
index fe9d50441341..2b8d8ddba64c 100644
--- a/metadata/md5-cache/kde-apps/artikulate-16.12.3
+++ b/metadata/md5-cache/kde-apps/artikulate-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=k
 REQUIRED_USE=|| ( gstreamer qtmedia )
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/artikulate-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8a4a5671aecf6fd0888dbb7132b6a1b6
diff --git a/metadata/md5-cache/kde-apps/artikulate-17.04.1 b/metadata/md5-cache/kde-apps/artikulate-17.04.1
index 092e5af6b6a5..f490367db589 100644
--- a/metadata/md5-cache/kde-apps/artikulate-17.04.1
+++ b/metadata/md5-cache/kde-apps/artikulate-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=k
 REQUIRED_USE=|| ( gstreamer qtmedia )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/artikulate-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ce5ea3f66994b7f7a75ae85838b5bc72
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-16.12.3 b/metadata/md5-cache/kde-apps/audiocd-kio-16.12.3
index d469c995a126..9dcaf283f89a 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-16.12.3
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-apps/libkcddb-16.12.3:5 >=kde-apps/libkcompactdisc-16.12.3:5 >=dev-qt/qtwidgets-5.6.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 !kde-apps/audiocd-kio:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/audiocd-kio-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9120088aa0429ca51e1937da3f93a489
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-17.04.1 b/metadata/md5-cache/kde-apps/audiocd-kio-17.04.1
index 48c2f28fc389..cb0faeae139a 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-17.04.1
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-apps/libkcddb-17.04.1:5 >=kde-apps/libkcompactdisc-17.04.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/audiocd-kio-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e3894dae788f09a1c4ec327d0103ac8b
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-16.12.3 b/metadata/md5-cache/kde-apps/baloo-widgets-16.12.3
index a41febb14667..15c587984a9e 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-16.12.3
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/baloo-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/baloo-widgets-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=dea209a7f5e0887fff9afdb5c3400b87
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-17.04.1 b/metadata/md5-cache/kde-apps/baloo-widgets-17.04.1
index 6494e933dfa6..db0a39cd12c3 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-17.04.1
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/baloo-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/baloo-widgets-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=dc736f8cf0c286208c145a1414677fed
diff --git a/metadata/md5-cache/kde-apps/blinken-16.12.3 b/metadata/md5-cache/kde-apps/blinken-16.12.3
index 4c8f4cd55c41..41f81b299712 100644
--- a/metadata/md5-cache/kde-apps/blinken-16.12.3
+++ b/metadata/md5-cache/kde-apps/blinken-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-4 !kde-apps/blinken:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/blinken-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ee8a25c505973702a86d7db3f403ca4a
diff --git a/metadata/md5-cache/kde-apps/blinken-17.04.1 b/metadata/md5-cache/kde-apps/blinken-17.04.1
index 4bea0ba8d6d2..b080e3da0514 100644
--- a/metadata/md5-cache/kde-apps/blinken-17.04.1
+++ b/metadata/md5-cache/kde-apps/blinken-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-4 !kde-apps/blinken:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/blinken-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c7ebd6cfe30b110dbecb74db2c05365c
diff --git a/metadata/md5-cache/kde-apps/blogilo-17.04.1 b/metadata/md5-cache/kde-apps/blogilo-17.04.1
index 85413630a98e..670336361365 100644
--- a/metadata/md5-cache/kde-apps/blogilo-17.04.1
+++ b/metadata/md5-cache/kde-apps/blogilo-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/ktexteditor-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/kblog-17.04.1:5 >=kde-apps/kdepim-apps-libs-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=kde-apps/messagelib-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 google? ( >=kde-apps/libkgapi-17.04.1:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/blogilo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/blogilo-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4cfa9bf6ca3ffb481666a200407b2ce9
diff --git a/metadata/md5-cache/kde-apps/bomber-16.12.3 b/metadata/md5-cache/kde-apps/bomber-16.12.3
index bc2bb95b1e0c..36b4488c3402 100644
--- a/metadata/md5-cache/kde-apps/bomber-16.12.3
+++ b/metadata/md5-cache/kde-apps/bomber-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !games-action/xbomber >=kde-frameworks/kf-env-4 !kde-apps/bomber:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/bomber-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4d027261b359e0cc6e8dae98d814a0e4
diff --git a/metadata/md5-cache/kde-apps/bomber-17.04.1 b/metadata/md5-cache/kde-apps/bomber-17.04.1
index ed077510189d..888c9dfbac37 100644
--- a/metadata/md5-cache/kde-apps/bomber-17.04.1
+++ b/metadata/md5-cache/kde-apps/bomber-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !games-action/xbomber >=kde-frameworks/kf-env-4 !kde-apps/bomber:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/bomber-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=afac903baf353556841f0d53aa32a883
diff --git a/metadata/md5-cache/kde-apps/bovo-16.12.3 b/metadata/md5-cache/kde-apps/bovo-16.12.3
index c0e8cde77476..6e74f15426b1 100644
--- a/metadata/md5-cache/kde-apps/bovo-16.12.3
+++ b/metadata/md5-cache/kde-apps/bovo-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/bovo:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/bovo-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=45eec26588970a0332a5120a4c54b028
diff --git a/metadata/md5-cache/kde-apps/bovo-17.04.1 b/metadata/md5-cache/kde-apps/bovo-17.04.1
index 59ff0b9938bc..53bf1beab145 100644
--- a/metadata/md5-cache/kde-apps/bovo-17.04.1
+++ b/metadata/md5-cache/kde-apps/bovo-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/bovo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/bovo-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=df02d34ae13de52187d5ab8b28ddeeaf
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-17.04.1 b/metadata/md5-cache/kde-apps/calendarjanitor-17.04.1
index ac843bc02e13..aa8638aafef7 100644
--- a/metadata/md5-cache/kde-apps/calendarjanitor-17.04.1
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-calendar-17.04.1:5 >=kde-apps/calendarsupport-17.04.1:5 >=kde-apps/kcalcore-17.04.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/akonadi-calendar-tools-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c613940e6fae33207cb852b75ea41bf7
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-17.04.1 b/metadata/md5-cache/kde-apps/calendarsupport-17.04.1
index 205558be19be..9f450d26d0d7 100644
--- a/metadata/md5-cache/kde-apps/calendarsupport-17.04.1
+++ b/metadata/md5-cache/kde-apps/calendarsupport-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-calendar-17.04.1:5 >=kde-apps/akonadi-mime-17.04.1:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kcalutils-17.04.1:5 >=kde-apps/kdepim-apps-libs-17.04.1:5 >=kde-apps/kholidays-17.04.1:5 >=kde-apps/kidentitymanagement-17.04.1:5 >=kde-apps/kmime-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/calendarsupport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/calendarsupport-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ba9fb10488d771fa3c1d8f9b9189d71a
diff --git a/metadata/md5-cache/kde-apps/cantor-16.12.3 b/metadata/md5-cache/kde-apps/cantor-16.12.3
index 86c80c67694c..be35bb6803d2 100644
--- a/metadata/md5-cache/kde-apps/cantor-16.12.3
+++ b/metadata/md5-cache/kde-apps/cantor-16.12.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/cantor-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c0acca64cc821806bba29ac64f7e2eec
diff --git a/metadata/md5-cache/kde-apps/cantor-17.04.1 b/metadata/md5-cache/kde-apps/cantor-17.04.1
index 172d4ed8b6c3..6239fee6eeed 100644
--- a/metadata/md5-cache/kde-apps/cantor-17.04.1
+++ b/metadata/md5-cache/kde-apps/cantor-17.04.1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/cantor-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b9397fbc697266cb0c36f5088572bed3
diff --git a/metadata/md5-cache/kde-apps/cervisia-16.12.3 b/metadata/md5-cache/kde-apps/cervisia-16.12.3
index 49a168ee8960..c0563a54aeb7 100644
--- a/metadata/md5-cache/kde-apps/cervisia-16.12.3
+++ b/metadata/md5-cache/kde-apps/cervisia-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdesu-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kinit-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 !kde-apps/cervisia:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/cervisia-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=08b83d74692b072d3ecfc11e61979b29
diff --git a/metadata/md5-cache/kde-apps/cervisia-17.04.1 b/metadata/md5-cache/kde-apps/cervisia-17.04.1
index 25faba3ff51a..422126b5aec6 100644
--- a/metadata/md5-cache/kde-apps/cervisia-17.04.1
+++ b/metadata/md5-cache/kde-apps/cervisia-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdesu-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kinit-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 !kde-apps/cervisia:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/cervisia-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=57e4030f8303b5ed7e3abeb5b6570b7f
diff --git a/metadata/md5-cache/kde-apps/dolphin-16.12.3 b/metadata/md5-cache/kde-apps/dolphin-16.12.3
index 36736ae4b2ff..faec797c6125 100644
--- a/metadata/md5-cache/kde-apps/dolphin-16.12.3
+++ b/metadata/md5-cache/kde-apps/dolphin-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/dolphin-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c0be460e2332740e8c84c6f571cd8c01
diff --git a/metadata/md5-cache/kde-apps/dolphin-17.04.1 b/metadata/md5-cache/kde-apps/dolphin-17.04.1
index 63f476fbc3b6..6de42b4c4414 100644
--- a/metadata/md5-cache/kde-apps/dolphin-17.04.1
+++ b/metadata/md5-cache/kde-apps/dolphin-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.30.0:5 >=kde-frameworks/kcmutils-5.30.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/dolphin-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5bb603106cf9fdf07755f5654edcc75c
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-16.12.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-16.12.3
index e11cce1ba178..7517c06f1d0c 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-16.12.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/dolphin-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 git? ( >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 ) >=kde-apps/kompare-16.12.3:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 !kde-apps/dolphin-plugins:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/dolphin-plugins-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=94445e4665f0df22d271c02f69afe6e5
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-17.04.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-17.04.1
index 568e6627ab5e..f2dc6c4c6144 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-17.04.1
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/dolphin-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 git? ( >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktexteditor-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 ) >=kde-apps/kompare-17.04.1:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/dolphin-plugins-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ff4e800540ac3fb25b9a904a025442e7
diff --git a/metadata/md5-cache/kde-apps/dragon-16.12.3 b/metadata/md5-cache/kde-apps/dragon-16.12.3
index ca63415f395a..71516c479752 100644
--- a/metadata/md5-cache/kde-apps/dragon-16.12.3
+++ b/metadata/md5-cache/kde-apps/dragon-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-4 !kde-apps/dragon:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/dragon-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8e51970f94c6cb946202786028f09c56
diff --git a/metadata/md5-cache/kde-apps/dragon-17.04.1 b/metadata/md5-cache/kde-apps/dragon-17.04.1
index ae0e8c2c199b..89ea35bd15f3 100644
--- a/metadata/md5-cache/kde-apps/dragon-17.04.1
+++ b/metadata/md5-cache/kde-apps/dragon-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-frameworks/solid-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-4 !kde-apps/dragon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/dragon-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=98a0cbbc35f32ebbb50e385c6e7be03d
diff --git a/metadata/md5-cache/kde-apps/eventviews-17.04.1 b/metadata/md5-cache/kde-apps/eventviews-17.04.1
index f1d267b92dc1..0f67ef827e3f 100644
--- a/metadata/md5-cache/kde-apps/eventviews-17.04.1
+++ b/metadata/md5-cache/kde-apps/eventviews-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-calendar-17.04.1:5 >=kde-apps/calendarsupport-17.04.1:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kcalutils-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kmime-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/eventviews:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/eventviews-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a3dacee82377964b1612a2206c7bfef3
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-16.12.3 b/metadata/md5-cache/kde-apps/ffmpegthumbs-16.12.3
index 5247eed9cab6..613b8f3900f1 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-16.12.3
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ffmpegthumbs-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1c2943d5b9c84e3acce732dd18a638a8
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.04.1 b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.04.1
index 3941bee85d2c..08b296d9d684 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.04.1
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ffmpegthumbs-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3175d8010d01dd641df6183b354bc27e
diff --git a/metadata/md5-cache/kde-apps/filelight-16.12.3 b/metadata/md5-cache/kde-apps/filelight-16.12.3
index c4ae27934d07..946f72a38733 100644
--- a/metadata/md5-cache/kde-apps/filelight-16.12.3
+++ b/metadata/md5-cache/kde-apps/filelight-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/filelight:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/filelight-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b2fbbc7234253277e83cac6bafa4e92b
diff --git a/metadata/md5-cache/kde-apps/filelight-17.04.1 b/metadata/md5-cache/kde-apps/filelight-17.04.1
index 4129d99de44c..dd1e098f922d 100644
--- a/metadata/md5-cache/kde-apps/filelight-17.04.1
+++ b/metadata/md5-cache/kde-apps/filelight-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/filelight:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/filelight-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1b0f83a631cb9484faa82acf44d07b5e
diff --git a/metadata/md5-cache/kde-apps/granatier-16.12.3 b/metadata/md5-cache/kde-apps/granatier-16.12.3
index 3803611bc5e4..730ab9985ca0 100644
--- a/metadata/md5-cache/kde-apps/granatier-16.12.3
+++ b/metadata/md5-cache/kde-apps/granatier-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/granatier:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/granatier-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=896d22fefd0bc8454e05f2dbab270112
diff --git a/metadata/md5-cache/kde-apps/granatier-17.04.1 b/metadata/md5-cache/kde-apps/granatier-17.04.1
index 735d0e1d286a..fdb84bf65f50 100644
--- a/metadata/md5-cache/kde-apps/granatier-17.04.1
+++ b/metadata/md5-cache/kde-apps/granatier-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/granatier:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/granatier-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=51567d434d6fad5b41cf74d1242c701f
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-17.04.1 b/metadata/md5-cache/kde-apps/grantlee-editor-17.04.1
index cbe6415c8611..19df2049033f 100644
--- a/metadata/md5-cache/kde-apps/grantlee-editor-17.04.1
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/ktexteditor-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-contacts-17.04.1:5 >=kde-apps/kblog-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kmime-17.04.1:5 >=kde-apps/kpimtextedit-17.04.1:5 >=kde-apps/messagelib-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/grantlee-editor-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f3db0dc576b475068e648ef0ae9a3cc5
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-17.04.1 b/metadata/md5-cache/kde-apps/grantleetheme-17.04.1
index 81c5dec3bac4..334c4ca56375 100644
--- a/metadata/md5-cache/kde-apps/grantleetheme-17.04.1
+++ b/metadata/md5-cache/kde-apps/grantleetheme-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/grantleetheme-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=303b3c51981be94e40bb5dd882d6c864
diff --git a/metadata/md5-cache/kde-apps/gwenview-16.12.3 b/metadata/md5-cache/kde-apps/gwenview-16.12.3
index e3671381459c..1a7c57e45230 100644
--- a/metadata/md5-cache/kde-apps/gwenview-16.12.3
+++ b/metadata/md5-cache/kde-apps/gwenview-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kcompletion-5.29.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/gwenview-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=95aebec900e1a31c4c62235334cb3a05
diff --git a/metadata/md5-cache/kde-apps/gwenview-17.04.1 b/metadata/md5-cache/kde-apps/gwenview-17.04.1
index 297ad7e2636c..e8f096e2eaa7 100644
--- a/metadata/md5-cache/kde-apps/gwenview-17.04.1
+++ b/metadata/md5-cache/kde-apps/gwenview-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.32.0:5 >=kde-frameworks/kcompletion-5.32.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/gwenview-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d7c193052c96d0376e6049a4f17c7da6
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-17.04.1 b/metadata/md5-cache/kde-apps/incidenceeditor-17.04.1
index 74e21dd1ffa0..74c327d9233f 100644
--- a/metadata/md5-cache/kde-apps/incidenceeditor-17.04.1
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-calendar-17.04.1:5 >=kde-apps/akonadi-contacts-17.04.1:5 >=kde-apps/akonadi-mime-17.04.1:5 >=kde-apps/calendarsupport-17.04.1:5 >=kde-apps/eventviews-17.04.1:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kcalutils-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kdepim-apps-libs-17.04.1:5 >=kde-apps/kidentitymanagement-17.04.1:5 >=kde-apps/kldap-17.04.1:5 >=kde-apps/kmailtransport-17.04.1:5 >=kde-apps/kmime-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/incidenceeditor-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d073386cad57c39fec74093a7d7c308f
diff --git a/metadata/md5-cache/kde-apps/k3b-17.04.1 b/metadata/md5-cache/kde-apps/k3b-17.04.1
index c7d356487954..6cdd39793b44 100644
--- a/metadata/md5-cache/kde-apps/k3b-17.04.1
+++ b/metadata/md5-cache/kde-apps/k3b-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kbookmarks-5.32.0:5
 REQUIRED_USE=mp3? ( encode ) sox? ( encode )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/k3b-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ce1b712ca1c34c91ed63fd95059ef95b
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-16.12.3 b/metadata/md5-cache/kde-apps/kaccounts-integration-16.12.3
index 19326e372835..b8acff7aa9cc 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-16.12.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kaccounts-integration-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6c66ca8e2671ba7f42cd47d3b08e2fcf
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-17.04.1 b/metadata/md5-cache/kde-apps/kaccounts-integration-17.04.1
index f3ca196cd723..17cafc0e0773 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-17.04.1
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kaccounts-integration-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6f7a32fb67105217e546530226b47de2
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-16.12.3 b/metadata/md5-cache/kde-apps/kaccounts-providers-16.12.3
index 0a6b6b0e602d..3340f4af31e2 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-16.12.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-16.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kpackage-5.29.0:5 >=kde-apps/kaccounts-integration-16.12.3:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 net-im/telepathy-connection-managers[xmpp] net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 !kde-apps/kaccounts-providers:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kaccounts-providers-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8b584750e0ac281721bcde122104e2e8
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-17.04.1 b/metadata/md5-cache/kde-apps/kaccounts-providers-17.04.1
index 212f747f55f4..89f2bbe26b92 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-17.04.1
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-17.04.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdeclarative-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kpackage-5.32.0:5 >=kde-apps/kaccounts-integration-17.04.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 net-im/telepathy-connection-managers[xmpp] net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kaccounts-providers-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6f327ec521a489364df77d6080c2add2
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-17.04.1 b/metadata/md5-cache/kde-apps/kaddressbook-17.04.1
index 2a125332340a..3d368aa5eb93 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-17.04.1
+++ b/metadata/md5-cache/kde-apps/kaddressbook-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-contacts-17.04.1:5 >=kde-apps/akonadi-search-17.04.1:5 >=kde-apps/grantleetheme-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kdepim-apps-libs-17.04.1:5 >=kde-apps/kontactinterface-17.04.1:5 >=kde-apps/libgravatar-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 prison? ( >=kde-frameworks/prison-5.32.0:5 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.04.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kaddressbook:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kaddressbook-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=77c09d0c9f5104acfe565023e33ef20a
diff --git a/metadata/md5-cache/kde-apps/kajongg-17.04.1 b/metadata/md5-cache/kde-apps/kajongg-17.04.1
index c2d9ee7acb23..cacf7b4b5bce 100644
--- a/metadata/md5-cache/kde-apps/kajongg-17.04.1
+++ b/metadata/md5-cache/kde-apps/kajongg-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kajongg-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7acd0534c3002c03ad91fa3ea86e3dc7
diff --git a/metadata/md5-cache/kde-apps/kalarm-17.04.1 b/metadata/md5-cache/kde-apps/kalarm-17.04.1
index 8ecd67c0b25a..9599356a9822 100644
--- a/metadata/md5-cache/kde-apps/kalarm-17.04.1
+++ b/metadata/md5-cache/kde-apps/kalarm-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kauth-5.32.0:5 >=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-contacts-17.04.1:5 >=kde-apps/akonadi-mime-17.04.1:5 >=kde-apps/kalarmcal-17.04.1:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kcalutils-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kdepim-apps-libs-17.04.1:5 >=kde-apps/kholidays-17.04.1:5 >=kde-apps/kidentitymanagement-17.04.1:5 >=kde-apps/kmailtransport-17.04.1:5 >=kde-apps/kmime-17.04.1:5 >=kde-apps/kontactinterface-17.04.1:5 >=kde-apps/kpimtextedit-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=kde-apps/mailcommon-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libxslt media-libs/phonon[qt5] X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.04.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kalarm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kalarm-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ef26564c91c772ea72eee5f44af0e4a2
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-17.04.1 b/metadata/md5-cache/kde-apps/kalarmcal-17.04.1
index 5bb14ee44fcb..970fa7ae87ab 100644
--- a/metadata/md5-cache/kde-apps/kalarmcal-17.04.1
+++ b/metadata/md5-cache/kde-apps/kalarmcal-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kholidays-17.04.1:5 >=kde-apps/kidentitymanagement-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kalarmcal:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kalarmcal-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=09dfff195a5386bf81e2df6837004aa9
diff --git a/metadata/md5-cache/kde-apps/kalgebra-16.12.3 b/metadata/md5-cache/kde-apps/kalgebra-16.12.3
index 903698c190e5..745c7718f7e5 100644
--- a/metadata/md5-cache/kde-apps/kalgebra-16.12.3
+++ b/metadata/md5-cache/kde-apps/kalgebra-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/analitza-16.12.3:5[opengl?] >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 opengl? ( >=dev-qt/qtopengl-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 virtual/glu ) readline? ( sys-libs/readline:0= ) !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 !kde-apps/kalgebra:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kalgebra-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2474d21ffc72b2d6a75f92e98519c19d
diff --git a/metadata/md5-cache/kde-apps/kalgebra-17.04.1 b/metadata/md5-cache/kde-apps/kalgebra-17.04.1
index 1a44202d9d8f..687531745560 100644
--- a/metadata/md5-cache/kde-apps/kalgebra-17.04.1
+++ b/metadata/md5-cache/kde-apps/kalgebra-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/analitza-17.04.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 readline? ( sys-libs/readline:0= ) >=dev-qt/qtquickcontrols-5.6.1:5 dev-libs/kirigami:2 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 !kde-apps/kalgebra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kalgebra-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fbe9f76ae6baa5ba39be02ca1f20067f
diff --git a/metadata/md5-cache/kde-apps/kalzium-16.12.3 b/metadata/md5-cache/kde-apps/kalzium-16.12.3
index f9e7e7592caf..2a7b3fe34837 100644
--- a/metadata/md5-cache/kde-apps/kalzium-16.12.3
+++ b/metadata/md5-cache/kde-apps/kalzium-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/khtml-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kplotting-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kunitconversion-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 editor? ( dev-cpp/eigen:3 sci-chemistry/avogadro sci-chemistry/openbabel ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 !kde-apps/kalzium:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kalzium-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2ea561dddf631ea8e8cf4463731a548e
diff --git a/metadata/md5-cache/kde-apps/kalzium-17.04.1 b/metadata/md5-cache/kde-apps/kalzium-17.04.1
index 0a41a173b507..431fe37182ae 100644
--- a/metadata/md5-cache/kde-apps/kalzium-17.04.1
+++ b/metadata/md5-cache/kde-apps/kalzium-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/khtml-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/kplotting-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kunitconversion-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 editor? ( dev-cpp/eigen:3 || ( sci-libs/avogadrolibs sci-chemistry/avogadro ) sci-chemistry/openbabel ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kalzium-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7fcdd1aa9844775a338518cd285eb811
diff --git a/metadata/md5-cache/kde-apps/kamera-16.12.3 b/metadata/md5-cache/kde-apps/kamera-16.12.3
index 92962fdf8897..3e5d84297e7f 100644
--- a/metadata/md5-cache/kde-apps/kamera-16.12.3
+++ b/metadata/md5-cache/kde-apps/kamera-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 !kde-apps/kamera:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kamera-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e429e8862b9391b41b9499f98b92d9a8
diff --git a/metadata/md5-cache/kde-apps/kamera-17.04.1 b/metadata/md5-cache/kde-apps/kamera-17.04.1
index c3a8071a3c7d..b32ab2b3ecb1 100644
--- a/metadata/md5-cache/kde-apps/kamera-17.04.1
+++ b/metadata/md5-cache/kde-apps/kamera-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 !kde-apps/kamera:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kamera-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=09d5890772fb4fc7ea581d06314ef0a8
diff --git a/metadata/md5-cache/kde-apps/kanagram-16.12.3 b/metadata/md5-cache/kde-apps/kanagram-16.12.3
index 9c0c8b8719d6..0bbb878d7263 100644
--- a/metadata/md5-cache/kde-apps/kanagram-16.12.3
+++ b/metadata/md5-cache/kde-apps/kanagram-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/sonnet-5.29.0:5 >=kde-apps/libkeduvocdocument-16.12.3:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/phonon[qt5] >=kde-apps/kdeedu-data-16.12.3:5 >=dev-qt/qtmultimedia-5.6.1:5[qml] >=dev-qt/qtquickcontrols-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kanagram:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kanagram-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=544a52a5d9f5458ab03c766a06128810
diff --git a/metadata/md5-cache/kde-apps/kanagram-17.04.1 b/metadata/md5-cache/kde-apps/kanagram-17.04.1
index 5ed96b8512c9..dabc66070e36 100644
--- a/metadata/md5-cache/kde-apps/kanagram-17.04.1
+++ b/metadata/md5-cache/kde-apps/kanagram-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdeclarative-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-frameworks/sonnet-5.32.0:5 >=kde-apps/libkeduvocdocument-17.04.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/phonon[qt5] >=kde-apps/kdeedu-data-17.04.1:5 >=dev-qt/qtmultimedia-5.6.1:5[qml] >=dev-qt/qtquickcontrols-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kanagram-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9d3894ccf985224d013d2510f73628f7
diff --git a/metadata/md5-cache/kde-apps/kapman-16.12.3 b/metadata/md5-cache/kde-apps/kapman-16.12.3
index 5f1c3a3cc285..cc3b69117423 100644
--- a/metadata/md5-cache/kde-apps/kapman-16.12.3
+++ b/metadata/md5-cache/kde-apps/kapman-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kapman:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kapman-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4343e6f24928653d96e2be0a89457675
diff --git a/metadata/md5-cache/kde-apps/kapman-17.04.1 b/metadata/md5-cache/kde-apps/kapman-17.04.1
index 0e36cae60e4a..7211720780bf 100644
--- a/metadata/md5-cache/kde-apps/kapman-17.04.1
+++ b/metadata/md5-cache/kde-apps/kapman-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kapman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kapman-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=511d2fa32307900eceac13fb5ccfe045
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-16.12.3 b/metadata/md5-cache/kde-apps/kapptemplate-16.12.3
index c2b0537e2c5a..7b73b7598add 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-16.12.3
+++ b/metadata/md5-cache/kde-apps/kapptemplate-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kapptemplate:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kapptemplate-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=55aa65ba784cb8ebaad658522b81a171
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-17.04.1 b/metadata/md5-cache/kde-apps/kapptemplate-17.04.1
index a6a6b5450917..1b4210fb02de 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-17.04.1
+++ b/metadata/md5-cache/kde-apps/kapptemplate-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kapptemplate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kapptemplate-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9d97dbdf6ad8ceaabe7f1794fd23cc80
diff --git a/metadata/md5-cache/kde-apps/kate-16.12.3 b/metadata/md5-cache/kde-apps/kate-16.12.3
index 5dfa207276dc..b2cecf04d1c2 100644
--- a/metadata/md5-cache/kde-apps/kate-16.12.3
+++ b/metadata/md5-cache/kde-apps/kate-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 addons? ( >=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/threadweaver-5.29.0:5 >=dev-qt/qtsql-5.6.1:5 >=dev-libs/libgit2-0.22.0:=[threads] ) >=kde-frameworks/kf-env-4 !kde-apps/kate:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kate-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8eb409eb07773f7065e4cd5b4437c883
diff --git a/metadata/md5-cache/kde-apps/kate-17.04.1 b/metadata/md5-cache/kde-apps/kate-17.04.1
index c5681a4f81c2..a28c81a7c460 100644
--- a/metadata/md5-cache/kde-apps/kate-17.04.1
+++ b/metadata/md5-cache/kde-apps/kate-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktexteditor-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 addons? ( >=kde-frameworks/kbookmarks-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/plasma-5.32.0:5 >=kde-frameworks/threadweaver-5.32.0:5 >=dev-qt/qtsql-5.6.1:5 >=dev-libs/libgit2-0.22.0:=[threads] ) >=kde-frameworks/kf-env-4 !kde-apps/kate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kate-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=26c1d9ad3f33f7bb267938fae12d9f2a
diff --git a/metadata/md5-cache/kde-apps/katomic-16.12.3 b/metadata/md5-cache/kde-apps/katomic-16.12.3
index a6111f64f1a0..d68277073af1 100644
--- a/metadata/md5-cache/kde-apps/katomic-16.12.3
+++ b/metadata/md5-cache/kde-apps/katomic-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/katomic:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/katomic-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=81f0a7a743b837bfe85e97f069cda7b9
diff --git a/metadata/md5-cache/kde-apps/katomic-17.04.1 b/metadata/md5-cache/kde-apps/katomic-17.04.1
index 20a94e85a1e6..545caf17347c 100644
--- a/metadata/md5-cache/kde-apps/katomic-17.04.1
+++ b/metadata/md5-cache/kde-apps/katomic-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/katomic-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=bd9394b7e4365dfc7b3f50cd9b353ebd
diff --git a/metadata/md5-cache/kde-apps/kblackbox-16.12.3 b/metadata/md5-cache/kde-apps/kblackbox-16.12.3
index a71f2e62699d..e23fe22a0e57 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-16.12.3
+++ b/metadata/md5-cache/kde-apps/kblackbox-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kblackbox:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kblackbox-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=bc615d9daaad69e2d4f855149a78e74e
diff --git a/metadata/md5-cache/kde-apps/kblackbox-17.04.1 b/metadata/md5-cache/kde-apps/kblackbox-17.04.1
index 9f02223e728e..2c4e7b7ef2fc 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-17.04.1
+++ b/metadata/md5-cache/kde-apps/kblackbox-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kblackbox-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=bc8679a89009133d354a5e172cb09f72
diff --git a/metadata/md5-cache/kde-apps/kblocks-16.12.3 b/metadata/md5-cache/kde-apps/kblocks-16.12.3
index e02311372229..bc3fc8638f48 100644
--- a/metadata/md5-cache/kde-apps/kblocks-16.12.3
+++ b/metadata/md5-cache/kde-apps/kblocks-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kblocks:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kblocks-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3023c64a01f20a0c57f69b68c6299b08
diff --git a/metadata/md5-cache/kde-apps/kblocks-17.04.1 b/metadata/md5-cache/kde-apps/kblocks-17.04.1
index 70b9d69671d0..db7d63787ab3 100644
--- a/metadata/md5-cache/kde-apps/kblocks-17.04.1
+++ b/metadata/md5-cache/kde-apps/kblocks-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kblocks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kblocks-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=96f4647d6e2e3ca37660fb414a0ca1ed
diff --git a/metadata/md5-cache/kde-apps/kblog-17.04.1 b/metadata/md5-cache/kde-apps/kblog-17.04.1
index 0a7a95d4ba55..512143b9df54 100644
--- a/metadata/md5-cache/kde-apps/kblog-17.04.1
+++ b/metadata/md5-cache/kde-apps/kblog-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kxmlrpcclient-5.32.0:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/syndication-17.04.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kblog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kblog-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=69afb689d7d8696a15785e18b0800e92
diff --git a/metadata/md5-cache/kde-apps/kbounce-16.12.3 b/metadata/md5-cache/kde-apps/kbounce-16.12.3
index c981f3166957..b44244ba1868 100644
--- a/metadata/md5-cache/kde-apps/kbounce-16.12.3
+++ b/metadata/md5-cache/kde-apps/kbounce-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kbounce:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kbounce-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0c156f4592c6e5c622c87bf3d0c92ff0
diff --git a/metadata/md5-cache/kde-apps/kbounce-17.04.1 b/metadata/md5-cache/kde-apps/kbounce-17.04.1
index 635ab0616f24..ff5e8e986c16 100644
--- a/metadata/md5-cache/kde-apps/kbounce-17.04.1
+++ b/metadata/md5-cache/kde-apps/kbounce-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kbounce-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1b7c2b257d09d4f5e573ce4accb93dc2
diff --git a/metadata/md5-cache/kde-apps/kbreakout-16.12.3 b/metadata/md5-cache/kde-apps/kbreakout-16.12.3
index f375fd72d858..34aaa598144b 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-16.12.3
+++ b/metadata/md5-cache/kde-apps/kbreakout-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kbreakout:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kbreakout-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fc73339357235cf8629ab2859463098b
diff --git a/metadata/md5-cache/kde-apps/kbreakout-17.04.1 b/metadata/md5-cache/kde-apps/kbreakout-17.04.1
index 16a5d84e14be..3d4495bdcb4f 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-17.04.1
+++ b/metadata/md5-cache/kde-apps/kbreakout-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kbreakout:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kbreakout-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=bce51ff72f645818703b2d3de80b18b7
diff --git a/metadata/md5-cache/kde-apps/kbruch-16.12.3 b/metadata/md5-cache/kde-apps/kbruch-16.12.3
index 024efaa5d919..3acc8ba67ecb 100644
--- a/metadata/md5-cache/kde-apps/kbruch-16.12.3
+++ b/metadata/md5-cache/kde-apps/kbruch-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kbruch:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kbruch-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d2987bb83cccc940f58193fe801236ff
diff --git a/metadata/md5-cache/kde-apps/kbruch-17.04.1 b/metadata/md5-cache/kde-apps/kbruch-17.04.1
index b2c2e020654c..16686510f03f 100644
--- a/metadata/md5-cache/kde-apps/kbruch-17.04.1
+++ b/metadata/md5-cache/kde-apps/kbruch-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kbruch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kbruch-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8aea660b0eac1a181f7b234d7f05a70e
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-17.04.1 b/metadata/md5-cache/kde-apps/kcachegrind-17.04.1
index 6fe5a43d97b6..adda4d50cfec 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-17.04.1
+++ b/metadata/md5-cache/kde-apps/kcachegrind-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 !kde-apps/kcachegrind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kcachegrind-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=dfa0532f9d74f1bf591dfaabb7b2575e
diff --git a/metadata/md5-cache/kde-apps/kcalc-16.12.3 b/metadata/md5-cache/kde-apps/kcalc-16.12.3
index fbef87d5d220..0635d49b2e7c 100644
--- a/metadata/md5-cache/kde-apps/kcalc-16.12.3
+++ b/metadata/md5-cache/kde-apps/kcalc-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kinit-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 !kde-apps/kcalc:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kcalc-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7e56d69fbe8cb9ee20e2d9b8e2c06611
diff --git a/metadata/md5-cache/kde-apps/kcalc-17.04.1 b/metadata/md5-cache/kde-apps/kcalc-17.04.1
index e1b3be655f27..783123e821bd 100644
--- a/metadata/md5-cache/kde-apps/kcalc-17.04.1
+++ b/metadata/md5-cache/kde-apps/kcalc-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kinit-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 !kde-apps/kcalc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kcalc-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b0c23c413f9a7f9f52a0af47ad76fcc6
diff --git a/metadata/md5-cache/kde-apps/kcalcore-16.12.3 b/metadata/md5-cache/kde-apps/kcalcore-16.12.3
index e5aa84a06ba7..a2bb8a212f75 100644
--- a/metadata/md5-cache/kde-apps/kcalcore-16.12.3
+++ b/metadata/md5-cache/kde-apps/kcalcore-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kcalcore-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a582123986a7d4a21da586b251208457
diff --git a/metadata/md5-cache/kde-apps/kcalcore-17.04.1 b/metadata/md5-cache/kde-apps/kcalcore-17.04.1
index b34fab578f46..f11239dbadd9 100644
--- a/metadata/md5-cache/kde-apps/kcalcore-17.04.1
+++ b/metadata/md5-cache/kde-apps/kcalcore-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kcalcore-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=cd7b98d11f82108746e22f85b9d3438a
diff --git a/metadata/md5-cache/kde-apps/kcalutils-17.04.1 b/metadata/md5-cache/kde-apps/kcalutils-17.04.1
index 0b9cea9b9c65..ceb07e3a075c 100644
--- a/metadata/md5-cache/kde-apps/kcalutils-17.04.1
+++ b/metadata/md5-cache/kde-apps/kcalutils-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kcalutils-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=aabcb5b45370fcd14d7213ea2423950c
diff --git a/metadata/md5-cache/kde-apps/kcharselect-16.12.3 b/metadata/md5-cache/kde-apps/kcharselect-16.12.3
index a42a04e45e41..3a4effec02d4 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-16.12.3
+++ b/metadata/md5-cache/kde-apps/kcharselect-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kcharselect:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kcharselect-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7946be3cfb0b8a064f1016768bb45d14
diff --git a/metadata/md5-cache/kde-apps/kcharselect-17.04.1 b/metadata/md5-cache/kde-apps/kcharselect-17.04.1
index 4e8a3207a82e..2cd9dedd004c 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-17.04.1
+++ b/metadata/md5-cache/kde-apps/kcharselect-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kcharselect:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kcharselect-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=af17a179f871a802a41fc912a67b86b0
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-16.12.3 b/metadata/md5-cache/kde-apps/kcolorchooser-16.12.3
index 9816a12a5b0b..e8ef905691df 100644
--- a/metadata/md5-cache/kde-apps/kcolorchooser-16.12.3
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-16.12.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kcolorchooser:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kcolorchooser-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c380cbbd11a3c7500a38a4bbedfc10da
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-17.04.1 b/metadata/md5-cache/kde-apps/kcolorchooser-17.04.1
index bf2d267a432e..facce80131f5 100644
--- a/metadata/md5-cache/kde-apps/kcolorchooser-17.04.1
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-17.04.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kcolorchooser-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e4c1358970d0e04611e0ef83becc2f63
diff --git a/metadata/md5-cache/kde-apps/kcontacts-17.04.1 b/metadata/md5-cache/kde-apps/kcontacts-17.04.1
index 74a68d671fb7..ffb87cf26ce2 100644
--- a/metadata/md5-cache/kde-apps/kcontacts-17.04.1
+++ b/metadata/md5-cache/kde-apps/kcontacts-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kcontacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kcontacts-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5e2eeb5de748842614cfb7a5af9aa55f
diff --git a/metadata/md5-cache/kde-apps/kcron-16.12.3 b/metadata/md5-cache/kde-apps/kcron-16.12.3
index 06b2a96e74f4..776a9f9a149a 100644
--- a/metadata/md5-cache/kde-apps/kcron-16.12.3
+++ b/metadata/md5-cache/kde-apps/kcron-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 !kde-apps/kcron:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kcron-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=adfff0ed561cc05fa8d134120e419fd8
diff --git a/metadata/md5-cache/kde-apps/kcron-17.04.1 b/metadata/md5-cache/kde-apps/kcron-17.04.1
index 224927cd876c..0ef321fc7b60 100644
--- a/metadata/md5-cache/kde-apps/kcron-17.04.1
+++ b/metadata/md5-cache/kde-apps/kcron-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 !kde-apps/kcron:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kcron-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8b90d1926d3b289ce550d733b62425da
diff --git a/metadata/md5-cache/kde-apps/kdav-17.04.1 b/metadata/md5-cache/kde-apps/kdav-17.04.1
index 64e9c2dfe076..1802b59ea0fa 100644
--- a/metadata/md5-cache/kde-apps/kdav-17.04.1
+++ b/metadata/md5-cache/kde-apps/kdav-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=dev-qt/qtxmlpatterns-5.6.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kdav:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdav-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9143531d79eef98b1720f5264d13f0cf
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-16.12.3 b/metadata/md5-cache/kde-apps/kde-dev-scripts-16.12.3
index 6d034bcc7002..29ae88b00b02 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-16.12.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 !kde-apps/kde-dev-scripts:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kde-dev-scripts-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4d3c5a24b0769ccf9f57a03a751253c0
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.04.1 b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.04.1
index 02e0f11d0921..3eaf7ff79129 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.04.1
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kde-dev-scripts-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=29d2d57c01899ebcd8ba1a2f270915a0
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-17.04.1 b/metadata/md5-cache/kde-apps/kde-dev-utils-17.04.1
index 09193ad94533..177522604292 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-17.04.1
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kde-dev-utils-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d47c69e9b841db270580600c101dac1d
diff --git a/metadata/md5-cache/kde-apps/kde-l10n-16.12.3 b/metadata/md5-cache/kde-apps/kde-l10n-16.12.3
index 41baa0993256..8a5603d0bd9b 100644
--- a/metadata/md5-cache/kde-apps/kde-l10n-16.12.3
+++ b/metadata/md5-cache/kde-apps/kde-l10n-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde4-l10n-16.12.3 !<kde-apps/kdepim-l10n-16.12.3:5 !<=kde-apps/khelpcenter-5.6.2 !kde-apps/ktp-accounts-kcm:4 !kde-apps/ktp-approver:4 !kde-apps/ktp-auth-handler:4 !kde-apps/ktp-common-internals:4 !kde-apps/ktp-contact-list:4 !kde-apps/ktp-filetransfer-handler:4 !kde-apps/ktp-kded-module:4 !kde-apps/ktp-l10n !kde-apps/ktp-send-file:4 !kde-apps/ktp-text-ui:4 !<kde-apps/kwave-16.11.50 >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=l10n_ar? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ar-16.12.3.tar.xz ) l10n_ast? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ast-16.12.3.tar.xz ) l10n_bg? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-bg-16.12.3.tar.xz ) l10n_bs? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-bs-16.12.3.tar.xz ) l10n_ca? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ca-16.12.3.tar.xz ) l10n_ca-valencia? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ca@valencia-16.12.3.tar.xz ) l10n_cs? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-cs-16.12.3.tar.xz ) l10n_da? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-da-16.12.3.tar.xz ) l10n_de? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-de-16.12.3.tar.xz ) l10n_el? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-el-16.12.3.tar.xz ) l10n_en-GB? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-en_GB-16.12.3.tar.xz ) l10n_eo? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-eo-16.12.3.tar.xz ) l10n_es? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-es-16.12.3.tar.xz ) l10n_et? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-et-16.12.3.tar.xz ) l10n_eu? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-eu-16.12.3.tar.xz ) l10n_fa? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-fa-16.12.3.tar.xz ) l10n_fi? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-fi-16.12.3.tar.xz ) l10n_fr? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-fr-16.12.3.tar.xz ) l10n_ga? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ga-16.12.3.tar.xz ) l10n_gl? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-gl-16.12.3.tar.xz ) l10n_he? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-he-16.12.3.tar.xz ) l10n_hi? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-hi-16.12.3.tar.xz ) l10n_hr? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-hr-16.12.3.tar.xz ) l10n_hu? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-hu-16.12.3.tar.xz ) l10n_ia? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ia-16.12.3.tar.xz ) l10n_id? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-id-16.12.3.tar.xz ) l10n_is? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-is-16.12.3.tar.xz ) l10n_it? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-it-16.12.3.tar.xz ) l10n_ja? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ja-16.12.3.tar.xz ) l10n_kk? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-kk-16.12.3.tar.xz ) l10n_km? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-km-16.12.3.tar.xz ) l10n_ko? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ko-16.12.3.tar.xz ) l10n_lt? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-lt-16.12.3.tar.xz ) l10n_lv? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-lv-16.12.3.tar.xz ) l10n_mr? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-mr-16.12.3.tar.xz ) l10n_nb? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-nb-16.12.3.tar.xz ) l10n_nds? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-nds-16.12.3.tar.xz ) l10n_nl? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-nl-16.12.3.tar.xz ) l10n_nn? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-nn-16.12.3.tar.xz ) l10n_pa? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-pa-16.12.3.tar.xz ) l10n_pl? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-pl-16.12.3.tar.xz ) l10n_pt? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-pt-16.12.3.tar.xz ) l10n_pt-BR? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-pt_BR-16.12.3.tar.xz ) l10n_ro? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ro-16.12.3.tar.xz ) l10n_ru? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ru-16.12.3.tar.xz ) l10n_sk? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sk-16.12.3.tar.xz ) l10n_sl? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sl-16.12.3.tar.xz ) l10n_sr? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sr-16.12.3.tar.xz ) l10n_sr-ijekavsk? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sr-16.12.3.tar.xz ) l10n_sr-Latn? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sr-16.12.3.tar.xz ) l10n_sr-Latn-ijekavsk? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sr-16.12.3.tar.xz ) l10n_sv? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sv-16.12.3.tar.xz ) l10n_tr? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-tr-16.12.3.tar.xz ) l10n_ug? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ug-16.12.3.tar.xz ) l10n_uk? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-uk-16.12.3.tar.xz ) l10n_wa? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-wa-16.12.3.tar.xz ) l10n_zh-CN? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-zh_CN-16.12.3.tar.xz ) l10n_zh-TW? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-zh_TW-16.12.3.tar.xz )
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c9cbf73ba6ff1bb8e5a293f3b16abce3
diff --git a/metadata/md5-cache/kde-apps/kde4-l10n-16.12.3-r1 b/metadata/md5-cache/kde-apps/kde4-l10n-16.12.3-r1
index 3ec86a0afdce..42a7e88971c7 100644
--- a/metadata/md5-cache/kde-apps/kde4-l10n-16.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kde4-l10n-16.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kde-l10n-16.12.3
 SLOT=4
 SRC_URI=l10n_ar? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ar-16.12.3.tar.xz ) l10n_ast? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ast-16.12.3.tar.xz ) l10n_bg? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-bg-16.12.3.tar.xz ) l10n_bs? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-bs-16.12.3.tar.xz ) l10n_ca? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ca-16.12.3.tar.xz ) l10n_ca-valencia? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ca@valencia-16.12.3.tar.xz ) l10n_cs? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-cs-16.12.3.tar.xz ) l10n_da? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-da-16.12.3.tar.xz ) l10n_de? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-de-16.12.3.tar.xz ) l10n_el? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-el-16.12.3.tar.xz ) l10n_en-GB? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-en_GB-16.12.3.tar.xz ) l10n_eo? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-eo-16.12.3.tar.xz ) l10n_es? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-es-16.12.3.tar.xz ) l10n_et? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-et-16.12.3.tar.xz ) l10n_eu? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-eu-16.12.3.tar.xz ) l10n_fa? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-fa-16.12.3.tar.xz ) l10n_fi? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-fi-16.12.3.tar.xz ) l10n_fr? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-fr-16.12.3.tar.xz ) l10n_ga? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ga-16.12.3.tar.xz ) l10n_gl? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-gl-16.12.3.tar.xz ) l10n_he? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-he-16.12.3.tar.xz ) l10n_hi? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-hi-16.12.3.tar.xz ) l10n_hr? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-hr-16.12.3.tar.xz ) l10n_hu? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-hu-16.12.3.tar.xz ) l10n_ia? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ia-16.12.3.tar.xz ) l10n_id? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-id-16.12.3.tar.xz ) l10n_is? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-is-16.12.3.tar.xz ) l10n_it? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-it-16.12.3.tar.xz ) l10n_ja? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ja-16.12.3.tar.xz ) l10n_kk? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-kk-16.12.3.tar.xz ) l10n_km? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-km-16.12.3.tar.xz ) l10n_ko? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ko-16.12.3.tar.xz ) l10n_lt? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-lt-16.12.3.tar.xz ) l10n_lv? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-lv-16.12.3.tar.xz ) l10n_mr? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-mr-16.12.3.tar.xz ) l10n_nb? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-nb-16.12.3.tar.xz ) l10n_nds? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-nds-16.12.3.tar.xz ) l10n_nl? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-nl-16.12.3.tar.xz ) l10n_nn? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-nn-16.12.3.tar.xz ) l10n_pa? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-pa-16.12.3.tar.xz ) l10n_pl? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-pl-16.12.3.tar.xz ) l10n_pt? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-pt-16.12.3.tar.xz ) l10n_pt-BR? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-pt_BR-16.12.3.tar.xz ) l10n_ro? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ro-16.12.3.tar.xz ) l10n_ru? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ru-16.12.3.tar.xz ) l10n_sk? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sk-16.12.3.tar.xz ) l10n_sl? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sl-16.12.3.tar.xz ) l10n_sr? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sr-16.12.3.tar.xz ) l10n_sr-ijekavsk? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sr-16.12.3.tar.xz ) l10n_sr-Latn? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sr-16.12.3.tar.xz ) l10n_sr-Latn-ijekavsk? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sr-16.12.3.tar.xz ) l10n_sv? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-sv-16.12.3.tar.xz ) l10n_tr? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-tr-16.12.3.tar.xz ) l10n_ug? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-ug-16.12.3.tar.xz ) l10n_uk? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-uk-16.12.3.tar.xz ) l10n_wa? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-wa-16.12.3.tar.xz ) l10n_zh-CN? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-zh_CN-16.12.3.tar.xz ) l10n_zh-TW? ( mirror://kde/Attic/applications/16.12.3/src/kde-l10n/kde-l10n-zh_TW-16.12.3.tar.xz )
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e5d599fa8e8914949f015d9d6859a798
diff --git a/metadata/md5-cache/kde-apps/kde4-l10n-17.04.1 b/metadata/md5-cache/kde-apps/kde4-l10n-17.04.1
index 5fe9a837369a..358fc24b1a79 100644
--- a/metadata/md5-cache/kde-apps/kde4-l10n-17.04.1
+++ b/metadata/md5-cache/kde-apps/kde4-l10n-17.04.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 SLOT=4
 SRC_URI=l10n_ar? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ar-17.04.1.tar.xz ) l10n_ast? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ast-17.04.1.tar.xz ) l10n_bg? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-bg-17.04.1.tar.xz ) l10n_bs? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-bs-17.04.1.tar.xz ) l10n_ca? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ca-17.04.1.tar.xz ) l10n_ca-valencia? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ca@valencia-17.04.1.tar.xz ) l10n_cs? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-cs-17.04.1.tar.xz ) l10n_da? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-da-17.04.1.tar.xz ) l10n_de? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-de-17.04.1.tar.xz ) l10n_el? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-el-17.04.1.tar.xz ) l10n_en-GB? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-en_GB-17.04.1.tar.xz ) l10n_eo? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-eo-17.04.1.tar.xz ) l10n_es? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-es-17.04.1.tar.xz ) l10n_et? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-et-17.04.1.tar.xz ) l10n_eu? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-eu-17.04.1.tar.xz ) l10n_fa? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-fa-17.04.1.tar.xz ) l10n_fi? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-fi-17.04.1.tar.xz ) l10n_fr? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-fr-17.04.1.tar.xz ) l10n_ga? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ga-17.04.1.tar.xz ) l10n_gl? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-gl-17.04.1.tar.xz ) l10n_he? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-he-17.04.1.tar.xz ) l10n_hi? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-hi-17.04.1.tar.xz ) l10n_hr? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-hr-17.04.1.tar.xz ) l10n_hu? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-hu-17.04.1.tar.xz ) l10n_ia? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ia-17.04.1.tar.xz ) l10n_id? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-id-17.04.1.tar.xz ) l10n_is? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-is-17.04.1.tar.xz ) l10n_it? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-it-17.04.1.tar.xz ) l10n_ja? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ja-17.04.1.tar.xz ) l10n_kk? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-kk-17.04.1.tar.xz ) l10n_km? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-km-17.04.1.tar.xz ) l10n_ko? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ko-17.04.1.tar.xz ) l10n_lt? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-lt-17.04.1.tar.xz ) l10n_lv? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-lv-17.04.1.tar.xz ) l10n_mr? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-mr-17.04.1.tar.xz ) l10n_nb? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nb-17.04.1.tar.xz ) l10n_nds? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nds-17.04.1.tar.xz ) l10n_nl? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nl-17.04.1.tar.xz ) l10n_nn? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nn-17.04.1.tar.xz ) l10n_pa? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pa-17.04.1.tar.xz ) l10n_pl? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pl-17.04.1.tar.xz ) l10n_pt? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pt-17.04.1.tar.xz ) l10n_pt-BR? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pt_BR-17.04.1.tar.xz ) l10n_ro? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ro-17.04.1.tar.xz ) l10n_ru? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ru-17.04.1.tar.xz ) l10n_sk? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sk-17.04.1.tar.xz ) l10n_sl? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sl-17.04.1.tar.xz ) l10n_sr? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sr-17.04.1.tar.xz ) l10n_sr-ijekavsk? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sr-17.04.1.tar.xz ) l10n_sr-Latn? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sr-17.04.1.tar.xz ) l10n_sr-Latn-ijekavsk? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sr-17.04.1.tar.xz ) l10n_sv? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sv-17.04.1.tar.xz ) l10n_tr? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-tr-17.04.1.tar.xz ) l10n_ug? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ug-17.04.1.tar.xz ) l10n_uk? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-uk-17.04.1.tar.xz ) l10n_wa? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-wa-17.04.1.tar.xz ) l10n_zh-CN? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-zh_CN-17.04.1.tar.xz ) l10n_zh-TW? ( mirror://kde/stable/applications/17.04.1/src/kde-l10n/kde-l10n-zh_TW-17.04.1.tar.xz )
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f63b0e22c8c7239b12de8266c48de7d5
diff --git a/metadata/md5-cache/kde-apps/kdebase-runtime-meta-16.04.3-r1 b/metadata/md5-cache/kde-apps/kdebase-runtime-meta-16.04.3-r1
index 5d053ef687bf..45d8665a3809 100644
--- a/metadata/md5-cache/kde-apps/kdebase-runtime-meta-16.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kdebase-runtime-meta-16.04.3-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=-
 DESCRIPTION=Merge this to pull in all kdebase-runtime-derived packages
 EAPI=6
 HOMEPAGE=https://www.kde.org/
-IUSE=kwallet nls pam
+IUSE=kwallet nls
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
-RDEPEND=>=kde-apps/kcmshell-16.04.3 >=kde-apps/kdebase-data-16.04.3 >=kde-apps/kdontchangethehostname-16.04.3 >=kde-apps/keditfiletype-16.04.3 >=kde-apps/kfile-16.04.3 >=kde-apps/kioclient-16.04.3 >=kde-apps/kmimetypefinder-16.04.3 >=kde-apps/knewstuff-16.04.3 >=kde-apps/kreadconfig-16.04.3 >=kde-apps/ktimezoned-16.04.3 >=kde-apps/ktraderclient-16.04.3 >=kde-apps/phonon-kde-16.04.3 kwallet? ( >=kde-apps/kwalletd-16.04.3 pam? ( >=kde-plasma/kwallet-pam-5.4.1[oldwallet] ) ) nls? ( >=kde-apps/kde4-l10n-16.04.3 )
+RDEPEND=>=kde-apps/kcmshell-16.04.3 >=kde-apps/kdebase-data-16.04.3 >=kde-apps/kdontchangethehostname-16.04.3 >=kde-apps/keditfiletype-16.04.3 >=kde-apps/kfile-16.04.3 >=kde-apps/kioclient-16.04.3 >=kde-apps/kmimetypefinder-16.04.3 >=kde-apps/knewstuff-16.04.3 >=kde-apps/kreadconfig-16.04.3 >=kde-apps/ktimezoned-16.04.3 >=kde-apps/ktraderclient-16.04.3 >=kde-apps/phonon-kde-16.04.3 kwallet? ( || ( >=kde-frameworks/kwallet-5.34.0 >=kde-apps/kwalletd-16.04.3 ) ) nls? ( >=kde-apps/kde4-l10n-16.04.3 )
 SLOT=5
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	kde5-meta-pkg	2940961e373d151224f818926d9ec927	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3e85fe41260357845fff06dfd8a57334
+_md5_=faac3359fb3aacd862ec5f3d02ba8121
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-16.12.3 b/metadata/md5-cache/kde-apps/kdebugsettings-16.12.3
index 0c74aab9e408..861f22655364 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-16.12.3
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kdebugsettings-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1f9fa35cee1cab61b11b372f7fbf38f9
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-17.04.1 b/metadata/md5-cache/kde-apps/kdebugsettings-17.04.1
index 4c19b567e5a2..d2f0e40eab3e 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-17.04.1
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdebugsettings-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ee273a1ab793d58db1b0a0aa616ad8b2
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-16.12.3 b/metadata/md5-cache/kde-apps/kdeedu-data-16.12.3
index 7aa9d18c9554..4c6fd65500f0 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-16.12.3
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-16.12.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-apps/libkdeedu:4
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kdeedu-data-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e8570d2e1b8fa414f8ad678584ceaccf
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-17.04.1 b/metadata/md5-cache/kde-apps/kdeedu-data-17.04.1
index 572e5a7bca4c..83e99591080e 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-17.04.1
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-17.04.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdeedu-data-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d8df1f18a4595f02c672186b0f285404
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.12.3 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.12.3
index b4ed4920f15d..83f6cbbf25f8 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.12.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 thumbnail? ( >=kde-frameworks/kio-5.29.0:5 ) >=kde-frameworks/kf-env-4 !kde-apps/kdegraphics-mobipocket:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kdegraphics-mobipocket-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=178acd4d24f4861156262fbb8c1988e2
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.04.1 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.04.1
index fb16eb4051f9..64faa7eb3f58 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.04.1
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 thumbnail? ( >=kde-frameworks/kio-5.32.0:5 ) >=kde-frameworks/kf-env-4 !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdegraphics-mobipocket-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=697421665c52e084ec3be2c0a2e12d33
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-16.12.3 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-16.12.3
index 7acbbdd1b806..5e2666cdf796 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-16.12.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kdenetwork-filesharing:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kdenetwork-filesharing-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=650a7b3f923b480db49761634887dfd3
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.04.1 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.04.1
index 4f7ac3f1ecd5..4627cf9501c0 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.04.1
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdenetwork-filesharing-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=36e996fe8d326947bbc73e3d1dddb64e
diff --git a/metadata/md5-cache/kde-apps/kdenlive-16.12.3 b/metadata/md5-cache/kde-apps/kdenlive-16.12.3
index 397851aab92a..3c852b0311f7 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-16.12.3
+++ b/metadata/md5-cache/kde-apps/kdenlive-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5[gles2=] >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtquickcontrols-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=media-libs/mlt-6.0.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.6.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.29.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 !kde-apps/kdenlive:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kdenlive-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fe2c0ab1539720a516747901f6b012ff
diff --git a/metadata/md5-cache/kde-apps/kdenlive-17.04.1 b/metadata/md5-cache/kde-apps/kdenlive-17.04.1
index ac774c76c5b2..890c4b28327a 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-17.04.1
+++ b/metadata/md5-cache/kde-apps/kdenlive-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kbookmarks-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/knotifyconfig-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-frameworks/solid-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5[gles2=] >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtquickcontrols-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=media-libs/mlt-6.0.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.6.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.32.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 !kde-apps/kdenlive:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdenlive-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ded8d52996a5cbb353f3866715b11089
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-17.04.1 b/metadata/md5-cache/kde-apps/kdepim-addons-17.04.1
index 53da0e3e9125..f2eafe1ee3a2 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-17.04.1
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdepim-addons-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8a2d0899f51c56dfd5ac35302cac591a
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.04.1 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.04.1
index 29daac68f8cc..ca624e21fbc6 100644
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.04.1
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-contacts-17.04.1:5 >=kde-apps/grantleetheme-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/libkleo-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-libs/grantlee-5.1.0:5 prison? ( >=kde-frameworks/prison-5.32.0:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdepim-apps-libs-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e81244aa8a576abb5de6fd2760157e7d
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-17.04.1-r1 b/metadata/md5-cache/kde-apps/kdepim-runtime-17.04.1-r1
index 595b5152f6d3..ef2c6081a723 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-17.04.1-r1
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-17.04.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdepim-runtime-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a4a1e17a1f3cd281d5b9e7a72f4d1882
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.04.1 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.04.1
index d8db4bd2bfd3..a650dfef6dbb 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.04.1
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdesdk-kioslaves-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=da1bb772cc69b2a82c796cd2f84a07c5
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-16.12.3 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-16.12.3
index b490f50b34e6..72fd64a265fe 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-16.12.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 !kde-apps/kdesdk-thumbnailers:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kdesdk-thumbnailers-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=68f668f50f9f212566a7fb736bb32944
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.04.1 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.04.1
index e0c23e6747b8..90bc2be13103 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.04.1
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdesdk-thumbnailers-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=37e7992cc1faa181cedb1ceb1c36cee9
diff --git a/metadata/md5-cache/kde-apps/kdf-16.12.3 b/metadata/md5-cache/kde-apps/kdf-16.12.3
index 0d3bdaffc70c..62089647778f 100644
--- a/metadata/md5-cache/kde-apps/kdf-16.12.3
+++ b/metadata/md5-cache/kde-apps/kdf-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kdf:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kdf-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0a164e151a991f0d0099b2ed792c42b8
diff --git a/metadata/md5-cache/kde-apps/kdf-17.04.1 b/metadata/md5-cache/kde-apps/kdf-17.04.1
index 016901f9732f..43d0e913055d 100644
--- a/metadata/md5-cache/kde-apps/kdf-17.04.1
+++ b/metadata/md5-cache/kde-apps/kdf-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kdf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdf-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=971494cf80ea364f64cb3d5127d2b487
diff --git a/metadata/md5-cache/kde-apps/kdialog-16.12.3 b/metadata/md5-cache/kde-apps/kdialog-16.12.3
index 46ed198ce766..98672f08d6e9 100644
--- a/metadata/md5-cache/kde-apps/kdialog-16.12.3
+++ b/metadata/md5-cache/kde-apps/kdialog-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !kde-apps/kdialog:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kdialog-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9434117f47b835276e25d3124c2e3aa3
diff --git a/metadata/md5-cache/kde-apps/kdialog-17.04.1 b/metadata/md5-cache/kde-apps/kdialog-17.04.1
index 39e7f74cc9a4..4845126090cf 100644
--- a/metadata/md5-cache/kde-apps/kdialog-17.04.1
+++ b/metadata/md5-cache/kde-apps/kdialog-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !kde-apps/kdialog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdialog-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=25792f34154d3515d51595dc899343d7
diff --git a/metadata/md5-cache/kde-apps/kdiamond-16.12.3 b/metadata/md5-cache/kde-apps/kdiamond-16.12.3
index f11ee319a7fe..cf645148ef5a 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-16.12.3
+++ b/metadata/md5-cache/kde-apps/kdiamond-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kdiamond:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kdiamond-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7ebf7214e00b9089029ff0c91787bde7
diff --git a/metadata/md5-cache/kde-apps/kdiamond-17.04.1 b/metadata/md5-cache/kde-apps/kdiamond-17.04.1
index de77a063018f..43b250ce2f80 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-17.04.1
+++ b/metadata/md5-cache/kde-apps/kdiamond-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/knotifyconfig-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kdiamond:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdiamond-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e5d1fd8f0cd7e9b12634be727f603355
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-16.12.3 b/metadata/md5-cache/kde-apps/keditbookmarks-16.12.3
index 6dc60ec8e4e7..a8eb6c6dbeca 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-16.12.3
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 !kde-apps/keditbookmarks:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/keditbookmarks-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d02899c28e49e291be5b0fd21a3f67e4
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-17.04.1 b/metadata/md5-cache/kde-apps/keditbookmarks-17.04.1
index 093af25866fc..cd228424a858 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-17.04.1
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/keditbookmarks-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3ee0711abb4a47b25c3df7e8cf932255
diff --git a/metadata/md5-cache/kde-apps/kfind-16.12.3 b/metadata/md5-cache/kde-apps/kfind-16.12.3
index 9b44cc748d0f..065e30f41633 100644
--- a/metadata/md5-cache/kde-apps/kfind-16.12.3
+++ b/metadata/md5-cache/kde-apps/kfind-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kfind:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kfind-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=873637119f737384690cbc3fa363c8ca
diff --git a/metadata/md5-cache/kde-apps/kfind-17.04.1 b/metadata/md5-cache/kde-apps/kfind-17.04.1
index 8c829910f625..f18ae780947e 100644
--- a/metadata/md5-cache/kde-apps/kfind-17.04.1
+++ b/metadata/md5-cache/kde-apps/kfind-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kfind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kfind-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4c3ee941347b968f8953a4fd36943eb3
diff --git a/metadata/md5-cache/kde-apps/kfloppy-16.12.3 b/metadata/md5-cache/kde-apps/kfloppy-16.12.3
index 2bd37febfaad..959014222d38 100644
--- a/metadata/md5-cache/kde-apps/kfloppy-16.12.3
+++ b/metadata/md5-cache/kde-apps/kfloppy-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kfloppy:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kfloppy-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=bc7f5f87f445f35d75e3989894015b87
diff --git a/metadata/md5-cache/kde-apps/kfloppy-17.04.1 b/metadata/md5-cache/kde-apps/kfloppy-17.04.1
index ef69c25b8360..8e767a681c5b 100644
--- a/metadata/md5-cache/kde-apps/kfloppy-17.04.1
+++ b/metadata/md5-cache/kde-apps/kfloppy-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kfloppy:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kfloppy-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5aef48ace4d2f9cdd8e1fec77687fe47
diff --git a/metadata/md5-cache/kde-apps/kfourinline-16.12.3 b/metadata/md5-cache/kde-apps/kfourinline-16.12.3
index 5f892ff44ee5..301370c39a4d 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-16.12.3
+++ b/metadata/md5-cache/kde-apps/kfourinline-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kdnssd-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kfourinline:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kfourinline-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=29f0bb47e258afc3fc3c8922a2a22861
diff --git a/metadata/md5-cache/kde-apps/kfourinline-17.04.1 b/metadata/md5-cache/kde-apps/kfourinline-17.04.1
index 2cc4995c1b20..8201127c3b94 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-17.04.1
+++ b/metadata/md5-cache/kde-apps/kfourinline-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/kdnssd-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kfourinline:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kfourinline-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2b81ae0c59939136f16d687ad60e7b64
diff --git a/metadata/md5-cache/kde-apps/kgeography-16.12.3 b/metadata/md5-cache/kde-apps/kgeography-16.12.3
index 1b18aba5cb0f..4974fcab9604 100644
--- a/metadata/md5-cache/kde-apps/kgeography-16.12.3
+++ b/metadata/md5-cache/kde-apps/kgeography-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kgeography:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kgeography-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7942f129ed89d2f6915311c51cc370da
diff --git a/metadata/md5-cache/kde-apps/kgeography-17.04.1 b/metadata/md5-cache/kde-apps/kgeography-17.04.1
index 9cb02a30b7fd..e1319a676d7a 100644
--- a/metadata/md5-cache/kde-apps/kgeography-17.04.1
+++ b/metadata/md5-cache/kde-apps/kgeography-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kgeography:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kgeography-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=71b1df7e58789d824cbe47b4ce6ba931
diff --git a/metadata/md5-cache/kde-apps/kgpg-16.12.3 b/metadata/md5-cache/kde-apps/kgpg-16.12.3
index 70dccee1213a..08d580a8faa2 100644
--- a/metadata/md5-cache/kde-apps/kgpg-16.12.3
+++ b/metadata/md5-cache/kde-apps/kgpg-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/akonadi-16.12.3:5 >=kde-apps/akonadi-contacts-16.12.3:5 >=kde-apps/kcontacts-16.12.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 !kde-apps/kgpg:4 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kgpg-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ed220bc2853668b18576bdb4a0acd0ec
diff --git a/metadata/md5-cache/kde-apps/kgpg-17.04.1 b/metadata/md5-cache/kde-apps/kgpg-17.04.1
index 18f68282c7c2..21834420af6f 100644
--- a/metadata/md5-cache/kde-apps/kgpg-17.04.1
+++ b/metadata/md5-cache/kde-apps/kgpg-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-contacts-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kgpg-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ed220bc2853668b18576bdb4a0acd0ec
diff --git a/metadata/md5-cache/kde-apps/khangman-16.12.3 b/metadata/md5-cache/kde-apps/khangman-16.12.3
index ba65faf8cb5d..edc126bd66b5 100644
--- a/metadata/md5-cache/kde-apps/khangman-16.12.3
+++ b/metadata/md5-cache/kde-apps/khangman-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkeduvocdocument-16.12.3:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] >=kde-apps/kdeedu-data-16.12.3:5 >=dev-qt/qtgraphicaleffects-5.6.1:5 >=dev-qt/qtmultimedia-5.6.1:5 >=dev-qt/qtquickcontrols-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/khangman:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/khangman-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ff3be1972bd4454dddb2e9b2fbbe5fb8
diff --git a/metadata/md5-cache/kde-apps/khangman-17.04.1 b/metadata/md5-cache/kde-apps/khangman-17.04.1
index 39d5fad8674f..89ad8463c940 100644
--- a/metadata/md5-cache/kde-apps/khangman-17.04.1
+++ b/metadata/md5-cache/kde-apps/khangman-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdeclarative-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkeduvocdocument-17.04.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] >=kde-apps/kdeedu-data-17.04.1:5 >=dev-qt/qtgraphicaleffects-5.6.1:5 >=dev-qt/qtmultimedia-5.6.1:5 >=dev-qt/qtquickcontrols-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/khangman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/khangman-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d1f7a5bbec9ebc1434fcd405d715f8c7
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-16.12.3 b/metadata/md5-cache/kde-apps/khelpcenter-16.12.3
index 18707bb7caab..cffa51386345 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-16.12.3
+++ b/metadata/md5-cache/kde-apps/khelpcenter-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/khtml-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kinit-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.4.1:5 >=kde-frameworks/kf-env-4 !kde-apps/khelpcenter:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/khelpcenter-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e5f1c63b97728b4f020880a836fcbf8b
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-17.04.1 b/metadata/md5-cache/kde-apps/khelpcenter-17.04.1
index 348c5811c7eb..3d20870208a2 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-17.04.1
+++ b/metadata/md5-cache/kde-apps/khelpcenter-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kbookmarks-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/khtml-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kinit-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.4.1:5 >=kde-frameworks/kf-env-4 !kde-apps/khelpcenter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/khelpcenter-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4078358adaf106953f97221ef6821f7b
diff --git a/metadata/md5-cache/kde-apps/kholidays-16.12.3 b/metadata/md5-cache/kde-apps/kholidays-16.12.3
index 0e56c24ffe6a..b4901ce7a316 100644
--- a/metadata/md5-cache/kde-apps/kholidays-16.12.3
+++ b/metadata/md5-cache/kde-apps/kholidays-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kholi
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kholidays-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=737f8a313a1c6e6dcbd8fc799d0674ea
diff --git a/metadata/md5-cache/kde-apps/kholidays-17.04.1 b/metadata/md5-cache/kde-apps/kholidays-17.04.1
index c232a6994636..b92bf3fc915d 100644
--- a/metadata/md5-cache/kde-apps/kholidays-17.04.1
+++ b/metadata/md5-cache/kde-apps/kholidays-17.04.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kholidays:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kholidays-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=de6eb59190df8e0b7beaffdcbc7409ba
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-17.04.1 b/metadata/md5-cache/kde-apps/kidentitymanagement-17.04.1
index 80515c0d630f..aadf3e7d8338 100644
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-17.04.1
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kidentitymanagement-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=38f99875d3da7d5b399db124f1b0a3a9
diff --git a/metadata/md5-cache/kde-apps/kig-16.12.3 b/metadata/md5-cache/kde-apps/kig-16.12.3
index 8b6d7c892a2d..c01180379447 100644
--- a/metadata/md5-cache/kde-apps/kig-16.12.3
+++ b/metadata/md5-cache/kde-apps/kig-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kig-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c92c774d626b553bd05aeff08911d166
diff --git a/metadata/md5-cache/kde-apps/kig-17.04.1 b/metadata/md5-cache/kde-apps/kig-17.04.1
index 5151c285bfb9..5fd26a8e1d9a 100644
--- a/metadata/md5-cache/kde-apps/kig-17.04.1
+++ b/metadata/md5-cache/kde-apps/kig-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kig-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9d285661d3ae05d76fdf250b4948033d
diff --git a/metadata/md5-cache/kde-apps/killbots-16.12.3 b/metadata/md5-cache/kde-apps/killbots-16.12.3
index 17320ca9d519..2c868a84bf8c 100644
--- a/metadata/md5-cache/kde-apps/killbots-16.12.3
+++ b/metadata/md5-cache/kde-apps/killbots-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/killbots:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/killbots-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=42fe1927fa7a6c1dddf6d768dd60c262
diff --git a/metadata/md5-cache/kde-apps/killbots-17.04.1 b/metadata/md5-cache/kde-apps/killbots-17.04.1
index 3a3c8ac9fb78..3f628261d6b8 100644
--- a/metadata/md5-cache/kde-apps/killbots-17.04.1
+++ b/metadata/md5-cache/kde-apps/killbots-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/killbots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/killbots-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=94032392d3e59ef8c7838215f64e57f7
diff --git a/metadata/md5-cache/kde-apps/kimap-17.04.1 b/metadata/md5-cache/kde-apps/kimap-17.04.1
index e0f2b39e1c67..8dc2ddeb9465 100644
--- a/metadata/md5-cache/kde-apps/kimap-17.04.1
+++ b/metadata/md5-cache/kde-apps/kimap-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-apps/kmime-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kimap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kimap-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6d4a12aef1209c24f348963f8c3cc010
diff --git a/metadata/md5-cache/kde-apps/kio-extras-16.12.3-r1 b/metadata/md5-cache/kde-apps/kio-extras-16.12.3-r1
index 62b6bbf9fdab..54dc2f39ac45 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-16.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kio-extras-16.12.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.29.0:5[bzip2,lzma] >=kde-frameworks/kbookmar
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kio-extras-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8446a57320d30c9a7d004e5e1dc41a3e
diff --git a/metadata/md5-cache/kde-apps/kio-extras-16.12.3-r2 b/metadata/md5-cache/kde-apps/kio-extras-16.12.3-r2
index 2f4a7161a295..d663d3f26160 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-16.12.3-r2
+++ b/metadata/md5-cache/kde-apps/kio-extras-16.12.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.29.0:5[bzip2,lzma] >=kde-frameworks/kbookmar
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kio-extras-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c6e763dbb4d22d9f2192bb2b6c63b4a1
diff --git a/metadata/md5-cache/kde-apps/kio-extras-17.04.1 b/metadata/md5-cache/kde-apps/kio-extras-17.04.1
index 4c620dbc1793..552dbabe3693 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-17.04.1
+++ b/metadata/md5-cache/kde-apps/kio-extras-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.32.0:5[bzip2,lzma] >=kde-frameworks/kbookmar
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kio-extras-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8a2242b485b2677b694157dc95b3cbac
diff --git a/metadata/md5-cache/kde-apps/kiriki-16.12.3 b/metadata/md5-cache/kde-apps/kiriki-16.12.3
index dc06fbbf999e..cbc3afb1f957 100644
--- a/metadata/md5-cache/kde-apps/kiriki-16.12.3
+++ b/metadata/md5-cache/kde-apps/kiriki-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kiriki:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kiriki-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a86b3fc9d4fc857e86f716b51257c758
diff --git a/metadata/md5-cache/kde-apps/kiriki-17.04.1 b/metadata/md5-cache/kde-apps/kiriki-17.04.1
index e0c69d0b9891..76cd31f83011 100644
--- a/metadata/md5-cache/kde-apps/kiriki-17.04.1
+++ b/metadata/md5-cache/kde-apps/kiriki-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kiriki:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kiriki-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2a04f31a6b96f960471bfbcdc8e56f82
diff --git a/metadata/md5-cache/kde-apps/kiten-16.12.3 b/metadata/md5-cache/kde-apps/kiten-16.12.3
index faa6f859a7ba..f43db32a126b 100644
--- a/metadata/md5-cache/kde-apps/kiten-16.12.3
+++ b/metadata/md5-cache/kde-apps/kiten-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/khtml-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kiten:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kiten-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a5c478fdcf86f6a58a1e252d75e9dbb9
diff --git a/metadata/md5-cache/kde-apps/kiten-17.04.1 b/metadata/md5-cache/kde-apps/kiten-17.04.1
index 2623f1d0b067..c1e9076b26f1 100644
--- a/metadata/md5-cache/kde-apps/kiten-17.04.1
+++ b/metadata/md5-cache/kde-apps/kiten-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/khtml-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kiten:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kiten-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0d86d7c84d253a42e48dffc89de97727
diff --git a/metadata/md5-cache/kde-apps/kjots-5.0.2 b/metadata/md5-cache/kde-apps/kjots-5.0.2
index 910fddc8e5af..52b254b5bf2d 100644
--- a/metadata/md5-cache/kde-apps/kjots-5.0.2
+++ b/metadata/md5-cache/kde-apps/kjots-5.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/akonadi-5.0.2:5 >=kde-apps/akonadi-notes-5.0.2:5 >=kde-apps/kmime-5.0.2:5 >=kde-apps/kontactinterface-5.0.2:5 >=kde-apps/kpimtextedit-5.0.2:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/grantlee:5 dev-libs/libxslt >=kde-frameworks/kf-env-4 !kde-apps/kjots:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kjots/5.0.2/kjots-5.0.2.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ab2c8ee88eb9582f64cf5919f5779e9e
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-16.12.3 b/metadata/md5-cache/kde-apps/kjumpingcube-16.12.3
index 85afa1495d55..b870a9a12416 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-16.12.3
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kjumpingcube:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kjumpingcube-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=460befae53d141a1b1588f731f293cb2
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-17.04.1 b/metadata/md5-cache/kde-apps/kjumpingcube-17.04.1
index c32086d3eca9..469111207603 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-17.04.1
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kjumpingcube-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8de775a32c75d5517e5ceaa0f15951e6
diff --git a/metadata/md5-cache/kde-apps/kldap-17.04.1 b/metadata/md5-cache/kde-apps/kldap-17.04.1
index db62f04b5fdd..30cdc9285ccf 100644
--- a/metadata/md5-cache/kde-apps/kldap-17.04.1
+++ b/metadata/md5-cache/kde-apps/kldap-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kldap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kldap-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6cf9bec4c6d54d66af8ab0cfa3e40e93
diff --git a/metadata/md5-cache/kde-apps/kleopatra-17.04.1 b/metadata/md5-cache/kde-apps/kleopatra-17.04.1
index 5eaf7f3d9a9a..527262690484 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-17.04.1
+++ b/metadata/md5-cache/kde-apps/kleopatra-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/kmime-17.04.1:5 >=kde-apps/libkleo-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5= >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 !kde-apps/kleopatra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kleopatra-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5c4282ca4a825e3c9a8853c97c7528c8
diff --git a/metadata/md5-cache/kde-apps/klettres-16.12.3 b/metadata/md5-cache/kde-apps/klettres-16.12.3
index 343acb18b0cf..66080d40df96 100644
--- a/metadata/md5-cache/kde-apps/klettres-16.12.3
+++ b/metadata/md5-cache/kde-apps/klettres-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-4 !kde-apps/klettres:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/klettres-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b5651ce365bf84a0514f80c64be0178a
diff --git a/metadata/md5-cache/kde-apps/klettres-17.04.1 b/metadata/md5-cache/kde-apps/klettres-17.04.1
index 1fdfda4d4522..74d8add4a022 100644
--- a/metadata/md5-cache/kde-apps/klettres-17.04.1
+++ b/metadata/md5-cache/kde-apps/klettres-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-4 !kde-apps/klettres:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/klettres-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4d0192907cc7d54f4c7c79f1360ef1d8
diff --git a/metadata/md5-cache/kde-apps/klickety-16.12.3 b/metadata/md5-cache/kde-apps/klickety-16.12.3
index b2d5c12baf49..dc042d3e2016 100644
--- a/metadata/md5-cache/kde-apps/klickety-16.12.3
+++ b/metadata/md5-cache/kde-apps/klickety-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/klickety:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/klickety-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2fc3e65b00d952151a4072e0e6b59b63
diff --git a/metadata/md5-cache/kde-apps/klickety-17.04.1 b/metadata/md5-cache/kde-apps/klickety-17.04.1
index e6c384ebf1f6..04c110631880 100644
--- a/metadata/md5-cache/kde-apps/klickety-17.04.1
+++ b/metadata/md5-cache/kde-apps/klickety-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/knotifyconfig-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/klickety-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=bd525e45a0d3387df30f4e9e04fcf734
diff --git a/metadata/md5-cache/kde-apps/klines-16.12.3 b/metadata/md5-cache/kde-apps/klines-16.12.3
index 960d86ca8ba3..38acdd7fcf94 100644
--- a/metadata/md5-cache/kde-apps/klines-16.12.3
+++ b/metadata/md5-cache/kde-apps/klines-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/klines:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/klines-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e3605e2a1a99a1c2cdfa4b29442eee89
diff --git a/metadata/md5-cache/kde-apps/klines-17.04.1 b/metadata/md5-cache/kde-apps/klines-17.04.1
index 1a016b2d0a07..b73ba04a7cb2 100644
--- a/metadata/md5-cache/kde-apps/klines-17.04.1
+++ b/metadata/md5-cache/kde-apps/klines-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/klines-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=bcc5d0becc96342c5bf8ae9038089713
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-16.12.3 b/metadata/md5-cache/kde-apps/kmahjongg-16.12.3
index 25cacf5f0b20..e73f8d35614d 100644
--- a/metadata/md5-cache/kde-apps/kmahjongg-16.12.3
+++ b/metadata/md5-cache/kde-apps/kmahjongg-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=kde-apps/libkmahjongg-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmahjongg:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kmahjongg-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=546f3a6f82f50b398576f4a127e62bfc
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-17.04.1 b/metadata/md5-cache/kde-apps/kmahjongg-17.04.1
index a92380637f06..c4d8d0f44d5c 100644
--- a/metadata/md5-cache/kde-apps/kmahjongg-17.04.1
+++ b/metadata/md5-cache/kde-apps/kmahjongg-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kdeclarative-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=kde-apps/libkmahjongg-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kmahjongg-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b41c37913ac829ca7fb4a7c5b1be2503
diff --git a/metadata/md5-cache/kde-apps/kmail-17.04.1 b/metadata/md5-cache/kde-apps/kmail-17.04.1
index 1d3daf94b15b..eacb81d9c58f 100644
--- a/metadata/md5-cache/kde-apps/kmail-17.04.1
+++ b/metadata/md5-cache/kde-apps/kmail-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kbookmarks-5.32.0:5 >=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/knotifyconfig-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-frameworks/sonnet-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-contacts-17.04.1:5 >=kde-apps/akonadi-mime-17.04.1:5 >=kde-apps/akonadi-search-17.04.1:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kdepim-apps-libs-17.04.1:5 >=kde-apps/kidentitymanagement-17.04.1:5 >=kde-apps/kmailtransport-17.04.1:5 >=kde-apps/kmime-17.04.1:5 >=kde-apps/kontactinterface-17.04.1:5 >=kde-apps/kpimtextedit-17.04.1:5 >=kde-apps/libgravatar-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=kde-apps/libkleo-17.04.1:5 >=kde-apps/libksieve-17.04.1:5 >=kde-apps/libktnef-17.04.1:5 >=kde-apps/mailcommon-17.04.1:5 >=kde-apps/messagelib-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/qtdbus-5.7.0:5 >=dev-qt/qtgui-5.7.0:5 >=dev-qt/qtnetwork-5.7.0:5 >=dev-qt/qtwebengine-5.7.0:5[widgets] >=dev-qt/qtwidgets-5.7.0:5 >=dev-qt/qtxml-5.7.0:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-17.04.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmail:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.0:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kmail-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0fe7cbb2bc0cbd8f085c9e4d07907335
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.04.1 b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.04.1
index e11f67dff8ae..0a11a3feaefa 100644
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.04.1
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/knotifyconfig-5.32.0:5 >=kde-frameworks/kross-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktexteditor-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/kidentitymanagement-17.04.1:5 >=kde-apps/kldap-17.04.1:5 >=kde-apps/kmailtransport-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=kde-apps/libkleo-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kmail-account-wizard-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=61dda8cd5c6f05f3edc34cbd07830443
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-17.04.1 b/metadata/md5-cache/kde-apps/kmailtransport-17.04.1
index 2395242ba045..0f1ade37c46e 100644
--- a/metadata/md5-cache/kde-apps/kmailtransport-17.04.1
+++ b/metadata/md5-cache/kde-apps/kmailtransport-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kmailtransport-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=84b7c1010008ba67094571c7b935bec6
diff --git a/metadata/md5-cache/kde-apps/kmbox-17.04.1 b/metadata/md5-cache/kde-apps/kmbox-17.04.1
index 330e7bbc9195..2ce84f1c992e 100644
--- a/metadata/md5-cache/kde-apps/kmbox-17.04.1
+++ b/metadata/md5-cache/kde-apps/kmbox-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-apps/kmime-17.04.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kmbox-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a8d55cacd3f34febe85bbcf97a0caad0
diff --git a/metadata/md5-cache/kde-apps/kmime-17.04.1 b/metadata/md5-cache/kde-apps/kmime-17.04.1
index ed79a3ea890f..4a276ed97f2d 100644
--- a/metadata/md5-cache/kde-apps/kmime-17.04.1
+++ b/metadata/md5-cache/kde-apps/kmime-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kmime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kmime-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=37933c5b528552dfac1f2f3bc1a87b0d
diff --git a/metadata/md5-cache/kde-apps/kmines-16.12.3 b/metadata/md5-cache/kde-apps/kmines-16.12.3
index 687648451fec..cb2d58fe1b1e 100644
--- a/metadata/md5-cache/kde-apps/kmines-16.12.3
+++ b/metadata/md5-cache/kde-apps/kmines-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmines:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kmines-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b804e4f4801895aa2b0d8d083b6dc598
diff --git a/metadata/md5-cache/kde-apps/kmines-17.04.1 b/metadata/md5-cache/kde-apps/kmines-17.04.1
index 6c3cc1936028..4f02820302c2 100644
--- a/metadata/md5-cache/kde-apps/kmines-17.04.1
+++ b/metadata/md5-cache/kde-apps/kmines-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kmines-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a9310845fe81c836fed7018f155d9f73
diff --git a/metadata/md5-cache/kde-apps/kmix-16.12.3 b/metadata/md5-cache/kde-apps/kmix-16.12.3
index 294e3a78e763..0d7019dcb683 100644
--- a/metadata/md5-cache/kde-apps/kmix-16.12.3
+++ b/metadata/md5-cache/kde-apps/kmix-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 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-4 !kde-apps/kmix:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kmix-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=11328794f939d025786e739998c6c3dd
diff --git a/metadata/md5-cache/kde-apps/kmix-17.04.1 b/metadata/md5-cache/kde-apps/kmix-17.04.1
index 135151d1fefa..818718d285ef 100644
--- a/metadata/md5-cache/kde-apps/kmix-17.04.1
+++ b/metadata/md5-cache/kde-apps/kmix-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/kglobalaccel-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-frameworks/plasma-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 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-4 !kde-apps/kmix:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kmix-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b1f5c01b44e553e35f96e49ce0eb2b44
diff --git a/metadata/md5-cache/kde-apps/kmplot-16.12.3 b/metadata/md5-cache/kde-apps/kmplot-16.12.3
index 92afa2411cd7..9c0dab35e43e 100644
--- a/metadata/md5-cache/kde-apps/kmplot-16.12.3
+++ b/metadata/md5-cache/kde-apps/kmplot-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmplot:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kmplot-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=acb1824720805e31ce23b02bcb7070b7
diff --git a/metadata/md5-cache/kde-apps/kmplot-17.04.1 b/metadata/md5-cache/kde-apps/kmplot-17.04.1
index e42428af5a02..e0cff785bc96 100644
--- a/metadata/md5-cache/kde-apps/kmplot-17.04.1
+++ b/metadata/md5-cache/kde-apps/kmplot-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmplot:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kmplot-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d7b6ee991a41136d1d558be7b1f90527
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-16.12.3 b/metadata/md5-cache/kde-apps/knavalbattle-16.12.3
index 7d7b41d8de1f..4b7ca60e6ed2 100644
--- a/metadata/md5-cache/kde-apps/knavalbattle-16.12.3
+++ b/metadata/md5-cache/kde-apps/knavalbattle-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdnssd-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/knavalbattle:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/knavalbattle-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c3b46d6206bb5f4296b579a78d452b02
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-17.04.1 b/metadata/md5-cache/kde-apps/knavalbattle-17.04.1
index 3e06fffbe4f8..8c9f722cf174 100644
--- a/metadata/md5-cache/kde-apps/knavalbattle-17.04.1
+++ b/metadata/md5-cache/kde-apps/knavalbattle-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kdnssd-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/knavalbattle-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=516fcca2fcefea74615ff6079b29c9f7
diff --git a/metadata/md5-cache/kde-apps/knetwalk-16.12.3 b/metadata/md5-cache/kde-apps/knetwalk-16.12.3
index 388edfdfe72e..1bdc59dd5d00 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-16.12.3
+++ b/metadata/md5-cache/kde-apps/knetwalk-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/knetwalk:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/knetwalk-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f89b47fc9e93ebfa46cd410742cee2ac
diff --git a/metadata/md5-cache/kde-apps/knetwalk-17.04.1 b/metadata/md5-cache/kde-apps/knetwalk-17.04.1
index c56e740ca33a..3735dce6d2ee 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-17.04.1
+++ b/metadata/md5-cache/kde-apps/knetwalk-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/knetwalk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/knetwalk-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6ea771caf6ca3567ffa10cd5042ad585
diff --git a/metadata/md5-cache/kde-apps/knotes-17.04.1 b/metadata/md5-cache/kde-apps/knotes-17.04.1
index f2f0dc000058..9fd8234f7a43 100644
--- a/metadata/md5-cache/kde-apps/knotes-17.04.1
+++ b/metadata/md5-cache/kde-apps/knotes-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/kdnssd-5.32.0:5 >=kde-frameworks/kglobalaccel-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-notes-17.04.1:5 >=kde-apps/akonadi-search-17.04.1:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kcalutils-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kmime-17.04.1:5 >=kde-apps/kontactinterface-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.04.1:5 >=kde-frameworks/kf-env-4 !kde-apps/knotes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/knotes-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7286477ddef2c93a173600195f5e5a83
diff --git a/metadata/md5-cache/kde-apps/kollision-16.12.3 b/metadata/md5-cache/kde-apps/kollision-16.12.3
index b2fed8d7c865..3c85b53a49e7 100644
--- a/metadata/md5-cache/kde-apps/kollision-16.12.3
+++ b/metadata/md5-cache/kde-apps/kollision-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kollision:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kollision-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3f70db307a07c7f21e514e811eb68ca5
diff --git a/metadata/md5-cache/kde-apps/kollision-17.04.1 b/metadata/md5-cache/kde-apps/kollision-17.04.1
index ad8c7a7b5cdd..ff3d4152381a 100644
--- a/metadata/md5-cache/kde-apps/kollision-17.04.1
+++ b/metadata/md5-cache/kde-apps/kollision-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kollision:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kollision-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7815be8bf8ef6e4bc680111399601297
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-16.12.3 b/metadata/md5-cache/kde-apps/kolourpaint-16.12.3
index d71c1fc741d2..d309aa9a2d72 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-16.12.3
+++ b/metadata/md5-cache/kde-apps/kolourpaint-16.12.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkexiv2-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 scanner? ( >=kde-apps/libksane-16.12.3:5 ) >=kde-frameworks/kf-env-4 !kde-apps/kolourpaint:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kolourpaint-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0f5d7a5ecee524fe50a18b332daa3519
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-17.04.1 b/metadata/md5-cache/kde-apps/kolourpaint-17.04.1
index 4ceca6af8879..fd232fd55196 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-17.04.1
+++ b/metadata/md5-cache/kde-apps/kolourpaint-17.04.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 scanner? ( >=kde-apps/libksane-17.04.1:5 ) >=kde-frameworks/kf-env-4 !kde-apps/kolourpaint:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kolourpaint-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a35687c63f4c7b32b3eac216998ff637
diff --git a/metadata/md5-cache/kde-apps/kompare-16.12.3 b/metadata/md5-cache/kde-apps/kompare-16.12.3
index b4f0ec726aae..7d19efe87df9 100644
--- a/metadata/md5-cache/kde-apps/kompare-16.12.3
+++ b/metadata/md5-cache/kde-apps/kompare-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkomparediff2-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kompare:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kompare-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9f364a4c4689e125342b25ef2e55d49a
diff --git a/metadata/md5-cache/kde-apps/kompare-17.04.1 b/metadata/md5-cache/kde-apps/kompare-17.04.1
index e326915d8071..bc6646f0d2da 100644
--- a/metadata/md5-cache/kde-apps/kompare-17.04.1
+++ b/metadata/md5-cache/kde-apps/kompare-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktexteditor-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkomparediff2-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kompare:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kompare-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6221468178b9448b800134f8365f79f3
diff --git a/metadata/md5-cache/kde-apps/konqueror-16.12.3 b/metadata/md5-cache/kde-apps/konqueror-16.12.3
index 81989823bde6..33a655ce98be 100644
--- a/metadata/md5-cache/kde-apps/konqueror-16.12.3
+++ b/metadata/md5-cache/kde-apps/konqueror-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kbookmarks-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/konqueror-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=67f7720f79c28a257948341462c2d198
diff --git a/metadata/md5-cache/kde-apps/konqueror-17.04.1 b/metadata/md5-cache/kde-apps/konqueror-17.04.1
index 806b78edd7ec..fe608c0b86e7 100644
--- a/metadata/md5-cache/kde-apps/konqueror-17.04.1
+++ b/metadata/md5-cache/kde-apps/konqueror-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kbookmarks-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/konqueror-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4f75fac66607be80755e514c24c06b41
diff --git a/metadata/md5-cache/kde-apps/konsole-16.12.3 b/metadata/md5-cache/kde-apps/konsole-16.12.3
index df0fd03a178e..e0a8947aa3f3 100644
--- a/metadata/md5-cache/kde-apps/konsole-16.12.3
+++ b/metadata/md5-cache/kde-apps/konsole-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kinit-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kpty-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !kde-apps/konsole:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/konsole-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=bcd55204d133442d5e43ce2decb7fc70
diff --git a/metadata/md5-cache/kde-apps/konsole-16.12.3-r1 b/metadata/md5-cache/kde-apps/konsole-16.12.3-r1
index 86ce3f15767a..60783b904a01 100644
--- a/metadata/md5-cache/kde-apps/konsole-16.12.3-r1
+++ b/metadata/md5-cache/kde-apps/konsole-16.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kinit-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kpty-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !kde-apps/konsole:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/konsole-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=cec1fec6ca84c9e04aa6528411cae5fd
diff --git a/metadata/md5-cache/kde-apps/konsole-17.04.1 b/metadata/md5-cache/kde-apps/konsole-17.04.1
index 3d354984f82c..6afc870344e7 100644
--- a/metadata/md5-cache/kde-apps/konsole-17.04.1
+++ b/metadata/md5-cache/kde-apps/konsole-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kinit-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/knotifyconfig-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kpty-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !kde-apps/konsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/konsole-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=130733c18598a621442c9d1dae24c770
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-17.04.1 b/metadata/md5-cache/kde-apps/konsolekalendar-17.04.1
index 8f94d7d1b850..797d11286d6d 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-17.04.1
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-calendar-17.04.1:5 >=kde-apps/calendarsupport-17.04.1:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kcalutils-17.04.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/akonadi-calendar-tools-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=48996a943b97d8ddba07a34807492103
diff --git a/metadata/md5-cache/kde-apps/kontact-17.04.1 b/metadata/md5-cache/kde-apps/kontact-17.04.1
index 9c3b4be2543c..644eddc1b913 100644
--- a/metadata/md5-cache/kde-apps/kontact-17.04.1
+++ b/metadata/md5-cache/kde-apps/kontact-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/grantleetheme-17.04.1:5 >=kde-apps/kdepim-apps-libs-17.04.1:5 >=kde-apps/kontactinterface-17.04.1:5 >=kde-apps/kpimtextedit-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=kde-apps/mailcommon-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kontact:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kontact-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0b3921a873cc1442495f0070896ac9f9
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-17.04.1 b/metadata/md5-cache/kde-apps/kontactinterface-17.04.1
index 6d534ea1fcdd..84152e361860 100644
--- a/metadata/md5-cache/kde-apps/kontactinterface-17.04.1
+++ b/metadata/md5-cache/kde-apps/kontactinterface-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kontactinterface:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kontactinterface-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ce4494c3691ba3c6d546e7a0295ec941
diff --git a/metadata/md5-cache/kde-apps/korganizer-17.04.1 b/metadata/md5-cache/kde-apps/korganizer-17.04.1
index 2d60cc33c43e..f8e3cfee0634 100644
--- a/metadata/md5-cache/kde-apps/korganizer-17.04.1
+++ b/metadata/md5-cache/kde-apps/korganizer-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-calendar-17.04.1:5 >=kde-apps/akonadi-contacts-17.04.1:5 >=kde-apps/akonadi-mime-17.04.1:5 >=kde-apps/akonadi-notes-17.04.1:5 >=kde-apps/akonadi-search-17.04.1:5 >=kde-apps/calendarsupport-17.04.1:5 >=kde-apps/eventviews-17.04.1:5 >=kde-apps/incidenceeditor-17.04.1:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kcalutils-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kdepim-apps-libs-17.04.1:5 >=kde-apps/kholidays-17.04.1:5 >=kde-apps/kidentitymanagement-17.04.1:5 >=kde-apps/kmailtransport-17.04.1:5 >=kde-apps/kmime-17.04.1:5 >=kde-apps/kontactinterface-17.04.1:5 >=kde-apps/kpimtextedit-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/phonon[qt5] X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.04.1:5 >=kde-frameworks/kf-env-4 !kde-apps/korganizer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/korganizer-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d8c76bece4955bbaa773f565a4309452
diff --git a/metadata/md5-cache/kde-apps/kpat-16.12.3 b/metadata/md5-cache/kde-apps/kpat-16.12.3
index 40d599f4b115..873be14dd726 100644
--- a/metadata/md5-cache/kde-apps/kpat-16.12.3
+++ b/metadata/md5-cache/kde-apps/kpat-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 !kde-apps/kpat:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kpat-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=13de7bc3aa8e4da21f1f739a154d2fd0
diff --git a/metadata/md5-cache/kde-apps/kpat-17.04.1 b/metadata/md5-cache/kde-apps/kpat-17.04.1
index d11b69879ad3..3071bac58f5d 100644
--- a/metadata/md5-cache/kde-apps/kpat-17.04.1
+++ b/metadata/md5-cache/kde-apps/kpat-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kpat-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=dea33a739ea024a079bea20f86422fea
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-17.04.1 b/metadata/md5-cache/kde-apps/kpimtextedit-17.04.1
index 5d959fe19d6e..be1313aad1dd 100644
--- a/metadata/md5-cache/kde-apps/kpimtextedit-17.04.1
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kpimtextedit-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=88f5d2f5546f4740bce8c5735a0ff8e4
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-16.12.3 b/metadata/md5-cache/kde-apps/kqtquickcharts-16.12.3
index c122aee631ce..64a2ade6f3f2 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-16.12.3
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kqtquickcharts:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kqtquickcharts-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ac1cdc872d7e61c8f988acce605a56f7
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-17.04.1 b/metadata/md5-cache/kde-apps/kqtquickcharts-17.04.1
index fb1d88609bf7..23e8a0c2ca68 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-17.04.1
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kqtquickcharts-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=793c8a98568d62e38eaba457b583e930
diff --git a/metadata/md5-cache/kde-apps/krdc-16.12.3 b/metadata/md5-cache/kde-apps/krdc-16.12.3
index ba35f0b059d8..229853e429e0 100644
--- a/metadata/md5-cache/kde-apps/krdc-16.12.3
+++ b/metadata/md5-cache/kde-apps/krdc-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdnssd-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 !kde-apps/krdc:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/krdc-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=bf743b208d95e61a1eb7fbbab818c2f3
diff --git a/metadata/md5-cache/kde-apps/krdc-17.04.1 b/metadata/md5-cache/kde-apps/krdc-17.04.1
index 9e4734950557..14a7a6fa28bf 100644
--- a/metadata/md5-cache/kde-apps/krdc-17.04.1
+++ b/metadata/md5-cache/kde-apps/krdc-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.32.0:5 >=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdnssd-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/knotifyconfig-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 !kde-apps/krdc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/krdc-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fe1daff997d6251469ebdf7222c9a153
diff --git a/metadata/md5-cache/kde-apps/krfb-16.12.3-r1 b/metadata/md5-cache/kde-apps/krfb-16.12.3-r1
index 19e1e5e1d9e0..f1ec5375b5cb 100644
--- a/metadata/md5-cache/kde-apps/krfb-16.12.3-r1
+++ b/metadata/md5-cache/kde-apps/krfb-16.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdnssd-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=net-libs/libvncserver-0.9.9 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXtst >=kde-frameworks/kf-env-4 !kde-apps/krfb:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/krfb-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6003967a46fd286ad096d4772c6cfb1b
diff --git a/metadata/md5-cache/kde-apps/krfb-17.04.1 b/metadata/md5-cache/kde-apps/krfb-17.04.1
index 68df9eda5510..49e515107d9c 100644
--- a/metadata/md5-cache/kde-apps/krfb-17.04.1
+++ b/metadata/md5-cache/kde-apps/krfb-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kdnssd-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=net-libs/libvncserver-0.9.9 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXtst >=kde-frameworks/kf-env-4 !kde-apps/krfb:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/krfb-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=edc010e6a533942a54830ea6ca5a178d
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-16.12.3 b/metadata/md5-cache/kde-apps/kross-interpreters-16.12.3
index 5dd7cf52f817..6fea27e4aaf6 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-16.12.3
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kross-interpreters-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=774dad5e362bfe0876b564c3b0f70ae3
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-17.04.1 b/metadata/md5-cache/kde-apps/kross-interpreters-17.04.1
index 3637fe6311e2..02a3615245e0 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-17.04.1
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kross-interpreters-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=201840e857fd64493827d02913b23319
diff --git a/metadata/md5-cache/kde-apps/kruler-16.12.3 b/metadata/md5-cache/kde-apps/kruler-16.12.3
index 0b1cadd06754..fc2ecf612e63 100644
--- a/metadata/md5-cache/kde-apps/kruler-16.12.3
+++ b/metadata/md5-cache/kde-apps/kruler-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 !kde-apps/kruler:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kruler-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c352ae0f26a1cb6fc19eccd3fec66055
diff --git a/metadata/md5-cache/kde-apps/kruler-17.04.1 b/metadata/md5-cache/kde-apps/kruler-17.04.1
index a93dbd89cdeb..58f81d9770d4 100644
--- a/metadata/md5-cache/kde-apps/kruler-17.04.1
+++ b/metadata/md5-cache/kde-apps/kruler-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 !kde-apps/kruler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kruler-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=474fe2d549ad3a2ce7da14e224797528
diff --git a/metadata/md5-cache/kde-apps/kshisen-16.12.3 b/metadata/md5-cache/kde-apps/kshisen-16.12.3
index c90415c0125f..77787568c29b 100644
--- a/metadata/md5-cache/kde-apps/kshisen-16.12.3
+++ b/metadata/md5-cache/kde-apps/kshisen-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=kde-apps/libkmahjongg-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kshisen:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kshisen-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5d03d8d35c3e51ded3aacbe6da452f7e
diff --git a/metadata/md5-cache/kde-apps/kshisen-17.04.1 b/metadata/md5-cache/kde-apps/kshisen-17.04.1
index cd524f2039ef..9474fe991042 100644
--- a/metadata/md5-cache/kde-apps/kshisen-17.04.1
+++ b/metadata/md5-cache/kde-apps/kshisen-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=kde-apps/libkmahjongg-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kshisen-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9a63128061161632adaac5d7676c46d6
diff --git a/metadata/md5-cache/kde-apps/ksquares-16.12.3 b/metadata/md5-cache/kde-apps/ksquares-16.12.3
index b281417f05c3..c6922b48c85a 100644
--- a/metadata/md5-cache/kde-apps/ksquares-16.12.3
+++ b/metadata/md5-cache/kde-apps/ksquares-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ksquares:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ksquares-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=96e31bcce5901d3c93fa49a160a3adcb
diff --git a/metadata/md5-cache/kde-apps/ksquares-17.04.1 b/metadata/md5-cache/kde-apps/ksquares-17.04.1
index 5e83e0af3027..2f2ce3b660c5 100644
--- a/metadata/md5-cache/kde-apps/ksquares-17.04.1
+++ b/metadata/md5-cache/kde-apps/ksquares-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ksquares:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ksquares-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=af72aac5d44e4622c23bbc4c222de5d5
diff --git a/metadata/md5-cache/kde-apps/kstars-16.12.3-r1 b/metadata/md5-cache/kde-apps/kstars-16.12.3-r1
index 3891c1ce4228..9927f4be256e 100644
--- a/metadata/md5-cache/kde-apps/kstars-16.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kstars-16.12.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0
 REQUIRED_USE=indi? ( fits ) python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kstars-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f2a00455c9bb600d9e4d8e7bc6522601
diff --git a/metadata/md5-cache/kde-apps/kstars-17.04.1 b/metadata/md5-cache/kde-apps/kstars-17.04.1
index ce2cf0f3024a..1b97f67c2cec 100644
--- a/metadata/md5-cache/kde-apps/kstars-17.04.1
+++ b/metadata/md5-cache/kde-apps/kstars-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0
 REQUIRED_USE=indi? ( fits ) python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kstars-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f05c00be0403f380ce10171592ec573b
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-16.12.3 b/metadata/md5-cache/kde-apps/ksystemlog-16.12.3
index d6ddc888b84a..df6062cb2b6c 100644
--- a/metadata/md5-cache/kde-apps/ksystemlog-16.12.3
+++ b/metadata/md5-cache/kde-apps/ksystemlog-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ksystemlog-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2fc1539dfed367ad55f75cfda4ea11c3
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-17.04.1 b/metadata/md5-cache/kde-apps/ksystemlog-17.04.1
index 5785a5683510..2b8a7d84c1e9 100644
--- a/metadata/md5-cache/kde-apps/ksystemlog-17.04.1
+++ b/metadata/md5-cache/kde-apps/ksystemlog-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ksystemlog-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fdb3ba77573f4599cc8bb7c950b431d7
diff --git a/metadata/md5-cache/kde-apps/kteatime-16.12.3 b/metadata/md5-cache/kde-apps/kteatime-16.12.3
index 1460326b8ba1..2a66c9ebd0f1 100644
--- a/metadata/md5-cache/kde-apps/kteatime-16.12.3
+++ b/metadata/md5-cache/kde-apps/kteatime-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kteatime:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kteatime-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d09bfbbeeb88835095d9f80c40a648ae
diff --git a/metadata/md5-cache/kde-apps/kteatime-17.04.1 b/metadata/md5-cache/kde-apps/kteatime-17.04.1
index 94af7e5bfc95..10b946b6cfec 100644
--- a/metadata/md5-cache/kde-apps/kteatime-17.04.1
+++ b/metadata/md5-cache/kde-apps/kteatime-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/knotifyconfig-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kteatime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kteatime-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=bfbcdc8f6b817ef290ce9e757569fda5
diff --git a/metadata/md5-cache/kde-apps/ktimer-16.12.3 b/metadata/md5-cache/kde-apps/ktimer-16.12.3
index 80f446e1cd20..6dbba77ce5b1 100644
--- a/metadata/md5-cache/kde-apps/ktimer-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktimer-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ktimer:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktimer-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=632238d80c1f8d6761e7d0789c258aed
diff --git a/metadata/md5-cache/kde-apps/ktimer-17.04.1 b/metadata/md5-cache/kde-apps/ktimer-17.04.1
index 66b21dd3659c..b21b391a2a58 100644
--- a/metadata/md5-cache/kde-apps/ktimer-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktimer-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ktimer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktimer-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=68bb95b5eb3bcfb03817e882679c0713
diff --git a/metadata/md5-cache/kde-apps/ktouch-16.12.3 b/metadata/md5-cache/kde-apps/ktouch-16.12.3
index baa71810604c..702b3257b92d 100644
--- a/metadata/md5-cache/kde-apps/ktouch-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktouch-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=dev-qt/qtxmlpatterns-5.6.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-16.12.3:5 >=kde-frameworks/kf-env-4 !kde-apps/ktouch:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktouch-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2dfc16b78f26e8b85cc8d76012a9a027
diff --git a/metadata/md5-cache/kde-apps/ktouch-17.04.1 b/metadata/md5-cache/kde-apps/ktouch-17.04.1
index 4b63b43ecf50..7b1b335cbd9e 100644
--- a/metadata/md5-cache/kde-apps/ktouch-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktouch-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdeclarative-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=dev-qt/qtxmlpatterns-5.6.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-17.04.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ktouch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktouch-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=93bcc021186651740018cdc1b0d8eff5
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-16.12.3 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-16.12.3
index ec9fdb659e6d..537d23d80e2a 100644
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-16.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-apps/kaccounts-integration-16.12.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5] >=kde-apps/kaccounts-providers-16.12.3:5 net-im/telepathy-connection-managers !kde-apps/ktp-accounts-kcm:4 >=kde-frameworks/kf-env-4 !kde-apps/ktp-accounts-kcm:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktp-accounts-kcm-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=630e164b0edc572d09d50a74226f194f
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.04.1 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.04.1
index 05cdae930f3c..c56cfe874553 100644
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.04.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-apps/kaccounts-integration-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5] >=kde-apps/kaccounts-providers-17.04.1:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktp-accounts-kcm-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=afde4a737b78802f0b14a2490184b497
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-16.12.3 b/metadata/md5-cache/kde-apps/ktp-approver-16.12.3
index 6afacaabbf08..59b32fc308be 100644
--- a/metadata/md5-cache/kde-apps/ktp-approver-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-approver-16.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/telepathy-qt[qt5] >=kde-apps/ktp-contact-list-16.12.3:5 !kde-apps/ktp-approver:4 >=kde-frameworks/kf-env-4 !kde-apps/ktp-approver:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktp-approver-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=65f6c2d957cef91c95c81ac7303c9366
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-17.04.1 b/metadata/md5-cache/kde-apps/ktp-approver-17.04.1
index 487f90f83d2c..62240ca234e6 100644
--- a/metadata/md5-cache/kde-apps/ktp-approver-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktp-approver-17.04.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/telepathy-qt[qt5] >=kde-apps/ktp-contact-list-17.04.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-approver:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktp-approver-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1fba1c8206cf15057a7ce5ca963dad09
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-16.12.3 b/metadata/md5-cache/kde-apps/ktp-auth-handler-16.12.3
index fc28e99fac57..15a7fbdca481 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-16.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-apps/kaccounts-integration-16.12.3:5 >=kde-apps/ktp-common-internals-16.12.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5] app-crypt/qca:2[ssl] !kde-apps/ktp-auth-handler:4 >=kde-frameworks/kf-env-4 !kde-apps/ktp-auth-handler:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktp-auth-handler-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5dcfa6d76c1f1021f0ed43649e5dc218
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.04.1 b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.04.1
index 519432b97c89..7c1cd111dec1 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.04.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-apps/kaccounts-integration-17.04.1:5 >=kde-apps/ktp-common-internals-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktp-auth-handler-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f8e8f85d882ebb0c39223da14c6a5423
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-16.12.3 b/metadata/md5-cache/kde-apps/ktp-call-ui-16.12.3
index 7e6ce3d056b5..184e38af66dc 100644
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/ktp-common-internals-16.12.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5] media-libs/qt-gstreamer[qt5] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5] !kde-apps/ktp-call-ui:4 >=kde-frameworks/kf-env-4 !kde-apps/ktp-call-ui:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktp-call-ui-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1b36e58a9611f3a71a323221dda1a666
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-17.04.1 b/metadata/md5-cache/kde-apps/ktp-call-ui-17.04.1
index e0d519f71521..9a78f0dba06f 100644
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/ktp-common-internals-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5] media-libs/qt-gstreamer[qt5] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5] >=kde-frameworks/kf-env-4 !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktp-call-ui-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6e554e0ecad96e0624d6b0909ddd9df6
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-16.12.3 b/metadata/md5-cache/kde-apps/ktp-common-internals-16.12.3
index e86446eb510e..39fe9cd82a80 100644
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-16.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kpeople-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 net-libs/telepathy-logger-qt:5 >=net-libs/telepathy-qt-0.9.5[qt5] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-16.12.3:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) !kde-apps/ktp-common-internals:4 >=kde-frameworks/kf-env-4 !kde-apps/ktp-common-internals:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktp-common-internals-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=48c605c78c16c946caa89e926172fbce
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-17.04.1 b/metadata/md5-cache/kde-apps/ktp-common-internals-17.04.1
index 9308ca53205b..c9ce85c9e4ad 100644
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-17.04.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/knotifyconfig-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kpeople-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktexteditor-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 net-libs/telepathy-logger-qt:5 >=net-libs/telepathy-qt-0.9.5[qt5] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.04.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktp-common-internals-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ba9b28361c1d086d86a6b422048821ba
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-16.12.3 b/metadata/md5-cache/kde-apps/ktp-contact-list-16.12.3
index 37ef765f1f28..aec48a744bd1 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kpeople-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/ktp-common-internals-16.12.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/telepathy-qt[qt5] !kde-apps/ktp-contact-list:4 >=kde-frameworks/kf-env-4 !kde-apps/ktp-contact-list:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktp-contact-list-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=da6d04d51f25cf72c83ed8dd5619ac38
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-17.04.1 b/metadata/md5-cache/kde-apps/ktp-contact-list-17.04.1
index e1cbac6a7eb9..55d9d56d61ef 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kpeople-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/ktp-common-internals-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/telepathy-qt[qt5] >=kde-frameworks/kf-env-4 !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktp-contact-list-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=19fbb83609eeed741bc7036b513f3f9e
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-16.12.3 b/metadata/md5-cache/kde-apps/ktp-contact-runner-16.12.3
index 633dea657690..fd59e57e3bff 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-16.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/krunner-5.29.0:5 >=kde-apps/ktp-common-internals-16.12.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/telepathy-qt[qt5] !kde-apps/ktp-contact-runner:4 >=kde-frameworks/kf-env-4 !kde-apps/ktp-contact-runner:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktp-contact-runner-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3e6a822afe91b89fb0aec3f67bff4981
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.04.1 b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.04.1
index 01855f6c322e..f1d856ffac71 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.04.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/krunner-5.32.0:5 >=kde-apps/ktp-common-internals-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/telepathy-qt[qt5] >=kde-frameworks/kf-env-4 !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktp-contact-runner-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fa7e9b8fb77e4b64052e8559d8bd1289
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-16.12.3 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-16.12.3
index e5ee0e6e7fe1..354165da89c3 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-16.12.3
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5 !kde-apps/ktp-desktop-applets:4 >=kde-frameworks/kf-env-4 !kde-apps/ktp-desktop-applets:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktp-desktop-applets-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=148e4701c52becd940986d4311e5dc94
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.04.1 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.04.1
index ecb791bf8222..50180408aef3 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.04.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdeclarative-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/plasma-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktp-desktop-applets-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b9545ca6fc9dd049f9cab616876c5dbc
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-16.12.3 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-16.12.3
index 5ce98f48c305..52b963638732 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-apps/ktp-common-internals-16.12.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/telepathy-qt[qt5] !kde-apps/ktp-filetransfer-handler:4 >=kde-frameworks/kf-env-4 !kde-apps/ktp-filetransfer-handler:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktp-filetransfer-handler-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f123510b067e5ee1acf21493e1f940e9
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.04.1 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.04.1
index 1eafda6bce42..554116b6e955 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-apps/ktp-common-internals-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/telepathy-qt[qt5] >=kde-frameworks/kf-env-4 !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktp-filetransfer-handler-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=50cf4af51238e8aa971c29314f58ef9c
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-16.12.3 b/metadata/md5-cache/kde-apps/ktp-kded-module-16.12.3
index f88dda3737ec..9a9cc553a90e 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-16.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-apps/ktp-common-internals-16.12.3:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/telepathy-qt[qt5] >=kde-apps/signon-kwallet-extension-16.12.3:5 !kde-apps/ktp-kded-module:4 >=kde-frameworks/kf-env-4 !kde-apps/ktp-kded-module:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktp-kded-module-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=84ab171038f56456f2924ca9c66dcacb
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-17.04.1 b/metadata/md5-cache/kde-apps/ktp-kded-module-17.04.1
index f81d760f9bc8..0e73bba3a4b3 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-17.04.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kidletime-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-apps/ktp-common-internals-17.04.1:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/telepathy-qt[qt5] >=kde-apps/signon-kwallet-extension-17.04.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktp-kded-module-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=479fdaa3607224db26cb665a87841845
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-16.12.3 b/metadata/md5-cache/kde-apps/ktp-send-file-16.12.3
index f5c25c80d517..6be003717c18 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-16.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-apps/ktp-common-internals-16.12.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/telepathy-qt[qt5] >=kde-apps/ktp-contact-list-16.12.3:5 >=kde-apps/ktp-filetransfer-handler-16.12.3:5 !kde-apps/ktp-send-file:4 >=kde-frameworks/kf-env-4 !kde-apps/ktp-send-file:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktp-send-file-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9a40b794758a88c020e2571301619b7e
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-17.04.1 b/metadata/md5-cache/kde-apps/ktp-send-file-17.04.1
index 1cc8093cac08..697a16d03146 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-17.04.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-apps/ktp-common-internals-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/telepathy-qt[qt5] >=kde-apps/ktp-contact-list-17.04.1:5 >=kde-apps/ktp-filetransfer-handler-17.04.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktp-send-file-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b2698654d093f850ae550b2bebc5834c
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-16.12.3 b/metadata/md5-cache/kde-apps/ktp-text-ui-16.12.3
index 7ee9ed464a02..5e0662f1a13b 100644
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-16.12.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdewebkit-5.29.0:5 >=kde-frameworks/kemoticons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kpeople-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/sonnet-5.29.0:5 >=kde-apps/ktp-common-internals-16.12.3:5[otr] >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 net-libs/telepathy-qt[qt5] speech? ( >=dev-qt/qtspeech-5.6.1:5 ) >=kde-apps/ktp-contact-list-16.12.3:5 !kde-apps/ktp-text-ui:4 >=kde-frameworks/kf-env-4 !kde-apps/ktp-text-ui:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktp-text-ui-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b81c980c7dbaa5f914e7b90e2fe4125e
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-17.04.1 b/metadata/md5-cache/kde-apps/ktp-text-ui-17.04.1
index 4745d94ee327..d81bb8087a35 100644
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-17.04.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kdewebkit-5.32.0:5 >=kde-frameworks/kemoticons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/knotifyconfig-5.32.0:5 >=kde-frameworks/kpeople-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-frameworks/sonnet-5.32.0:5 >=kde-apps/ktp-common-internals-17.04.1:5[otr] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-libs/telepathy-qt[qt5] speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-apps/ktp-contact-list-17.04.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktp-text-ui-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b546d93263c612c924479c2126ac0fa2
diff --git a/metadata/md5-cache/kde-apps/ktuberling-16.12.3 b/metadata/md5-cache/kde-apps/ktuberling-16.12.3
index 4a71771caebb..2cc575e2232a 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-16.12.3
+++ b/metadata/md5-cache/kde-apps/ktuberling-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-4 !kde-apps/ktuberling:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/ktuberling-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3e57e5b5dd1ac68cb4eb20f26df9f932
diff --git a/metadata/md5-cache/kde-apps/ktuberling-17.04.1 b/metadata/md5-cache/kde-apps/ktuberling-17.04.1
index 761b5e68d4a5..55ab683ed3ae 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-17.04.1
+++ b/metadata/md5-cache/kde-apps/ktuberling-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-4 !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktuberling-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8563d62fa77ed8859e6a7495412c7f2d
diff --git a/metadata/md5-cache/kde-apps/kturtle-16.12.3 b/metadata/md5-cache/kde-apps/kturtle-16.12.3
index f367a74dd1d4..be4b8b1a583e 100644
--- a/metadata/md5-cache/kde-apps/kturtle-16.12.3
+++ b/metadata/md5-cache/kde-apps/kturtle-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kturtle:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kturtle-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=55c274c26ad985b46edfbe3e8c77ffc2
diff --git a/metadata/md5-cache/kde-apps/kturtle-17.04.1 b/metadata/md5-cache/kde-apps/kturtle-17.04.1
index 886f1c9d4ed6..9592fabccfad 100644
--- a/metadata/md5-cache/kde-apps/kturtle-17.04.1
+++ b/metadata/md5-cache/kde-apps/kturtle-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kturtle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kturtle-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2a88be7f625daa3169d5191e1a5cd1be
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-16.12.3 b/metadata/md5-cache/kde-apps/kwalletmanager-16.12.3
index c97e7d02636f..7f7b26f7d9a0 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-16.12.3
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kwalletmanager-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9d821ede545ad6860b54b63e917d6a25
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-17.04.1 b/metadata/md5-cache/kde-apps/kwalletmanager-17.04.1
index 240b3f7757a2..f0151cd4b95a 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-17.04.1
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kauth-5.32.0:5 >=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kwalletmanager-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a460dca3b365dd3239fa5480af26fe28
diff --git a/metadata/md5-cache/kde-apps/kwave-16.12.3 b/metadata/md5-cache/kde-apps/kwave-16.12.3
index 82bad9a2cc15..1e1658e7c0c9 100644
--- a/metadata/md5-cache/kde-apps/kwave-16.12.3
+++ b/metadata/md5-cache/kde-apps/kwave-16.12.3
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.6.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 !kde-apps/kwave:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kwave-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a5b74f5c12f99367d2fd52647701d3a2
diff --git a/metadata/md5-cache/kde-apps/kwave-17.04.1 b/metadata/md5-cache/kde-apps/kwave-17.04.1
index 1fdc124d71cc..50320a83c87a 100644
--- a/metadata/md5-cache/kde-apps/kwave-17.04.1
+++ b/metadata/md5-cache/kde-apps/kwave-17.04.1
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.6.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 !kde-apps/kwave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kwave-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=90b16fb7fb34ec9bdbc1404ff4ce5ae2
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-16.12.3 b/metadata/md5-cache/kde-apps/kwordquiz-16.12.3
index 3d545a3f81d5..ad133915c51f 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-16.12.3
+++ b/metadata/md5-cache/kde-apps/kwordquiz-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkeduvocdocument-16.12.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-4 !kde-apps/kwordquiz:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kwordquiz-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=83db2db6e1090cdb419470b60749f2b5
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-17.04.1 b/metadata/md5-cache/kde-apps/kwordquiz-17.04.1
index f56776c62734..f529a79eaa5c 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-17.04.1
+++ b/metadata/md5-cache/kde-apps/kwordquiz-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/knotifyconfig-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkeduvocdocument-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-4 !kde-apps/kwordquiz:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kwordquiz-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7388acc235984b56863136a857f9f287
diff --git a/metadata/md5-cache/kde-apps/kwrite-16.12.3 b/metadata/md5-cache/kde-apps/kwrite-16.12.3
index 207aef71df76..a724ff214ac7 100644
--- a/metadata/md5-cache/kde-apps/kwrite-16.12.3
+++ b/metadata/md5-cache/kde-apps/kwrite-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kwrite:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kate-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ef5a7b80c6af475e82a2d38b7b81c97c
diff --git a/metadata/md5-cache/kde-apps/kwrite-17.04.1 b/metadata/md5-cache/kde-apps/kwrite-17.04.1
index c837e1eda0a2..c28f10377719 100644
--- a/metadata/md5-cache/kde-apps/kwrite-17.04.1
+++ b/metadata/md5-cache/kde-apps/kwrite-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/ktexteditor-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kwrite:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kate-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=834f3332aaa9d5039c5e904090a30c1b
diff --git a/metadata/md5-cache/kde-apps/libgravatar-17.04.1 b/metadata/md5-cache/kde-apps/libgravatar-17.04.1
index c5ce5bcc3696..8bbb1dd365d7 100644
--- a/metadata/md5-cache/kde-apps/libgravatar-17.04.1
+++ b/metadata/md5-cache/kde-apps/libgravatar-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/libgravatar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libgravatar-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d467f1ef80a7ff640c83550adafdd926
diff --git a/metadata/md5-cache/kde-apps/libkcddb-16.12.3 b/metadata/md5-cache/kde-apps/libkcddb-16.12.3
index c05841f80ade..de6e7dcdbc4d 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-16.12.3
+++ b/metadata/md5-cache/kde-apps/libkcddb-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/libkcddb-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=efcbfed115a64e060c9bf26503d5aede
diff --git a/metadata/md5-cache/kde-apps/libkcddb-17.04.1 b/metadata/md5-cache/kde-apps/libkcddb-17.04.1
index a1b6ca193259..c60f50c8069b 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkcddb-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkcddb-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=abc6c67f35e0c5d1cbd9e451e85d9d67
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-16.12.3-r1 b/metadata/md5-cache/kde-apps/libkcompactdisc-16.12.3-r1
index b6c80d6b7ce7..c85343c4b886 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-16.12.3-r1
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-16.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 media-libs/phonon[qt5] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/libkcompactdisc-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=215b7746e2d6f31ae19b232c355273d5
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-17.04.1 b/metadata/md5-cache/kde-apps/libkcompactdisc-17.04.1
index ddd09a8d6e2d..3e072f879857 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/solid-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 media-libs/phonon[qt5] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkcompactdisc-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=005541b381977a6b535c2221f2c4b251
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-16.12.3 b/metadata/md5-cache/kde-apps/libkdcraw-16.12.3
index de2d3d188f18..ca227f7529a0 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-16.12.3
+++ b/metadata/md5-cache/kde-apps/libkdcraw-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/libkdcraw-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=65445715eaaf7188c8976de9accce330
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-17.04.1 b/metadata/md5-cache/kde-apps/libkdcraw-17.04.1
index dcf882f97d1d..f9c321972817 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkdcraw-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkdcraw-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3ba562e8c308bfc7a040fa3179d15463
diff --git a/metadata/md5-cache/kde-apps/libkdegames-16.12.3 b/metadata/md5-cache/kde-apps/libkdegames-16.12.3
index 2f50deff9850..1e05acdabb99 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-16.12.3
+++ b/metadata/md5-cache/kde-apps/libkdegames-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdnssd-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/libkdegames-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2ada39058df788870f9881d3e994870e
diff --git a/metadata/md5-cache/kde-apps/libkdegames-17.04.1 b/metadata/md5-cache/kde-apps/libkdegames-17.04.1
index e9321979b13b..af73d61723a6 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkdegames-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kbookmarks-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kdeclarative-5.32.0:5 >=kde-frameworks/kdnssd-5.32.0:5 >=kde-frameworks/kglobalaccel-5.32.0:5 >=kde-frameworks/kguiaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkdegames-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c3e1170047901b72db907935627b37d4
diff --git a/metadata/md5-cache/kde-apps/libkdepim-17.04.1 b/metadata/md5-cache/kde-apps/libkdepim-17.04.1
index c8bebe4ffde4..66275af3018e 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkdepim-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-contacts-17.04.1:5 >=kde-apps/akonadi-search-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kldap-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/libkdepim:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkdepim-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4c60d4f583d6c53b5f714611a44a2e95
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-16.12.3 b/metadata/md5-cache/kde-apps/libkeduvocdocument-16.12.3
index d23b42c8c666..018b40c7782e 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-16.12.3
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/libkeduvocdocument:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/libkeduvocdocument-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8919469c9479c0dc37bb4c9285756498
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.04.1 b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.04.1
index d385351a43bb..4325060f1e2f 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkeduvocdocument-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4805d93bfe3ff9debab4061d3ae7e363
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-16.12.3 b/metadata/md5-cache/kde-apps/libkexiv2-16.12.3
index e7e274f261e0..20ab76564ecb 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-16.12.3
+++ b/metadata/md5-cache/kde-apps/libkexiv2-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/libkexiv2-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c85476688339297b9ef1f0c414af416d
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-17.04.1 b/metadata/md5-cache/kde-apps/libkexiv2-17.04.1
index d6b17352c453..d1dce3a20426 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkexiv2-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkexiv2-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3dd03181070ad0f6030366350b093fa5
diff --git a/metadata/md5-cache/kde-apps/libkface-16.12.3 b/metadata/md5-cache/kde-apps/libkface-16.12.3
index 08bdac3135f0..1651f0d01338 100644
--- a/metadata/md5-cache/kde-apps/libkface-16.12.3
+++ b/metadata/md5-cache/kde-apps/libkface-16.12.3
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/opencv:= || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0-r6[contrib] ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/libkface-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6db5c7894beb341324393a2066a412c4
diff --git a/metadata/md5-cache/kde-apps/libkface-17.04.1 b/metadata/md5-cache/kde-apps/libkface-17.04.1
index 846d02271f0d..21d314e1a475 100644
--- a/metadata/md5-cache/kde-apps/libkface-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkface-17.04.1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/opencv:= || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0-r6[contrib] ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkface-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d966c2d7c4662d9ea1f0c9f5e5a54835
diff --git a/metadata/md5-cache/kde-apps/libkgapi-17.04.1 b/metadata/md5-cache/kde-apps/libkgapi-17.04.1
index 6138edec581f..15747ef7c391 100644
--- a/metadata/md5-cache/kde-apps/libkgapi-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkgapi-17.04.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkgapi-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=24dfdff37197c865db42090cea704a1f
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-16.12.3 b/metadata/md5-cache/kde-apps/libkgeomap-16.12.3
index 5dbbf60330b1..c8f0f8746d34 100644
--- a/metadata/md5-cache/kde-apps/libkgeomap-16.12.3
+++ b/metadata/md5-cache/kde-apps/libkgeomap-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-apps/marble-16.12.3:5=[kde] >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/libkgeomap:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/libkgeomap-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=cfb19a31d29abc717d51b59068da6975
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-17.04.1 b/metadata/md5-cache/kde-apps/libkgeomap-17.04.1
index 086c579b3282..35bb447d8676 100644
--- a/metadata/md5-cache/kde-apps/libkgeomap-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkgeomap-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-apps/marble-17.04.1:5=[kde] >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/libkgeomap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkgeomap-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f0d45505ea6346df1cc872a24915520c
diff --git a/metadata/md5-cache/kde-apps/libkipi-16.12.3 b/metadata/md5-cache/kde-apps/libkipi-16.12.3
index 78d35463b855..6a308d0910ca 100644
--- a/metadata/md5-cache/kde-apps/libkipi-16.12.3
+++ b/metadata/md5-cache/kde-apps/libkipi-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/32
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/libkipi-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=501e3f06d16bb77fcaf7ea6deb5894ef
diff --git a/metadata/md5-cache/kde-apps/libkipi-17.04.1 b/metadata/md5-cache/kde-apps/libkipi-17.04.1
index 48098fbb8e7d..133cab11c23d 100644
--- a/metadata/md5-cache/kde-apps/libkipi-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkipi-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/32
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkipi-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=82831fc2f022860ea522ea28e5394ed1
diff --git a/metadata/md5-cache/kde-apps/libkleo-17.04.1 b/metadata/md5-cache/kde-apps/libkleo-17.04.1
index 1918560ae043..a798f3aa43ec 100644
--- a/metadata/md5-cache/kde-apps/libkleo-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkleo-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-apps/kpimtextedit-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/libkleo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkleo-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5d7fa272e629c40f1082e8b93f0b98f6
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-16.12.3 b/metadata/md5-cache/kde-apps/libkmahjongg-16.12.3
index 8b4f52edeb6c..d19c928fa33a 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-16.12.3
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/libkmahjongg-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5a29a79a3b04384c66d6df0ca8f80b4f
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-17.04.1 b/metadata/md5-cache/kde-apps/libkmahjongg-17.04.1
index de9a52c2dbea..ffee7551a82e 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkmahjongg-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a4b2119544209cb1ca0c1e27404c7c88
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-16.12.3 b/metadata/md5-cache/kde-apps/libkomparediff2-16.12.3
index 1f460b9c779a..dd2ed76598d2 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-16.12.3
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/libkomparediff2:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/libkomparediff2-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=80bc70fb0e0d54f8afe61f8b28676ffe
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-17.04.1 b/metadata/md5-cache/kde-apps/libkomparediff2-17.04.1
index 63929dc82bd0..4a2bf07295de 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-17.04.1
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libkomparediff2-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6d43df2985a81ae8cb8b159e61e0b91f
diff --git a/metadata/md5-cache/kde-apps/libksane-16.12.3 b/metadata/md5-cache/kde-apps/libksane-16.12.3
index a18717bea82c..f0861c9e3c75 100644
--- a/metadata/md5-cache/kde-apps/libksane-16.12.3
+++ b/metadata/md5-cache/kde-apps/libksane-16.12.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-gfx/sane-backends !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/libksane-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5492bcaf9f2e18f976d60bf8377fa827
diff --git a/metadata/md5-cache/kde-apps/libksane-17.04.1 b/metadata/md5-cache/kde-apps/libksane-17.04.1
index c5b43870ff8e..ac2b61cd44d3 100644
--- a/metadata/md5-cache/kde-apps/libksane-17.04.1
+++ b/metadata/md5-cache/kde-apps/libksane-17.04.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-gfx/sane-backends !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libksane-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3afc048f212ddb8582ddc852f3ef8aa4
diff --git a/metadata/md5-cache/kde-apps/libksieve-17.04.1 b/metadata/md5-cache/kde-apps/libksieve-17.04.1
index e61689f70357..2a5f15178f10 100644
--- a/metadata/md5-cache/kde-apps/libksieve-17.04.1
+++ b/metadata/md5-cache/kde-apps/libksieve-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/libksieve-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8e69dc416d6111cd384bc36b7a126799
diff --git a/metadata/md5-cache/kde-apps/libktnef-17.04.1 b/metadata/md5-cache/kde-apps/libktnef-17.04.1
index 76e7ce7bc877..53638f4a675d 100644
--- a/metadata/md5-cache/kde-apps/libktnef-17.04.1
+++ b/metadata/md5-cache/kde-apps/libktnef-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kcalutils-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/libktnef:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/ktnef-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=757da307823486b6782b412eaee1ff08
diff --git a/metadata/md5-cache/kde-apps/lokalize-16.12.3 b/metadata/md5-cache/kde-apps/lokalize-16.12.3
index d8a095308c80..8bf3984ba1ba 100644
--- a/metadata/md5-cache/kde-apps/lokalize-16.12.3
+++ b/metadata/md5-cache/kde-apps/lokalize-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/lokalize-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=90903b0cc9a6f9e395abf953ae3990b0
diff --git a/metadata/md5-cache/kde-apps/lokalize-17.04.1 b/metadata/md5-cache/kde-apps/lokalize-17.04.1
index 0307b6f717c3..13a15f253fb6 100644
--- a/metadata/md5-cache/kde-apps/lokalize-17.04.1
+++ b/metadata/md5-cache/kde-apps/lokalize-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/lokalize-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4819e7907ca5be8c1e4f6dfc723cfd76
diff --git a/metadata/md5-cache/kde-apps/mailcommon-17.04.1 b/metadata/md5-cache/kde-apps/mailcommon-17.04.1
index 4db9a663bc53..00bdbdfbf6e5 100644
--- a/metadata/md5-cache/kde-apps/mailcommon-17.04.1
+++ b/metadata/md5-cache/kde-apps/mailcommon-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/mailcommon-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=42d889f07bef011277d258aca06224f2
diff --git a/metadata/md5-cache/kde-apps/mailimporter-17.04.1 b/metadata/md5-cache/kde-apps/mailimporter-17.04.1
index 3a2ba1ab7d33..fbdd215b787d 100644
--- a/metadata/md5-cache/kde-apps/mailimporter-17.04.1
+++ b/metadata/md5-cache/kde-apps/mailimporter-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-mime-17.04.1:5 >=kde-apps/kmime-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/mailimporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/mailimporter-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0fd5e0538adba1dc85f0ca314e528d8f
diff --git a/metadata/md5-cache/kde-apps/marble-16.12.3-r1 b/metadata/md5-cache/kde-apps/marble-16.12.3-r1
index 58917ca0ab24..0084d4076a12 100644
--- a/metadata/md5-cache/kde-apps/marble-16.12.3-r1
+++ b/metadata/md5-cache/kde-apps/marble-16.12.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qt
 RESTRICT=test
 SLOT=5/16.12
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/marble-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=984907bd55793e68bb368b110de09734
diff --git a/metadata/md5-cache/kde-apps/marble-17.04.1 b/metadata/md5-cache/kde-apps/marble-17.04.1
index e70fc0f5d5f2..d3bd696deed0 100644
--- a/metadata/md5-cache/kde-apps/marble-17.04.1
+++ b/metadata/md5-cache/kde-apps/marble-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qt
 RESTRICT=test
 SLOT=5/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/marble-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d9b55d4ba4ca42530a55fc55f83fb0d1
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-17.04.1 b/metadata/md5-cache/kde-apps/mbox-importer-17.04.1
index 2d6bf60036c9..e046a1928fe9 100644
--- a/metadata/md5-cache/kde-apps/mbox-importer-17.04.1
+++ b/metadata/md5-cache/kde-apps/mbox-importer-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/kidentitymanagement-17.04.1:5 >=kde-apps/mailcommon-17.04.1:5 >=kde-apps/mailimporter-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 !kde-apps/mbox-importer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/mbox-importer-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=54ff6df6a1f35d241108aba19ce6f998
diff --git a/metadata/md5-cache/kde-apps/messagelib-17.04.1 b/metadata/md5-cache/kde-apps/messagelib-17.04.1
index 65d66d472055..71b0026f83ac 100644
--- a/metadata/md5-cache/kde-apps/messagelib-17.04.1
+++ b/metadata/md5-cache/kde-apps/messagelib-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/messagelib-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=35ec31c9a8d4c427f846e06ea9c87c83
diff --git a/metadata/md5-cache/kde-apps/minuet-16.04.3 b/metadata/md5-cache/kde-apps/minuet-16.04.3
index d395c453611d..ef9c6cd7fdb5 100644
--- a/metadata/md5-cache/kde-apps/minuet-16.04.3
+++ b/metadata/md5-cache/kde-apps/minuet-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/alsa-lib >=media-sound/drumstick-1.0.1 >=dev-qt/qtquickcontrols-5.6.1:5 media-sound/timidity++ media-sound/timidity-freepats >=kde-frameworks/kf-env-4 !kde-apps/minuet:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/minuet-16.04.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=72b6581c9c5ca28019bacec2a6786bf2
diff --git a/metadata/md5-cache/kde-apps/minuet-16.12.3 b/metadata/md5-cache/kde-apps/minuet-16.12.3
index cf980e2fb59e..57bb37757fab 100644
--- a/metadata/md5-cache/kde-apps/minuet-16.12.3
+++ b/metadata/md5-cache/kde-apps/minuet-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=dev-qt/qtdeclarative-5.7.0:5 >=dev-qt/qtgui-5.7.0:5 >=dev-qt/qtsvg-5.7.0:5 >=dev-qt/qtquickcontrols2-5.7.0:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 !kde-apps/minuet:4 >=dev-qt/qtcore-5.7.0:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/minuet-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=781b3acf7b059264cfa476784f0830ce
diff --git a/metadata/md5-cache/kde-apps/minuet-17.04.1 b/metadata/md5-cache/kde-apps/minuet-17.04.1
index ebbbf5334e15..4fd6ee85b6d1 100644
--- a/metadata/md5-cache/kde-apps/minuet-17.04.1
+++ b/metadata/md5-cache/kde-apps/minuet-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=dev-qt/qtdeclarative-5.7.0:5 >=dev-qt/qtgui-5.7.0:5 >=dev-qt/qtsvg-5.7.0:5 >=dev-qt/qtquickcontrols2-5.7.0:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 !kde-apps/minuet:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.0:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/minuet-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=781b3acf7b059264cfa476784f0830ce
diff --git a/metadata/md5-cache/kde-apps/okteta-16.12.3 b/metadata/md5-cache/kde-apps/okteta-16.12.3
index e5d32d3ccfda..dc97cc79b4ed 100644
--- a/metadata/md5-cache/kde-apps/okteta-16.12.3
+++ b/metadata/md5-cache/kde-apps/okteta-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtscript-5.6.1:5[scripttools] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 crypt? ( app-crypt/qca:2[qt5] ) >=kde-frameworks/kf-env-4 !kde-apps/okteta:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/okteta-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ac5f8d84111a2478f9cadf11226123a6
diff --git a/metadata/md5-cache/kde-apps/okteta-17.04.1 b/metadata/md5-cache/kde-apps/okteta-17.04.1
index 536544b99b1f..a61aa30496c4 100644
--- a/metadata/md5-cache/kde-apps/okteta-17.04.1
+++ b/metadata/md5-cache/kde-apps/okteta-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.32.0:5 >=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtscript-5.6.1:5[scripttools] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 crypt? ( app-crypt/qca:2[qt5] ) >=kde-frameworks/kf-env-4 !kde-apps/okteta:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/okteta-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=284facb0e61d6b3ba346413323f83e10
diff --git a/metadata/md5-cache/kde-apps/okular-16.12.3 b/metadata/md5-cache/kde-apps/okular-16.12.3
index 3dcf439365c1..b1a8bb688b8c 100644
--- a/metadata/md5-cache/kde-apps/okular-16.12.3
+++ b/metadata/md5-cache/kde-apps/okular-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/karchive-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/okular-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7beebfbe2baebdd8f3d2f0b9371df1b6
diff --git a/metadata/md5-cache/kde-apps/okular-17.04.1 b/metadata/md5-cache/kde-apps/okular-17.04.1
index b1d50d73aaf1..1100362605a8 100644
--- a/metadata/md5-cache/kde-apps/okular-17.04.1
+++ b/metadata/md5-cache/kde-apps/okular-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.32.0:5 >=kde-frameworks/karchive-5.32.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/okular-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1e95382b7e3d72b89956234a86be4fae
diff --git a/metadata/md5-cache/kde-apps/parley-16.12.3 b/metadata/md5-cache/kde-apps/parley-16.12.3
index 1b8477895768..fb93d44bfe46 100644
--- a/metadata/md5-cache/kde-apps/parley-16.12.3
+++ b/metadata/md5-cache/kde-apps/parley-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkeduvocdocument-16.12.3:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/khtml-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kross-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/sonnet-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtmultimedia-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-16.12.3:5 >=kde-frameworks/kf-env-4 !kde-apps/parley:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/parley-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9742dcc125a1fb993e82927ba7b49058
diff --git a/metadata/md5-cache/kde-apps/parley-17.04.1 b/metadata/md5-cache/kde-apps/parley-17.04.1
index db342e0109c7..b7bf6bb9e55a 100644
--- a/metadata/md5-cache/kde-apps/parley-17.04.1
+++ b/metadata/md5-cache/kde-apps/parley-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkeduvocdocument-17.04.1:5 >=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/khtml-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kross-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-frameworks/sonnet-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtmultimedia-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-17.04.1:5 >=kde-frameworks/kf-env-4 !kde-apps/parley:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/parley-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4a0ce323298a0f12ad02c3deb4d228a5
diff --git a/metadata/md5-cache/kde-apps/picmi-16.12.3 b/metadata/md5-cache/kde-apps/picmi-16.12.3
index 07d88b82cf0b..6027fe0d2a12 100644
--- a/metadata/md5-cache/kde-apps/picmi-16.12.3
+++ b/metadata/md5-cache/kde-apps/picmi-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkdegames-16.12.3:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/picmi:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/picmi-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=db14bd4a689bc4aa0a460674ba8467e6
diff --git a/metadata/md5-cache/kde-apps/picmi-17.04.1 b/metadata/md5-cache/kde-apps/picmi-17.04.1
index ed78845af63b..373820a2d77e 100644
--- a/metadata/md5-cache/kde-apps/picmi-17.04.1
+++ b/metadata/md5-cache/kde-apps/picmi-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kdeclarative-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/libkdegames-17.04.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/picmi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/picmi-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=bdbc2ceada94f206dd21b467194c63ac
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-17.04.1 b/metadata/md5-cache/kde-apps/pim-data-exporter-17.04.1
index ef0530e8bc14..64f585759611 100644
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-17.04.1
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kidentitymanagement-17.04.1:5 >=kde-apps/kmailtransport-17.04.1:5 >=kde-apps/kmime-17.04.1:5 >=kde-apps/kpimtextedit-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=kde-apps/mailcommon-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/pim-data-exporter-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9ec560e9bd982d4da8361d05c6f5cb92
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.04.1 b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.04.1
index b88b91e76382..136e104ffb73 100644
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.04.1
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kbookmarks-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-contacts-17.04.1:5 >=kde-apps/akonadi-mime-17.04.1:5 >=kde-apps/calendarsupport-17.04.1:5 >=kde-apps/kcalcore-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kmailtransport-17.04.1:5 >=kde-apps/libksieve-17.04.1:5 >=kde-apps/pimcommon-17.04.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/pim-sieve-editor-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c62ace281fc947bbece0d3c4ff0a100a
diff --git a/metadata/md5-cache/kde-apps/pimcommon-17.04.1 b/metadata/md5-cache/kde-apps/pimcommon-17.04.1
index 5cb5c89e25e9..52cd2ea850ac 100644
--- a/metadata/md5-cache/kde-apps/pimcommon-17.04.1
+++ b/metadata/md5-cache/kde-apps/pimcommon-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kitemmodels-5.32.0:5 >=kde-frameworks/kitemviews-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwallet-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=kde-apps/akonadi-17.04.1:5 >=kde-apps/akonadi-contacts-17.04.1:5 >=kde-apps/akonadi-mime-17.04.1:5 >=kde-apps/kcontacts-17.04.1:5 >=kde-apps/kimap-17.04.1:5 >=kde-apps/kmime-17.04.1:5 >=kde-apps/kpimtextedit-17.04.1:5 >=kde-apps/libkdepim-17.04.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/pimcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/pimcommon-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=94ac012a80b74453178924472ee52d86
diff --git a/metadata/md5-cache/kde-apps/poxml-16.12.3 b/metadata/md5-cache/kde-apps/poxml-16.12.3
index 2646db8dfed4..b5615c245a18 100644
--- a/metadata/md5-cache/kde-apps/poxml-16.12.3
+++ b/metadata/md5-cache/kde-apps/poxml-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.6.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 !kde-apps/poxml:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/poxml-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2e74b164ec2bc28a937cbbbda7512b56
diff --git a/metadata/md5-cache/kde-apps/poxml-17.04.1 b/metadata/md5-cache/kde-apps/poxml-17.04.1
index 7a4ef2748a2a..e1b325a94255 100644
--- a/metadata/md5-cache/kde-apps/poxml-17.04.1
+++ b/metadata/md5-cache/kde-apps/poxml-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.6.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 !kde-apps/poxml:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/poxml-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6e2ae667b3e7964ba2e2a5d688aba0da
diff --git a/metadata/md5-cache/kde-apps/print-manager-16.12.3 b/metadata/md5-cache/kde-apps/print-manager-16.12.3
index 7f3ff4b5f6ba..12bb88a502b8 100644
--- a/metadata/md5-cache/kde-apps/print-manager-16.12.3
+++ b/metadata/md5-cache/kde-apps/print-manager-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.4.1:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 !kde-apps/print-manager:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/print-manager-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a01a19d08aa3a28a7ae1146e85045fcd
diff --git a/metadata/md5-cache/kde-apps/print-manager-17.04.1 b/metadata/md5-cache/kde-apps/print-manager-17.04.1
index d8e480930123..bd669a511310 100644
--- a/metadata/md5-cache/kde-apps/print-manager-17.04.1
+++ b/metadata/md5-cache/kde-apps/print-manager-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/plasma-5.32.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.4.1:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 !kde-apps/print-manager:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/print-manager-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2c266c1b21150a263cb9313e2dd6df96
diff --git a/metadata/md5-cache/kde-apps/rocs-16.12.3 b/metadata/md5-cache/kde-apps/rocs-16.12.3
index c14c1feedf80..01ee6cda83cc 100644
--- a/metadata/md5-cache/kde-apps/rocs-16.12.3
+++ b/metadata/md5-cache/kde-apps/rocs-16.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/rocs-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=cd8d829e5fce2e5af39e8844102ceff0
diff --git a/metadata/md5-cache/kde-apps/rocs-17.04.1 b/metadata/md5-cache/kde-apps/rocs-17.04.1
index dd8c3380456d..e3edc5675422 100644
--- a/metadata/md5-cache/kde-apps/rocs-17.04.1
+++ b/metadata/md5-cache/kde-apps/rocs-17.04.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/rocs-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=be5313b5817f506772c39b438cc325e9
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-16.12.3 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-16.12.3
index ef76138b2a29..c3a1328f68ad 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-16.12.3
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kwallet-5.29.0:5 net-libs/signond >=kde-frameworks/kf-env-4 !kde-apps/signon-kwallet-extension:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/signon-kwallet-extension-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b57e48edd98b470a742aa2973f075183
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.04.1 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.04.1
index 996858cb1372..a77f04b29232 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.04.1
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kwallet-5.32.0:5 net-libs/signond >=kde-frameworks/kf-env-4 !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/signon-kwallet-extension-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=61b8bd8a81b373357256132c5757f264
diff --git a/metadata/md5-cache/kde-apps/spectacle-16.12.3 b/metadata/md5-cache/kde-apps/spectacle-16.12.3
index 8bb05601ca36..2a6df2bfde0c 100644
--- a/metadata/md5-cache/kde-apps/spectacle-16.12.3
+++ b/metadata/md5-cache/kde-apps/spectacle-16.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-16.12.3:5= ) share? ( dev-libs/purpose:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 !kde-apps/spectacle:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/spectacle-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=04edfb02b060947df0414b93428e6fcc
diff --git a/metadata/md5-cache/kde-apps/spectacle-17.04.1 b/metadata/md5-cache/kde-apps/spectacle-17.04.1
index 178d96a73231..ed15e955551c 100644
--- a/metadata/md5-cache/kde-apps/spectacle-17.04.1
+++ b/metadata/md5-cache/kde-apps/spectacle-17.04.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kdbusaddons-5.32.0:5 >=kde-frameworks/kdeclarative-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knotifications-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.04.1:5= ) share? ( dev-libs/purpose:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/spectacle-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=191475f5863d70d17d355f94753fd44c
diff --git a/metadata/md5-cache/kde-apps/step-16.12.3 b/metadata/md5-cache/kde-apps/step-16.12.3
index 583344da22ab..d4464061c956 100644
--- a/metadata/md5-cache/kde-apps/step-16.12.3
+++ b/metadata/md5-cache/kde-apps/step-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/khtml-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kplotting-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtopengl-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 !kde-apps/step:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/step-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b6b83e0a6609d88e0ec4566ec2955609
diff --git a/metadata/md5-cache/kde-apps/step-17.04.1 b/metadata/md5-cache/kde-apps/step-17.04.1
index d9655184d71b..04b86351c0a8 100644
--- a/metadata/md5-cache/kde-apps/step-17.04.1
+++ b/metadata/md5-cache/kde-apps/step-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kcrash-5.32.0:5 >=kde-frameworks/kdelibs4support-5.32.0:5 >=kde-frameworks/khtml-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/knewstuff-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kplotting-5.32.0:5 >=kde-frameworks/kservice-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtopengl-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 !kde-apps/step:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/step-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6fd5c2aae568fd90ad5f8ac9c6ded705
diff --git a/metadata/md5-cache/kde-apps/svgpart-16.12.3 b/metadata/md5-cache/kde-apps/svgpart-16.12.3
index 1611d929c4da..795d5a9574b9 100644
--- a/metadata/md5-cache/kde-apps/svgpart-16.12.3
+++ b/metadata/md5-cache/kde-apps/svgpart-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/svgpart-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=72e46406dcdb4b3e9f28210dcc3d2403
diff --git a/metadata/md5-cache/kde-apps/svgpart-17.04.1 b/metadata/md5-cache/kde-apps/svgpart-17.04.1
index 2ee655189c4e..931b72d48453 100644
--- a/metadata/md5-cache/kde-apps/svgpart-17.04.1
+++ b/metadata/md5-cache/kde-apps/svgpart-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kparts-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/svgpart-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fef28f61fe6cc442c743b8ae52138f90
diff --git a/metadata/md5-cache/kde-apps/syndication-17.04.1 b/metadata/md5-cache/kde-apps/syndication-17.04.1
index bed76dcc1ced..e3ed04df3480 100644
--- a/metadata/md5-cache/kde-apps/syndication-17.04.1
+++ b/metadata/md5-cache/kde-apps/syndication-17.04.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !kde-apps/syndication:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/syndication-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0621e72963fe30b1d95fd2679db34766
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-16.12.3 b/metadata/md5-cache/kde-apps/thumbnailers-16.12.3
index 61f874e592fa..b110fc7a2107 100644
--- a/metadata/md5-cache/kde-apps/thumbnailers-16.12.3
+++ b/metadata/md5-cache/kde-apps/thumbnailers-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 raw? ( >=kde-apps/libkdcraw-16.12.3:5 >=kde-apps/libkexiv2-16.12.3:5 ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/kdegraphics-thumbnailers-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ff0667224ca07d7cbee6e9fd3f35e145
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-17.04.1 b/metadata/md5-cache/kde-apps/thumbnailers-17.04.1
index db86b2f440e7..6fb9e41a2f4a 100644
--- a/metadata/md5-cache/kde-apps/thumbnailers-17.04.1
+++ b/metadata/md5-cache/kde-apps/thumbnailers-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 raw? ( >=kde-apps/libkdcraw-17.04.1:5 >=kde-apps/libkexiv2-17.04.1:5 ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/kdegraphics-thumbnailers-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ca26da3e3b5a36255e072a2385928c1c
diff --git a/metadata/md5-cache/kde-apps/umbrello-16.12.3 b/metadata/md5-cache/kde-apps/umbrello-16.12.3
index 232d41a59d11..3de763e9a728 100644
--- a/metadata/md5-cache/kde-apps/umbrello-16.12.3
+++ b/metadata/md5-cache/kde-apps/umbrello-16.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kf-env-4 !kde-apps/umbrello:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/umbrello-16.12.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c80d22ac9160fe3b418ab9309b4c40e8
diff --git a/metadata/md5-cache/kde-apps/umbrello-17.04.1 b/metadata/md5-cache/kde-apps/umbrello-17.04.1
index 512c9e6a6bd7..a47ad9ce95d9 100644
--- a/metadata/md5-cache/kde-apps/umbrello-17.04.1
+++ b/metadata/md5-cache/kde-apps/umbrello-17.04.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.32.0:5 >=kde-frameworks/kcompletion-5.32.0:5 >=kde-frameworks/kconfig-5.32.0:5 >=kde-frameworks/kconfigwidgets-5.32.0:5 >=kde-frameworks/kcoreaddons-5.32.0:5 >=kde-frameworks/ki18n-5.32.0:5 >=kde-frameworks/kiconthemes-5.32.0:5 >=kde-frameworks/kio-5.32.0:5 >=kde-frameworks/kjobwidgets-5.32.0:5 >=kde-frameworks/ktexteditor-5.32.0:5 >=kde-frameworks/ktextwidgets-5.32.0:5 >=kde-frameworks/kwidgetsaddons-5.32.0:5 >=kde-frameworks/kwindowsystem-5.32.0:5 >=kde-frameworks/kxmlgui-5.32.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kf-env-4 !kde-apps/umbrello:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.1/src/umbrello-17.04.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6f3c62ecaa2ee34d17ec6abcbd695b92
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.29.0 b/metadata/md5-cache/kde-frameworks/attica-5.29.0
index 82d5bac77161..67b652aa0e86 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtnetwork-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/attica-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=414a0213e45c6cd061fa60a601960dda
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.34.0 b/metadata/md5-cache/kde-frameworks/attica-5.34.0
index 1f926b92f8c3..65ffc41df0e2 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtnetwork-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/attica-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=dfd81dc73b94e6857173f9055ab0376d
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.29.0 b/metadata/md5-cache/kde-frameworks/baloo-5.29.0
index f6802a34f075..cf25b0d76f78 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.29.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kcrash-5.29:5 >=kde-frameworks/kdbusaddons-5.29:5 >=kde-frameworks/kfilemetadata-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kidletime-5.29:5 >=kde-frameworks/kio-5.29:5 >=kde-frameworks/solid-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/baloo-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4812ebdb26cdc064e67b992c63f442c0
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.34.0 b/metadata/md5-cache/kde-frameworks/baloo-5.34.0
index 755ad47e8cc8..ab1af4262f87 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.34.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kcrash-5.34:5 >=kde-frameworks/kdbusaddons-5.34:5 >=kde-frameworks/kfilemetadata-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kidletime-5.34:5 >=kde-frameworks/kio-5.34:5 >=kde-frameworks/solid-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/baloo-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4b6c08c03d5dd7a765922b2693c4be1f
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.29.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.29.0
index f212c6824e5c..05bee51f58c8 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 !kde-plasma/bluez-qt >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/bluez-qt-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e99a87cc25b60a03196fd4413a632465
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.34.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.34.0
index 81da2ffc047f..8209ac7e4abf 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 !kde-plasma/bluez-qt >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/bluez-qt-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=58759434ace2f43b865e6f287258d879
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.34.0-r1 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.34.0-r1
new file mode 100644
index 000000000000..81821825b870
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.34.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.34:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=Qt wrapper for Bluez 5 DBus API
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
+SLOT=5/5.34
+SRC_URI=mirror://kde/stable/frameworks/5.34/bluez-qt-5.34.0.tar.xz
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=9fddd9839d5fad31f648376e2bb09eb8
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.29.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.29.0
index bf47abb67205..f2e5fc2fcec1 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=!<kde-plasma/breeze-5.4.3:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/breeze-icons-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d8c0d92b31eaf28f83b065be957fa6a6
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.34.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.34.0
index f74596b9e93e..c7186240934f 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.34.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-3
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/breeze-icons-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3c991cfb28aa434a317b576d02d3f924
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.29.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.29.0
index 5b3f37f62b1d..fe31b19013e2 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.29.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/breeze-icons-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8398e914d19a05b7753fc7810a105be7
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.34.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.34.0
index 43583edef1c9..6ca87fae3b91 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.34.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/breeze-icons-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d67772808b4bac8b9e88bbdd6742354f
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.29.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.29.0
index 4d8a73e75621..82989a117483 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.29.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/extra-cmake-modules-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=077b7b7486ed8c44f7940c97e1d28c22
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.34.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.34.0
index c04cb8147e26..bedd17a83f9e 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.34.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/extra-cmake-modules-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=cd193dcc2b07d7bca3b8cfcbf7721305
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.29.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.29.0
index 266dc875e788..393796611396 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kconfigwidgets-5.29:5 >
 RESTRICT=test
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/frameworkintegration-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0a1cb182116542199e66db2a43807ea0
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.34.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.34.0
index fc657e64b13c..90fbe1cf6a30 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.34.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kconfigwidgets-5.34:5 >
 RESTRICT=test
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/frameworkintegration-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=22ae0e01c43d6bbd7e78b0f91a62efec
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.29.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.29.0
index 558c9fef50ad..fbba9866de60 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.29.0
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kio-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=kde-plasma/kactivitymanagerd-5.4.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kactivities-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d4f974c237d95eb1d7cd06fc22e70928
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.34.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.34.0
index 517e78b64077..d52b0ef48fac 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.34.0
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=kde-plasma/kactivitymanagerd-5.4.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kactivities-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a2ecaa5ceef52787eec99ad8ca19cd07
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.29.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.29.0
index e42a2765987b..128eb460bc7e 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=kde-frameworks/kactivities-5.29:5 >=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kactivities-stats-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=087279d7302741529f5c190c70ef29cf
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.34.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.34.0
index b003831e6370..f4292c4def31 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=kde-frameworks/kactivities-5.34:5 >=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kactivities-stats-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=45be8bff12c0bd8574bd4faa06f06956
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.29.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.29.0
index 9270779fa9f3..be559793f880 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.29.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.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kapidox-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3082b324629c59333c029b3a84c997a6
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.34.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.34.0
index e444fec808a4..51205b845dfe 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.34.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.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kapidox-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=19b65b2e813fba8fcd778eca732f11a7
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.29.0 b/metadata/md5-cache/kde-frameworks/karchive-5.29.0
index 07072d1deb5d..4c15c99b3a78 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.29.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-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/karchive-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fc07fc8a8c2daccac374f2f9e3a759d2
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.34.0 b/metadata/md5-cache/kde-frameworks/karchive-5.34.0
index c50e9a7396c0..e91023dbcb5c 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.34.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-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/karchive-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=160ef7a39e8cafc316f7d9f2a5cec9e5
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.29.0-r1 b/metadata/md5-cache/kde-frameworks/kauth-5.29.0-r1
index 98c203a70c09..bc9826682a41 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.29.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.29.0-r1
@@ -10,5 +10,5 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29:5 >=dev-qt/qtdbus-5.6.1:5= >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 policykit? ( sys-auth/polkit-qt[qt5] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kauth-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a9b482d8a8082620a8bcf1d4dffec61b
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.34.0 b/metadata/md5-cache/kde-frameworks/kauth-5.34.0
index 2db482d09e0c..b2bfc06c9e26 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.34.0
@@ -10,5 +10,5 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.34:5 >=dev-qt/qtdbus-5.6.1:5= >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 policykit? ( sys-auth/polkit-qt[qt5] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kauth-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a424f82e2b345aa5f8ee699036a96871
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.29.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.29.0
index 6a42cf3d5a18..39bb18972201 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.29:5 >=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kiconthemes-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=kde-frameworks/kxmlgui-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kbookmarks-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0063115178d6b5971208c2bfac6b27dd
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.34.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.34.0
index 7130d2fdec44..261274ad5732 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.34:5 >=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kiconthemes-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=kde-frameworks/kxmlgui-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kbookmarks-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c63187d8e7d982082aa04d6f12de679d
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.29.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.29.0
index 669cb260704a..25cd5b7feefb 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.29:5 >=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kconfigwidgets-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kdeclarative-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kiconthemes-5.29:5 >=kde-frameworks/kitemviews-5.29:5 >=kde-frameworks/kservice-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=kde-frameworks/kxmlgui-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kcmutils-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4dbcb88c3e8afe5358324a3396826c53
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.34.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.34.0
index 907897550c97..9f6e56a468f0 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.34:5 >=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kconfigwidgets-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kdeclarative-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kiconthemes-5.34:5 >=kde-frameworks/kitemviews-5.34:5 >=kde-frameworks/kservice-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=kde-frameworks/kxmlgui-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kcmutils-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=829c41b5b4003e0fdd6c5798babf0525
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.29.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.29.0
index 3e8cd435d37d..d78a727c67f9 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.29.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kcodecs-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=69e93625f00df9f646507e700976979a
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.34.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.34.0
index 8b1a9c496e1a..9e5b77e4e344 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.34.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kcodecs-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=303cb98162dfa963fcb99b0eb91bca74
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.29.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.29.0
index ad46e4015bd9..b6ee659c1b0a 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.29.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kcompletion-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=22beddd5836923d0dfb1b96c6b3ed66e
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.34.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.34.0
index 3dc2c9c047eb..17c3bec46890 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.34.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kcompletion-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9a6c4714780255d4d8d3f59e5bc197d2
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.29.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.29.0
index 039ca2931ede..38235e3f98c9 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4
 RESTRICT=test
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kconfig-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e48eb393ec5f5fe2bcd08cb4e6f58f77
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.34.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.34.0
index c608f6f62f1d..b25931076071 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.34.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4
 RESTRICT=test
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kconfig-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=56f486f854401a6c156dff2fb95c6d2d
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.29.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.29.0
index 3b40bf5615d6..f8622d89c4e3 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.29:5 >=kde-frameworks/kcodecs-5.29:5 >=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kguiaddons-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !<kde-frameworks/kdelibs4support-5.3.0:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kconfigwidgets-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=24c138399d5734d487fcfdeffff749ad
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.34.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.34.0
index 3d41079cad31..7b71155a4a64 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.34:5 >=kde-frameworks/kcodecs-5.34:5 >=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kguiaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !<kde-frameworks/kdelibs4support-5.3.0:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kconfigwidgets-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3fd8eb11e3cb7ea4d1dcfbe9c16ca800
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.29.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.29.0
index cb74d8b879a4..d8ba2a569393 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.6.1:5[icu] fam? ( virtual/fam ) !<kde-frameworks/kservice-5.2.0:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kcoreaddons-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9e63756f1359c3c936f145392d7bcd9d
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.34.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.34.0
index eac4542ec9e7..77632fab8747 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.6.1:5[icu] fam? ( virtual/fam ) !<kde-frameworks/kservice-5.2.0:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kcoreaddons-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fb9d56b9c9f745fd78f45a7b440ca8ea
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.34.0-r1 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.34.0-r1
index 35f0716a12b2..c6bd9f8c5b68 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.34.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.34.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.6.1:5[icu] fam? ( virtual/fam ) !<kde-frameworks/kservice-5.2.0:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kcoreaddons-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b080958e92a3f40c2abaec5fe217f342
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.29.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.29.0
index a35a10a77fbb..e65cb2bcb1b6 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kwindowsystem-5.29:
 RESTRICT=test
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kcrash-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6e69336e42cc23ce569d759b521e600f
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.34.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.34.0
index 2f12e43dbf6d..a47d0b8ae070 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.34.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kwindowsystem-5.34:
 RESTRICT=test
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kcrash-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0fb87872a3e74fec12b4d48a46aa3883
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.29.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.29.0
index 21050152c7af..ca7289d42a7e 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.6.1:5 X? ( >=dev-qt/qtx11extras-5.6.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kdbusaddons-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=174aa5d99bbf9b68e677e6877895d9fd
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.34.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.34.0
index 43f1b8600b44..4ca16a74e391 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.6.1:5 X? ( >=dev-qt/qtx11extras-5.6.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kdbusaddons-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e5ededcf04133d95008201043567523a
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.29.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.29.0
index 5735d556e757..f227ead31404 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kglobalaccel-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kiconthemes-5.29:5 >=kde-frameworks/kio-5.29:5 >=kde-frameworks/kpackage-5.29:5 >=kde-frameworks/kservice-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=kde-frameworks/kwindowsystem-5.29:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kdeclarative-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1ff127910f07f3492df3ee9a28552281
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.34.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.34.0
index 3e827833735c..11942084430e 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kglobalaccel-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kiconthemes-5.34:5 >=kde-frameworks/kio-5.34:5 >=kde-frameworks/kpackage-5.34:5 >=kde-frameworks/kservice-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=kde-frameworks/kwindowsystem-5.34:5 >=dev-qt/qtdeclarative-5.6.1:5= >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kdeclarative-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5c91e8d00e4c5105d7c93cda3f0164ef
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.29.0 b/metadata/md5-cache/kde-frameworks/kded-5.29.0
index c02874171d0f..e4aaaa9a5889 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kcrash-5.29:5 >=kde-frameworks/kdbusaddons-5.29:5 >=kde-frameworks/kinit-5.29:5 >=kde-frameworks/kservice-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kded-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=daea3947ab97baad17f53aa6d28293da
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.34.0 b/metadata/md5-cache/kde-frameworks/kded-5.34.0
index f87560d3224f..245849942404 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kcrash-5.34:5 >=kde-frameworks/kdbusaddons-5.34:5 >=kde-frameworks/kinit-5.34:5 >=kde-frameworks/kservice-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kded-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c1c8cd045caa844e8f74a7a06b38096b
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.29.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.29.0
index e4e4fcc037ee..b60474bf15e8 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.29:5 >=kde-frameworks/kcodecs-5.29:5 >=kde-fram
 RESTRICT=test
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/portingAids/kdelibs4support-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=99a4d7b0ff6aeeb103f8c9ab0c55f530
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.34.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.34.0
index 775c855bfa59..660cbced0823 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.34.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.34:5 >=kde-frameworks/kcodecs-5.34:5 >=kde-fram
 RESTRICT=test
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/portingAids/kdelibs4support-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f65759f169c030e203e3cd6301b5f916
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.29.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.29.0
index 6d5ddafef4e6..303136c38a78 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 designer? ( >=dev-qt/designer-5.6.1:5 >=kde-frameworks/kcompletion-5.29:5 >=kde-frameworks/kconfigwidgets-5.29:5 >=kde-frameworks/kiconthemes-5.29:5 >=kde-frameworks/kio-5.29:5 >=kde-frameworks/kitemviews-5.29:5 >=kde-frameworks/kplotting-5.29:5 >=kde-frameworks/ktextwidgets-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=kde-frameworks/kxmlgui-5.29:5 >=kde-frameworks/sonnet-5.29:5 ) webkit? ( >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=kde-frameworks/kdewebkit-5.29:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kdesignerplugin-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8974b8143a66e4b0d313bc5f9379f633
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.34.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.34.0
index 1b1dd82f34c9..36a208f54a3f 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 designer? ( >=dev-qt/designer-5.6.1:5 >=kde-frameworks/kcompletion-5.34:5 >=kde-frameworks/kconfigwidgets-5.34:5 >=kde-frameworks/kiconthemes-5.34:5 >=kde-frameworks/kio-5.34:5 >=kde-frameworks/kitemviews-5.34:5 >=kde-frameworks/kplotting-5.34:5 >=kde-frameworks/ktextwidgets-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=kde-frameworks/kxmlgui-5.34:5 >=kde-frameworks/sonnet-5.34:5 ) webkit? ( >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=kde-frameworks/kdewebkit-5.34:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kdesignerplugin-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=123cfd607bcd630ff050a18b05e1e199
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.29.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.29.0
index b1b1dd1b90a6..9f3938ad9f7e 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kpty-5.29:5 >=kde-frameworks/kservice-5.29:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kdesu-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d570637dcd165914ce4b24d012061efa
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.34.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.34.0
index cc67fd245ba8..5feffd1c7b7f 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kpty-5.34:5 >=kde-frameworks/kservice-5.34:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kdesu-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4cb6a42446398c192fcda9653a062156
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.29.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.29.0
index e446f43fb9a3..0ed86b091f6d 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kio-5.29:5 >=kde-frameworks/kjobwidgets-5.29:5 >=kde-frameworks/kparts-5.29:5 >=kde-frameworks/kservice-5.29:5 >=kde-frameworks/kwallet-5.29:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kdewebkit-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=95c4a57a33cd2c526d3d2da8076513ec
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.34.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.34.0
index 8f9f5aef28ab..fa7622803021 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kio-5.34:5 >=kde-frameworks/kjobwidgets-5.34:5 >=kde-frameworks/kparts-5.34:5 >=kde-frameworks/kservice-5.34:5 >=kde-frameworks/kwallet-5.34:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kdewebkit-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7cb3f6071ac61ee4af3169ac4ce09809
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.29.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.29.0
index 1ebbf5d4ec34..a8ef580146a9 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.6.1:5 zeroconf? ( >=dev-qt/qtdbus-5.6.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kdnssd-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=12a21a785c7848e3544f74a5d32c9a16
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.34.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.34.0
index 2226441e4e6f..d10a2a3f0ad7 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.6.1:5 zeroconf? ( >=dev-qt/qtdbus-5.6.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kdnssd-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d9392ab30956688fd2d6e09d20884684
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.29.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.29.0
index 14b81a9d1e2e..747e0aa1afb0 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.29.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.29:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kdoctools-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=622d10e0b087ce409b7f95cbc8404be5
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.34.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.34.0
index dd5879565cdc..41b4b42f54ef 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.34.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.34:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kdoctools-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=256b9cadf68948e2218772122feb4b6d
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.29.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.29.0
index 63653128ea0c..baa2896fefea 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.29:5 >=kde-frameworks/kconfig-5.29:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kemoticons-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=28e0c76ff00e73ae57feaf1ada3b95d6
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.34.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.34.0
index f0d970a8c868..e45254ec44d4 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.34.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.34:5 >=kde-frameworks/kconfig-5.34:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kemoticons-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e732651961d7c16c70058d80a9c41c56
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.29.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.29.0
index e6cd03f81007..e5d648f0847c 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.29.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=dev-qt/qtxml-5.6.1: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-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kfilemetadata-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f4f3ba8ffe53b7b2507d638f464dfa58
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.34.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.34.0
index 96a954201f1e..b5f4b5e6ca2b 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.34.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/ki18n-5.34:5 >=dev-qt/qtxml-5.6.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.34:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kfilemetadata-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ed31392bd87a57c978a3f557fc559d77
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.29.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.29.0
index 0db38f60373a..74997c30a85b 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kcrash-5.29:5 >=kde-frameworks/kdbusaddons-5.29:5 >=kde-frameworks/kservice-5.29:5 >=kde-frameworks/kwindowsystem-5.29:5[X] >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms !<kde-plasma/plasma-workspace-5.2.0-r2:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kglobalaccel-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7ce059ecee4829e264133b84736845ca
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.34.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.34.0
index ab1d519d7a9f..77204900c268 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kcrash-5.34:5 >=kde-frameworks/kdbusaddons-5.34:5 >=kde-frameworks/kwindowsystem-5.34:5[X] >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kglobalaccel-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=04f6526bea1dc025c5be34d190a7162e
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.29.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.29.0
index 7c8ae56e4fb5..5e112cbfa7a7 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kguiaddons-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=213236a92070a0e990ffbd22390336ae
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.34.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.34.0
index 9e712025401c..a21afd7e8242 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kguiaddons-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=099ac82ffb493e7ad49234b1374ce211
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.29.0 b/metadata/md5-cache/kde-frameworks/khtml-5.29.0
index 9af5e022e5c6..45f37fd8caef 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29:5 >=kde-frameworks/kcodecs-5.29:5 >=kde-frameworks/kcompletion-5.29:5 >=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kconfigwidgets-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kglobalaccel-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kiconthemes-5.29:5 >=kde-frameworks/kio-5.29:5 >=kde-frameworks/kjobwidgets-5.29:5 >=kde-frameworks/kjs-5.29:5 >=kde-frameworks/knotifications-5.29:5 >=kde-frameworks/kparts-5.29:5 >=kde-frameworks/kservice-5.29:5 >=kde-frameworks/ktextwidgets-5.29:5 >=kde-frameworks/kwallet-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=kde-frameworks/kwindowsystem-5.29:5 >=kde-frameworks/kxmlgui-5.29:5 >=kde-frameworks/sonnet-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5[ssl] >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/portingAids/khtml-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ab8c8e01a335461ea850c727db4261ff
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.34.0 b/metadata/md5-cache/kde-frameworks/khtml-5.34.0
index 7a4d7d85c506..7968a73c6298 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.34:5 >=kde-frameworks/kcodecs-5.34:5 >=kde-frameworks/kcompletion-5.34:5 >=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kconfigwidgets-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kglobalaccel-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kiconthemes-5.34:5 >=kde-frameworks/kio-5.34:5 >=kde-frameworks/kjobwidgets-5.34:5 >=kde-frameworks/kjs-5.34:5 >=kde-frameworks/knotifications-5.34:5 >=kde-frameworks/kparts-5.34:5 >=kde-frameworks/kservice-5.34:5 >=kde-frameworks/ktextwidgets-5.34:5 >=kde-frameworks/kwallet-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=kde-frameworks/kwindowsystem-5.34:5 >=kde-frameworks/kxmlgui-5.34:5 >=kde-frameworks/sonnet-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5[ssl] >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/portingAids/khtml-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=21b3903c799967072a8de8cc5ffe7725
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.29.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.29.0
index bccd95df85e6..70bc3643ca31 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.29.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/ki18n-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b9de1d2b669adc9b4bfa7344a785bf18
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.34.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.34.0
index 5098dcd48ebb..e12bc7bcd840 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.34.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/ki18n-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b7edc48d01f84e03234d3ff71f81e27b
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.29.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.29.0
index 38d71609cfe7..78832b74bd2b 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.29:5 >=kde-frameworks/kconfig-5.29:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kiconthemes-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=cdff9d4811a70a9d14e55dad3fb86728
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.34.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.34.0
index 8f3a9a385a30..e8c094f91d06 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.34.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.34:5 >=kde-frameworks/kconfig-5.34:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kiconthemes-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=99a66aa8f2520ffa015bf4ef65efb33f
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.29.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.29.0
index 1325736f960f..fdeab22e3a12 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libxcb >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kidletime-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2ee89d6930658d72fe8cc7179fa69788
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.34.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.34.0
index 485408d002c2..99e2efe55a1a 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libxcb >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kidletime-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6b3082eaf8c086255e187b36411f9b5b
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.29.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.29.0
index db77c1404197..6d2e8c2e144a 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.29:5 >=dev-qt/qtgui-5.6.1:5 eps? ( >=dev-qt/qtprintsupport-5.6.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kimageformats-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=de119d4b822afcbb588625c550ec19c8
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.34.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.34.0
index 7ba9f41acbed..2270244ce191 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.34:5 >=dev-qt/qtgui-5.6.1:5 eps? ( >=dev-qt/qtprintsupport-5.6.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kimageformats-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1453c15732797df1fdb676a5e0214fb5
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.29.0 b/metadata/md5-cache/kde-frameworks/kinit-5.29.0
index 0cf4d785cabc..1dcb862001b5 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kcrash-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kio-5.29:5 >=kde-frameworks/kservice-5.29:5 >=kde-frameworks/kwindowsystem-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 x11-libs/libX11 x11-libs/libxcb caps? ( sys-libs/libcap ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kinit-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8d420635589f7073ea33164d638dba3e
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.34.0 b/metadata/md5-cache/kde-frameworks/kinit-5.34.0
index b05876bcfb2b..567c48847aba 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kcrash-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kio-5.34:5 >=kde-frameworks/kservice-5.34:5 >=kde-frameworks/kwindowsystem-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 x11-libs/libX11 x11-libs/libxcb caps? ( sys-libs/libcap ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kinit-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=00091e20d66b5ea7d77e2b3b640d59f8
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.29.0-r1 b/metadata/md5-cache/kde-frameworks/kio-5.29.0-r1
index 20322cc8c405..4fd9d397f607 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.29.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kio-5.29.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.29:5 >=kde-frameworks/kbookmarks-5.29:5 >=kd
 RESTRICT=test
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kio-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0c61fe7db3b308d59df9abbc245bcf90
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.34.0-r1 b/metadata/md5-cache/kde-frameworks/kio-5.34.0-r1
index 6614df185ab0..cf92eeff8057 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.34.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kio-5.34.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.34:5 >=kde-frameworks/kbookmarks-5.34:5 >=kd
 RESTRICT=test
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kio-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=054b2d476a63caecacb6533f08e4d411
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.29.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.29.0
index b710bba8414f..8b9d44bab961 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kitemmodels-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=60e4368280e2bfdedfd9b9d2c36512fe
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.34.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.34.0
index 4cdcbf3cf3d2..57ddc8192523 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kitemmodels-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=10051c4d24e8e7d619ef1ff7bcce83c4
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.29.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.29.0
index aaeea8418425..ee25e9deab81 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kitemviews-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=670ec31bfbfaab2e142c6df51c854b41
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.34.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.34.0
index e23b1ac89328..d93afda29696 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kitemviews-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=72d96bc30b74050093a31efd7b19159b
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.29.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.29.0
index b6fd56d6463b..db17e5ff36fe 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 X? ( >=dev-qt/qtx11extras-5.6.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kjobwidgets-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fd8c6789713e8bc82becf66260899222
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.34.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.34.0
index a387ddac6eae..3fced50a4a66 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 X? ( >=dev-qt/qtx11extras-5.6.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kjobwidgets-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=60890d2f3e87349fb613552f3fb7b3da
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.29.0 b/metadata/md5-cache/kde-frameworks/kjs-5.29.0
index 1627a32095fe..601b7dab9153 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.29.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/portingAids/kjs-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5e9f2ed97a74dc5e4cdb728fbd71afbc
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.34.0 b/metadata/md5-cache/kde-frameworks/kjs-5.34.0
index 8b5461e05964..0335a947a074 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.34.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/portingAids/kjs-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=95b23b756a84b6d6281b86e719e0f2ea
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.29.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.29.0
index d3fcd9675680..6fc760fe881f 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kjs-5.29:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/portingAids/kjsembed-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=20d8f4abd3d013562e540a9d861f1de4
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.34.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.34.0
index fc74d46435e1..1106544fb7bd 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kjs-5.34:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/portingAids/kjsembed-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e033917b958534d211f790451a24caa2
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.29.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.29.0
index 3751426fefcc..abc86b6adfa7 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.29.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.29:5 >=kde-frameworks/kxmlgui-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/portingAids/kmediaplayer-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e0d2df5fd6e9596724b05823b7a75fd8
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.34.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.34.0
index 756f482af85e..a7252e7a075f 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.34.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.34:5 >=kde-frameworks/kxmlgui-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/portingAids/kmediaplayer-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=cab9d522a5af24bf7c4eda9f76fa9bcc
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.29.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.29.0
index f2738bd75f2c..bc5ed86cadc6 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.29:5 >=kde-frameworks/karchive-5.29:5 >=kde-frameworks/kcompletion-5.29:5 >=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kiconthemes-5.29:5 >=kde-frameworks/kio-5.29:5 >=kde-frameworks/kitemviews-5.29:5 >=kde-frameworks/kservice-5.29:5 >=kde-frameworks/ktextwidgets-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=kde-frameworks/kxmlgui-5.29:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/knewstuff-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=132b3e2c84e95db62cb97094fd42801d
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.34.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.34.0
index 927079b9c306..840aa59e5b4b 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.34:5 >=kde-frameworks/karchive-5.34:5 >=kde-frameworks/kcompletion-5.34:5 >=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kiconthemes-5.34:5 >=kde-frameworks/kio-5.34:5 >=kde-frameworks/kitemviews-5.34:5 >=kde-frameworks/kservice-5.34:5 >=kde-frameworks/ktextwidgets-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=kde-frameworks/kxmlgui-5.34:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/knewstuff-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=556eac4b6456df5d55a35933f48bc1b2
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.29.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.29.0
index a088aa5d2b2c..86241e19a3b9 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.29:5 >=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kwindowsystem-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/phonon[qt5] dbus? ( dev-libs/libdbusmenu-qt[qt5] ) speech? ( >=dev-qt/qtspeech-5.6.1:5 ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/knotifications-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2da472098df2762eb1bdb19a92ff0fd0
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.34.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.34.0
index 663787dcc1b0..a21dda8b45e8 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.34:5 >=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kwindowsystem-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5= >=dev-qt/qtwidgets-5.6.1:5 media-libs/phonon[qt5] dbus? ( dev-libs/libdbusmenu-qt[qt5] ) speech? ( >=dev-qt/qtspeech-5.6.1:5 ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/knotifications-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=762fc189acf30f484f08c418e31aed45
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.29.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.29.0
index 231c46d1f328..ea4231936ebf 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.29:5 >=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kio-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 phonon? ( media-libs/phonon[qt5] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/knotifyconfig-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1f2f4a1a9afe395e6a49386c5376ac9c
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.34.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.34.0
index 66af09b6cfb7..e029dc18bf94 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.34:5 >=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kio-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 phonon? ( media-libs/phonon[qt5] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/knotifyconfig-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=74cb9b928aea95b88614aaaca2acc5d3
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.29.1 b/metadata/md5-cache/kde-frameworks/kpackage-5.29.1
index ac921d368729..de2a6f5a1651 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.29.1
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.29.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.29:5 >=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kpackage-5.29.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f52edbf9539190f5ac1ac3fedce39f94
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.34.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.34.0
index ce7a82ea06d1..b3d9c51969ac 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kpackage-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b80a8d81b5003a373d7b306df835834c
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.29.0 b/metadata/md5-cache/kde-frameworks/kparts-5.29.0
index ac9b67de70a8..96f138be08ad 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kiconthemes-5.29:5 >=kde-frameworks/kio-5.29:5 >=kde-frameworks/kjobwidgets-5.29:5 >=kde-frameworks/kservice-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=kde-frameworks/kxmlgui-5.29:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kparts-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=950805eb78526a5ec867b7b99519fd3c
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.34.0 b/metadata/md5-cache/kde-frameworks/kparts-5.34.0
index 988987d41b08..be073b4a6ca4 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kiconthemes-5.34:5 >=kde-frameworks/kio-5.34:5 >=kde-frameworks/kjobwidgets-5.34:5 >=kde-frameworks/kservice-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=kde-frameworks/kxmlgui-5.34:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kparts-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f487b214eb433c1ec02d1712bea73d62
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.29.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.29.0
index c050810dd977..f1806c824666 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kitemviews-5.29:5 >=kde-frameworks/kservice-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kpeople-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3e44ab793cad94e6afa17d54d932d2e6
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.34.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.34.0
index b01ebf5ed977..05c810e30f9d 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kitemviews-5.34:5 >=kde-frameworks/kservice-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kpeople-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b919812d043c671dc14a4384eae6df04
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.29.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.29.0
index 5f25b7d6db64..6c208f1983f1 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kplotting-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4e0a772cb92c2fc7a6eeea61a630ea18
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.34.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.34.0
index 68e43073db46..8b8823d3c7f5 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kplotting-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=cfbc1773289239d6f5e8c17dc4a8f9b8
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.29.0 b/metadata/md5-cache/kde-frameworks/kpty-5.29.0
index 5c8111691f84..881a266aa64d 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/ki18n-5.29:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kpty-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7eba7ec22a44a141af8c4ecbaedc3fec
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.34.0 b/metadata/md5-cache/kde-frameworks/kpty-5.34.0
index 3292498539ad..bab0e3e38b0b 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kpty-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1bb0f68ad479e2b0b596892444321d20
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.29.0 b/metadata/md5-cache/kde-frameworks/kross-5.29.0
index 33f3a668d5e0..773ebcb44d4d 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kiconthemes-5.29:5 >=kde-frameworks/kio-5.29:5 >=kde-frameworks/kparts-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=kde-frameworks/kxmlgui-5.29:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/portingAids/kross-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=33e89a722d2f6289d7e45462919b8f74
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.34.0 b/metadata/md5-cache/kde-frameworks/kross-5.34.0
index bd541a5a66f8..974004deb42c 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kiconthemes-5.34:5 >=kde-frameworks/kio-5.34:5 >=kde-frameworks/kparts-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=kde-frameworks/kxmlgui-5.34:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/portingAids/kross-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b5d66dd4ccad76591704d8b7be8777fc
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.29.0 b/metadata/md5-cache/kde-frameworks/krunner-5.29.0
index f0f0a29f59fa..8b8d9e29721d 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kio-5.29:5 >=kde-frameworks/kservice-5.29:5 >=kde-frameworks/plasma-5.29:5 >=kde-frameworks/solid-5.29:5 >=kde-frameworks/threadweaver-5.29:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !<kde-apps/kapptemplate-15.12.3-r1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/krunner-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=608450945b26e98701c1bab19d712615
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.34.0 b/metadata/md5-cache/kde-frameworks/krunner-5.34.0
index c3a4bf9cfee9..2319c194ef0b 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kio-5.34:5 >=kde-frameworks/kservice-5.34:5 >=kde-frameworks/plasma-5.34:5 >=kde-frameworks/solid-5.34:5 >=kde-frameworks/threadweaver-5.34:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !<kde-apps/kapptemplate-15.12.3-r1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/krunner-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=40971e33e12b769d05e238c1ba904dfb
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.29.0 b/metadata/md5-cache/kde-frameworks/kservice-5.29.0
index b8320e91b2d1..4d2d1599b875 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kd
 RESTRICT=test
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kservice-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a8738723a21a4fbe322ff30900a3f701
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.34.0 b/metadata/md5-cache/kde-frameworks/kservice-5.34.0
index 757c2a70e7b3..7e51945f8e7f 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.34.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kd
 RESTRICT=test
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kservice-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=427836ca8ef5aa4bceb8d8b0c9e1fc44
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.29.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.29.0
index 11d93949b03f..fe0e56cf47cf 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.29:5 >=kde-frameworks/kcodecs-5.29:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/ktexteditor-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2613687a204d53654c75fb9c9ccbbd5d
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.34.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.34.0
index cc0912658dab..883ea3c5f6ad 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.34.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.34:5 >=kde-frameworks/kauth-5.34:5 >=kde-fra
 RESTRICT=test
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/ktexteditor-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=aded8aee2e93de749fe0b2d710c756f4
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.29.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.29.0
index 60d74ed0d404..46a04b07d209 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.29:5 >=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kconfigwidgets-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kiconthemes-5.29:5 >=kde-frameworks/kservice-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=kde-frameworks/kwindowsystem-5.29:5 >=kde-frameworks/sonnet-5.29:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 speech? ( >=dev-qt/qtspeech-5.6.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/ktextwidgets-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=22b1f1f6313ec648a7a9d9fbd82c401f
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.34.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.34.0
index 774eba916cde..b54efb40fc88 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.34:5 >=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kconfigwidgets-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kiconthemes-5.34:5 >=kde-frameworks/kservice-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=kde-frameworks/kwindowsystem-5.34:5 >=kde-frameworks/sonnet-5.34:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 speech? ( >=dev-qt/qtspeech-5.6.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/ktextwidgets-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=400eca364c06c083e77d8498f68fbbf2
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.29.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.29.0
index 5e4a45e13010..62a4da60c1f5 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.29:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kunitconversion-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e27934735dc2246097a3232681be5922
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.34.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.34.0
index 5a8fd3336e47..6a18249925aa 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.34:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kunitconversion-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c65525a2a2c03d239ce6215c58f5fd80
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.29.0-r1 b/metadata/md5-cache/kde-frameworks/kwallet-5.29.0-r1
index dc9d2d90ddac..ec0bab8f7d81 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.29.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.29.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kconfigwidgets-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kdbusaddons-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kiconthemes-5.29:5 >=kde-frameworks/knotifications-5.29:5 >=kde-frameworks/kservice-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=kde-frameworks/kwindowsystem-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kwallet-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=20afd539a54836e6819796e9ccd77670
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.34.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.34.0
index 66d2d53665ef..9628220cd205 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kconfigwidgets-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kdbusaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kiconthemes-5.34:5 >=kde-frameworks/knotifications-5.34:5 >=kde-frameworks/kservice-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=kde-frameworks/kwindowsystem-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kwallet-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4be910f5191a0c823d158b7726de2ab3
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.34.0-r1 b/metadata/md5-cache/kde-frameworks/kwallet-5.34.0-r1
new file mode 100644
index 000000000000..fe1ff3045019
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.34.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kconfigwidgets-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kdbusaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kiconthemes-5.34:5 >=kde-frameworks/knotifications-5.34:5 >=kde-frameworks/kservice-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=kde-frameworks/kwindowsystem-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) man? ( >=kde-frameworks/kdoctools-5.34:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.34:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing desktop-wide storage for passwords
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=gpg +man debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kconfigwidgets-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kdbusaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kiconthemes-5.34:5 >=kde-frameworks/knotifications-5.34:5 >=kde-frameworks/kservice-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=kde-frameworks/kwindowsystem-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
+SLOT=5/5.34
+SRC_URI=mirror://kde/stable/frameworks/5.34/kwallet-5.34.0.tar.xz
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=50286f93c912a682856ab5b12db35bf7
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.29.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.29.0
index 3d24ae8fc8fb..3f810f1f74c8 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtgui-5.6.1:5[egl] >=dev-libs/way
 RESTRICT=test
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kwayland-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9a8bf27d844bd942b0cb5dfa2919a0ce
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.34.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.34.0
index 0f361ad10458..9224ccfd0a8b 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.34.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtgui-5.6.1:5[egl] >=dev-libs/way
 RESTRICT=test
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kwayland-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=55a4b3686c778e59db3a0be1d4b8845b
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.29.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.29.0
index 9ffbe608c560..a5f4dd2a05a5 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kwidgetsaddons-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d6fb05e99bd8c77ce0799269db87362f
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.34.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.34.0
index 3ce6429a66dd..ee357b68bd1c 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kwidgetsaddons-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f89e305d237e03468d8f4496b1f3648e
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.29.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.29.0
index 1ac578981fb2..6d93f777ef20 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 X? ( >=dev-qt/qtx11ext
 RESTRICT=test
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kwindowsystem-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=61188aad60dd227190e75dd2bdf49877
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.34.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.34.0
index 21b40162ca5d..2c86da2addb2 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.34.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 X? ( >=dev-qt/qtx11ext
 RESTRICT=test
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kwindowsystem-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5de6c0b7532878b45ba13b67e700ae97
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.29.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.29.0
index f1ea6f293802..83de07c187b6 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29:5 >=kde-frameworks/kconfigwidgets-5.29:5 >=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/kglobalaccel-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kiconthemes-5.29:5 >=kde-frameworks/kitemviews-5.29:5 >=kde-frameworks/ktextwidgets-5.29:5 >=kde-frameworks/kwidgetsaddons-5.29:5 >=kde-frameworks/kwindowsystem-5.29:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5[ssl] >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 attica? ( >=kde-frameworks/attica-5.29:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kxmlgui-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e88d85a97c4fc3a03059567e6cc44d78
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.34.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.34.0
index 88f3aae7e481..51aed0cc7b50 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.34:5 >=kde-frameworks/kconfigwidgets-5.34:5 >=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/kglobalaccel-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kiconthemes-5.34:5 >=kde-frameworks/kitemviews-5.34:5 >=kde-frameworks/ktextwidgets-5.34:5 >=kde-frameworks/kwidgetsaddons-5.34:5 >=kde-frameworks/kwindowsystem-5.34:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5[ssl] >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 attica? ( >=kde-frameworks/attica-5.34:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kxmlgui-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=76bc47fd21e52072aa68b34f762cdb9c
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.29.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.29.0
index e83fc6805897..13b3288b6da4 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.29.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29:5 >=kde-frameworks/ki18n-5.29:5 >=kde-frameworks/kio-5.29:5 >=dev-qt/qtxml-5.6.1:5 !<kde-plasma/plasma-workspace-5.2.95:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/kxmlrpcclient-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=06709dfbf63cbd9925bb45dfbddc1d50
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.34.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.34.0
index fc62c082b41a..df53a9335e3b 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.34.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.34:5 >=kde-frameworks/ki18n-5.34:5 >=kde-frameworks/kio-5.34:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kxmlrpcclient-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b860b8dc821435ef05004916c24d1cf6
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.29.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.29.0
index ff05f3b031d8..72c2d5dc9a17 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 net-misc/modemmanager !kd
 RESTRICT=test
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/modemmanager-qt-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=00a32c4516be62be25e24ae667e95e64
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.34.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.34.0
index d2a09f0faf33..1eaab26301f1 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.34.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 net-misc/modemmanager !kd
 RESTRICT=test
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/modemmanager-qt-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e917b333294e317254000bf7736fdcd1
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.29.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.29.0
index 8e51a6858920..3ba374697120 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/networkmanager-qt-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a84608466732b2e4ad2e10abce0dc2f6
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.34.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.34.0
index 083c85b0f9d6..20d171241cb6 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/networkmanager-qt-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=5aa83503e1d669309469e3908ebed057
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=3d88ff75f173e76828f6c8e10af4b014
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.29.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.29.0
index d346ed8ec596..a45178c8cd73 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=!<kde-apps/kdepim-15.12.1-r1:5 !kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/oxygen-icons5-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=327ef280a44fd3873528d8245af036ad
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.34.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.34.0
index a370f32bc3d3..41455591503a 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=!<kde-apps/kdepim-15.12.1-r1:5 !kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/oxygen-icons5-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e672b925a78bf4ac40c95fe24f45337b
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.29.0 b/metadata/md5-cache/kde-frameworks/plasma-5.29.0
index b794b92a01f3..ef9a2861b7d5 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.29:5 >=kde-frameworks/karchive-5.29:5 >=k
 RESTRICT=test
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/plasma-framework-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=81252b5bd2ba9fecfd33035950de5df1
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.34.0 b/metadata/md5-cache/kde-frameworks/plasma-5.34.0
index 850c7bff4eb7..c87f8a7ea3c0 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.34.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.34:5 >=kde-frameworks/karchive-5.34:5 >=k
 RESTRICT=test
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/plasma-framework-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fe038b15051e918114108abd621dc8ca
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.29.0 b/metadata/md5-cache/kde-frameworks/prison-5.29.0
index 4d27c3a8e07a..85f4148712f2 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.29.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 media-gfx/qrencode media-libs/libdmtx >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/prison-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1727887680e663ee4d65f962dc3a3cf3
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.34.0 b/metadata/md5-cache/kde-frameworks/prison-5.34.0
index af93c442ffe6..287699b9abad 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.34.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 media-gfx/qrencode media-libs/libdmtx >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/prison-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6e0337b46e7b515d8c8e076bb6451552
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.29.0 b/metadata/md5-cache/kde-frameworks/solid-5.29.0
index 3c4856c7dd6f..57155e7644e6 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/solid-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b635f152c6d69980fd8afda5aabbb50a
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.34.0 b/metadata/md5-cache/kde-frameworks/solid-5.34.0
index da1873081add..a8fbb8b3700d 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/solid-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5c1b12118100aedfa7e351ac2ef7fcf3
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.29.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.29.0
index 2ec809866531..6bd1ce8f8842 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/sonnet-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d807a61206f6ff262723b405e1098db1
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.34.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.34.0
index d63d641a9b1a..9c9287eefece 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/sonnet-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e9fe085d71245c44d981ec0198b8a859
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.29.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.29.0
index e8d3d9f97a3d..15bb617c5f58 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtxmlpatterns-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/syntax-highlighting-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=89f100a1b849b6919f9261f846b3f44a
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.34.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.34.0
index 8bffd65d42ab..26d4409c4f8b 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtxmlpatterns-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/syntax-highlighting-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e2bcabf17a7937f0f1c853e0e5ddac3c
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.29.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.29.0
index 83b68c03844a..78df9e2eca6b 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.29.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.29.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.29
 SRC_URI=mirror://kde/Attic/frameworks/5.29/threadweaver-5.29.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=884a4b52857b2134d5bc25209e137d10
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.34.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.34.0
index 6387a6a0f04a..0ed455ee4074 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.34.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/threadweaver-5.34.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ad2eb6ac23c0c6598e6de38162288cd8
diff --git a/metadata/md5-cache/kde-misc/akonadi-ews-0.8.1 b/metadata/md5-cache/kde-misc/akonadi-ews-0.8.1
index 8643bac7b201..194491dbeffb 100644
--- a/metadata/md5-cache/kde-misc/akonadi-ews-0.8.1
+++ b/metadata/md5-cache/kde-misc/akonadi-ews-0.8.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-apps/akonadi-14.12.0:5 >=kde-apps/akonadi-mime-14.12.0:5 >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kmime-14.12.0:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://github.com/KrissN/akonadi-ews/archive/v0.8.1.tar.gz -> akonadi-ews-0.8.1.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a3e68e592147433e9d33a28b5dce251f
diff --git a/metadata/md5-cache/kde-misc/basket-2.49a_p20170225 b/metadata/md5-cache/kde-misc/basket-2.49a_p20170225
index c2c6f963412a..ca7ef7c94f83 100644
--- a/metadata/md5-cache/kde-misc/basket-2.49a_p20170225
+++ b/metadata/md5-cache/kde-misc/basket-2.49a_p20170225
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kfilemetadata-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] x11-libs/libX11 crypt? ( app-crypt/gpgme ) git? ( dev-libs/libgit2 ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://github.com/basket-notepads/basket/archive/8de0345d99f3eb08d9406bd07e88b31afe46f315.tar.gz -> basket-2.49a_p20170225.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1d678b4ade88cbbab0fd82d78f4942e2
diff --git a/metadata/md5-cache/kde-misc/colord-kde-0.5.0 b/metadata/md5-cache/kde-misc/colord-kde-0.5.0
index f916a8bfacdf..3ca1f44bf8f6 100644
--- a/metadata/md5-cache/kde-misc/colord-kde-0.5.0
+++ b/metadata/md5-cache/kde-misc/colord-kde-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 media-libs/lcms:2 x11-libs/libxcb x11-libs/libX11 x11-libs/libXrandr >=kde-plasma/kde-cli-tools-5.4.1:5 x11-misc/colord >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/colord-kde/0.5.0/src/colord-kde-0.5.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2fd46f95b05b884bfae4ec67f75a982a
diff --git a/metadata/md5-cache/kde-misc/gmailfeed-1.1 b/metadata/md5-cache/kde-misc/gmailfeed-1.1
index e9bd38a60c50..fa6bde13ddce 100644
--- a/metadata/md5-cache/kde-misc/gmailfeed-1.1
+++ b/metadata/md5-cache/kde-misc/gmailfeed-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5[xml] >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtquickcontrols-5.6.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://github.com/anthon38/gmailfeed/archive/v1.1.tar.gz -> gmailfeed-1.1.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d77da5f98b14f5fc04066adf9edb000d
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-1.0.3 b/metadata/md5-cache/kde-misc/kdeconnect-1.0.3
index b90698ac2230..e69d5d260c06 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-1.0.3
+++ b/metadata/md5-cache/kde-misc/kdeconnect-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdeconnect/1.0.3/src/kdeconnect-kde-1.0.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c92c6c93c2e4720cecd89c4cd74bb38e
diff --git a/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1 b/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
index 7a93381dc65a..2bde2a2f2c13 100644
--- a/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
+++ b/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-misc/kdiff3:4 sys-apps/diffutils >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=http://dev.gentoo.org/~asturm/distfiles/kdiff3-0.9.98_p20170219.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=09dc949a90985873161e1fb50dc5968c
diff --git a/metadata/md5-cache/kde-misc/kdirstat-3.1.2 b/metadata/md5-cache/kde-misc/kdirstat-3.1.2
index 9c63db05a9f2..3f701a3f9313 100644
--- a/metadata/md5-cache/kde-misc/kdirstat-3.1.2
+++ b/metadata/md5-cache/kde-misc/kdirstat-3.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-libs/zlib !kde-misc/kdirstat:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-3.1.2.tar.bz2
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=302bc7103360e7d387d38ad6fcf8e43b
diff --git a/metadata/md5-cache/kde-misc/kimtoy-1.91 b/metadata/md5-cache/kde-misc/kimtoy-1.91
index 7596a52820f4..653a9dd4aff6 100644
--- a/metadata/md5-cache/kde-misc/kimtoy-1.91
+++ b/metadata/md5-cache/kde-misc/kimtoy-1.91
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 app-i18n/ibus dev-libs/glib:2 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libpng:0=[apng] x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) scim? ( >=app-i18n/scim-1.4.9 dev-libs/dbus-c++ ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.29.0:5 ) !kde-misc/kimtoy:4 >=app-i18n/fcitx-4.0 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=http://kde-apps.org/CONTENT/content-files/140967-kimtoy-1.91.tar.bz2
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=199832b3982f032dd2af03a698daade4
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.0.5 b/metadata/md5-cache/kde-misc/kio-gdrive-1.0.5
deleted file mode 100644
index 34ff20f2ab81..000000000000
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-apps/libkgapi-5.3.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/qtkeychain:=[qt5] >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 handbook? ( >=kde-frameworks/kdoctools-5.29.0:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KIO Slave for Google Drive service
-EAPI=6
-HOMEPAGE=https://phabricator.kde.org/project/profile/72/
-IUSE=+dolphin debug +handbook
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-apps/libkgapi-5.3.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/qtkeychain:=[qt5] dolphin? ( >=kde-apps/dolphin-14.12.0:5 ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kio-gdrive/1.0.5/src/kio-gdrive-1.0.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=687481225a116c921bcb9071a86184af
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.1.0 b/metadata/md5-cache/kde-misc/kio-gdrive-1.1.0
deleted file mode 100644
index bc3670809c3a..000000000000
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-apps/libkgapi-5.3.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/qtkeychain:=[qt5] >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 handbook? ( >=kde-frameworks/kdoctools-5.29.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KIO Slave for Google Drive service
-EAPI=6
-HOMEPAGE=https://phabricator.kde.org/project/profile/72/
-IUSE=debug +handbook test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-apps/libkgapi-5.3.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/qtkeychain:=[qt5] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kio-gdrive/1.1.0/src/kio-gdrive-1.1.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=90fe4fb3836a039df0f3ccd863a95a88
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.1.1 b/metadata/md5-cache/kde-misc/kio-gdrive-1.1.1
index 5fe09dc17842..2b315ffcc19b 100644
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.1.1
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-apps/libkgapi-5.3.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/qtkeychain:=[qt5] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kio-gdrive/1.1.1/src/kio-gdrive-1.1.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=90fe4fb3836a039df0f3ccd863a95a88
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.0 b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.0
new file mode 100644
index 000000000000..1737d16fca53
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-apps/libkgapi-17.04.0:5 >=dev-qt/qtwidgets-5.6.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-17.04.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5] ) >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 handbook? ( >=kde-frameworks/kdoctools-5.29.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KIO Slave for Google Drive service
+EAPI=6
+HOMEPAGE=https://phabricator.kde.org/project/profile/72/
+IUSE=+kaccounts debug +handbook test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-apps/libkgapi-17.04.0:5 >=dev-qt/qtwidgets-5.6.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-17.04.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5] ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kio-gdrive/1.2.0/src/kio-gdrive-1.2.0.tar.xz
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=323ec88f3aee6400a0c656242cc1ab13
diff --git a/metadata/md5-cache/kde-misc/kio-gopher-0.1.99 b/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
index 3ebefa8fb3b3..d8189d8f8c31 100644
--- a/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
+++ b/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 !kde-misc/kio-gopher:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kio-gopher/kio-gopher-0.1.99.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1f3b37bbdc9039ad1700326e33dd763a
diff --git a/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1 b/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
index 5767d501cfc8..ba1976be50cb 100644
--- a/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
+++ b/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-misc/kio-locate:4 sys-apps/mlocate >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/120965-kio-locate-0.5.3.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2fc5bdbfefc3d99413b19685080269f7
diff --git a/metadata/md5-cache/kde-misc/kolor-manager-1.1.0 b/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
index 06b17fd9656c..78455b14ca21 100644
--- a/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
+++ b/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=dev-qt/qtwidgets-5.6.1:5 media-gfx/synnefo media-libs/libXcm >=media-libs/oyranos-0.9.6 x11-libs/libXrandr >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://github.com/KDE/kolor-manager/archive/1.1.0.tar.gz -> kolor-manager-1.1.0.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b7b719c4eec81f3b6638bddbe90337b1
diff --git a/metadata/md5-cache/kde-misc/krusader-2.5.0-r2 b/metadata/md5-cache/kde-misc/krusader-2.5.0-r2
index 7f3bdc2efe73..892825d5dfed 100644
--- a/metadata/md5-cache/kde-misc/krusader-2.5.0-r2
+++ b/metadata/md5-cache/kde-misc/krusader-2.5.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 sys-apps/acl sys-libs/zlib !kde-misc/krusader:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krusader/2.5.0/krusader-2.5.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e834a4e652120c6c0ecde6899bac474d
diff --git a/metadata/md5-cache/kde-misc/krusader-2.6.0 b/metadata/md5-cache/kde-misc/krusader-2.6.0
index c3e2eb8a6e73..f08bac39ae0b 100644
--- a/metadata/md5-cache/kde-misc/krusader-2.6.0
+++ b/metadata/md5-cache/kde-misc/krusader-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 sys-apps/acl sys-libs/zlib >=kde-apps/kio-extras-14.12.0:5 !kde-misc/krusader:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krusader/2.6.0/krusader-2.6.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7ebb47c05623d78cc42fd77340a6bc92
diff --git a/metadata/md5-cache/kde-misc/kshutdown-4.0 b/metadata/md5-cache/kde-misc/kshutdown-4.0
index 22f66a8b88fd..5b5cb111fafb 100644
--- a/metadata/md5-cache/kde-misc/kshutdown-4.0
+++ b/metadata/md5-cache/kde-misc/kshutdown-4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdbusaddons:5 kde-frameworks/kglobalaccel:5 kde-frameworks/ki18n:5 kde-frameworks/kidletime:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) !kde-misc/kshutdown:4
 SLOT=5
 SRC_URI=mirror://sourceforge/kshutdown/kshutdown-source-4.0.zip
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8f5dcd021ce679875306f533e233539f
diff --git a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1 b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
index a9553af86f85..22acf972467a 100644
--- a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
+++ b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-libs/libmnl >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=http://prdownloads.sourceforge.net/ktoshiba/ktoshiba-5.3.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6a9db043b0c2a5f7e2000f0cf98025f8
diff --git a/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20170128 b/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20170128
index 02876d5005f4..7ece8690b862 100644
--- a/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20170128
+++ b/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20170128
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kdewebkit-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/sonnet-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-misc/kwebkitpart:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/kwebkitpart-1.4.0_pre20170128.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9953275d7e43689e8ef50aa42232c021
diff --git a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500 b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
index fba573eda110..6ef1f783598f 100644
--- a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
+++ b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=http://arielch.fedorapeople.org/devel/src/OpenOfficeorgThumbnail-1.0.0.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8b764b84976249066f78848d514eeb96
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3 b/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3
index 8d5265daad7d..1801718879c0 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3
+++ b/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-network-monitor/archive/v1.7.3.tar.gz -> plasma-applet-network-monitor-1.7.3.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1183015ed71e22d85fb997c184a09562
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.17 b/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.17
index ad67fd7df012..df53b0fe6e91 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.17
+++ b/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/plasma-5.29.0:5 x11-misc/redshift >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-redshift-control/archive/v1.0.17.tar.gz -> plasma-applet-redshift-control-1.0.17.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=543d6195dc21437fcc2c9c1c165cce9c
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.18 b/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.18
index c7c0e1c63ecf..50e90914be15 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.18
+++ b/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/plasma-5.29.0:5 x11-misc/redshift >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-redshift-control/archive/v1.0.18.tar.gz -> plasma-applet-redshift-control-1.0.18.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=434f8b1e4e1a1cc4f09fd241e29798e4
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.8 b/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.8
index b39ed459c0b4..406d4739612b 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.8
+++ b/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5[xml] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-weather-widget/archive/v1.6.8.tar.gz -> plasma-applet-weather-widget-1.6.8.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b1329fd6b2c797c242c1ae8f62a2ae77
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.6 b/metadata/md5-cache/kde-misc/rsibreak-0.12.6
index 1d1e4715ba89..d78deae566f5 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.6
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/frameworkintegration-5.29.0:5 !kde-misc/rsibreak:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=aeea0e4c395caada164f15a8d0dc6d6e
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.7 b/metadata/md5-cache/kde-misc/rsibreak-0.12.7
new file mode 100644
index 000000000000..8259486cc39a
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 handbook? ( >=kde-frameworks/kdoctools-5.29.0:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Small utility which bothers you at certain intervals
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/RSIBreak
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/frameworkintegration-5.29.0:5 !kde-misc/rsibreak:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.7.tar.xz
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=e2f7dc3bf7b47cd6b06d3cebfe59bcdb
diff --git a/metadata/md5-cache/kde-misc/skanlite-2.0.1 b/metadata/md5-cache/kde-misc/skanlite-2.0.1
index 745458d2a1a5..b0f8c1addc47 100644
--- a/metadata/md5-cache/kde-misc/skanlite-2.0.1
+++ b/metadata/md5-cache/kde-misc/skanlite-2.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libksane-14.12.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/libpng:0= !kde-misc/skanlite:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/skanlite/2.0/skanlite-2.0.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b05897343ce28a222251698a0d0d16d9
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 cd0777b2e28b..a4a6c4c4d774 100644
--- a/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
+++ b/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-apps/systemd !kde-misc/kcmsystemd:4 !kde-misc/systemd-kcm:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/systemd-kcm/systemd-kcm-1.2.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=5df1b9990ae7051885fc63a3ec700064
diff --git a/metadata/md5-cache/kde-misc/tellico-3.0.2 b/metadata/md5-cache/kde-misc/tellico-3.0.2
index c6180d047517..5da2dd2f249e 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.0.2
+++ b/metadata/md5-cache/kde-misc/tellico-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=http://tellico-project.org/files/tellico-3.0.2.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8e65958c84aa22d97558c311f169b04b
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1 b/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1
index 0dfb6f62700d..1e5b5c3db269 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1
+++ b/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/extra-cmake-modules-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libX11 x11-libs/libXi x11-libs/libXrandr x11-libs/libxcb !kde-misc/wacomtablet:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-3.0.0~beta1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=21820abe71ff8db1dfbde11ac033ed78
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.2 b/metadata/md5-cache/kde-misc/yakuake-3.0.2
index 9cc11d827205..d225f8810478 100644
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.2
+++ b/metadata/md5-cache/kde-misc/yakuake-3.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/konsole-14.12.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/yakuake/3.0.2/src/yakuake-3.0.2.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e8f68b25c1e2a98fc33490e4427936b8
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.4 b/metadata/md5-cache/kde-misc/yakuake-3.0.4
index 131629076805..64495bde8346 100644
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.4
+++ b/metadata/md5-cache/kde-misc/yakuake-3.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwayland-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/konsole-14.12.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/yakuake/3.0.4/src/yakuake-3.0.4.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e5d3bdb0aed4ff183c8e13908b71da3b
diff --git a/metadata/md5-cache/kde-misc/zanshin-0.4.1-r1 b/metadata/md5-cache/kde-misc/zanshin-0.4.1-r1
index c7dd0977c035..ec45b79e38db 100644
--- a/metadata/md5-cache/kde-misc/zanshin-0.4.1-r1
+++ b/metadata/md5-cache/kde-misc/zanshin-0.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/krunner-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/akonadi-14.12.0:5 >=kde-apps/akonadi-calendar-14.12.0:5 >=kde-apps/akonadi-notes-14.12.0:5 >=kde-apps/akonadi-search-14.12.0:5 >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kidentitymanagement-14.12.0:5 >=kde-apps/kldap-14.12.0:5 >=kde-apps/kmime-14.12.0:5 >=kde-apps/kontactinterface-14.12.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/boost !kde-misc/zanshin:4 >=kde-apps/kdepim-runtime-14.12.0:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=http://files.kde.org/zanshin/zanshin-0.4.1.tar.bz2
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d088bcc61075d6dfff8cba1f7efc28e7
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.8.6 b/metadata/md5-cache/kde-plasma/bluedevil-5.8.6
index ee1bd3a3a152..1168cfe29b01 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.8.6
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/bluez-qt-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kded-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-plasma/kde-cli-tools-5.8.6:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/bluedevil-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1f39dcd1e431b2223a9fdb4b77b274f1
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.8.7 b/metadata/md5-cache/kde-plasma/bluedevil-5.8.7
index b8379508af44..d84af4201fbc 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.8.7
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/bluez-qt-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kded-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-plasma/kde-cli-tools-5.8.7:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/bluedevil-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e11b4147ff8871ca5c87cc62004c2224
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.9.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.9.5
index a43865312ef9..b00f51d91406 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.9.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/bluez-qt-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kded-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-plasma/kde-cli-tools-5.9.5:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/bluedevil-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e11b4147ff8871ca5c87cc62004c2224
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.8.6 b/metadata/md5-cache/kde-plasma/breeze-5.8.6
index fb72d1198eeb..1e43af3544ce 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.8.6
+++ b/metadata/md5-cache/kde-plasma/breeze-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-plasma/kdecoration-5.8.6:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libxcb qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.29.0:5 ) >=kde-frameworks/breeze-icons-5.29.0:5 >=kde-plasma/kde-cli-tools-5.8.6:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/breeze-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ea892ad93565a253397d04a4c9de8501
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.8.7 b/metadata/md5-cache/kde-plasma/breeze-5.8.7
index ca2df0674484..1f79f9387720 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.8.7
+++ b/metadata/md5-cache/kde-plasma/breeze-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-plasma/kdecoration-5.8.7:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libxcb qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.29.0:5 ) >=kde-frameworks/breeze-icons-5.29.0:5 >=kde-plasma/kde-cli-tools-5.8.7:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/breeze-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=56d1c2ced08b50af666b332b433f07b4
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.9.5 b/metadata/md5-cache/kde-plasma/breeze-5.9.5
index c44590534d55..adb02046182d 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.9.5
+++ b/metadata/md5-cache/kde-plasma/breeze-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-plasma/kdecoration-5.9.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.29.0:5 ) >=kde-frameworks/breeze-icons-5.29.0:5 >=kde-plasma/kde-cli-tools-5.9.5:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/breeze-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0340c33402e463a1b8b9acbd90295728
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.8.6 b/metadata/md5-cache/kde-plasma/breeze-grub-5.8.6
index 543e2fb78b44..14e0ed199728 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.8.6
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.8.6
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/breeze-grub-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1e5bc01c0d865dc73b7f25d4ebefc68f
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.8.7 b/metadata/md5-cache/kde-plasma/breeze-grub-5.8.7
index 634aa694b451..28a0eaefe426 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.8.7
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.8.7
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/breeze-grub-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=353f46f5fa694c6f57fe50eb700b2b17
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.9.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.9.5
index 7c36a56b67b9..3ef9305b8e37 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.9.5
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.9.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/breeze-grub-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=353f46f5fa694c6f57fe50eb700b2b17
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.8.6 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.8.6
index 0eff2f1d2e5d..0338d4c30572 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.8.6
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.8.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/breeze-gtk-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3a6c15708139df06ef42762639433c95
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.8.7 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.8.7
index 2285940107e3..8f7b9d9fd3ce 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.8.7
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.8.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/breeze-gtk-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0c19baeb312fd67d32b43ee2c8668700
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.9.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.9.5
index f6cfa187c722..6e1b2166433e 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.9.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.9.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/breeze-gtk-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0c19baeb312fd67d32b43ee2c8668700
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.8.6 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.8.6
index 51a9f5707e15..0be490951907 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.8.6
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/breeze-plymouth-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=aed58461608da12764666eb7d1c7f4e5
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.8.7 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.8.7
index 52349dd59ab0..9b581f99dabf 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.8.7
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/breeze-plymouth-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d513c9db39b24f777b0ea34d442dcd1b
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.9.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.9.5
index b5320f066c34..d9d61c8ad426 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.9.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/breeze-plymouth-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d513c9db39b24f777b0ea34d442dcd1b
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.8.6 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.8.6
index 3b69d114592a..47560f1e6377 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.8.6
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.8.6
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[sqlite] >=dev-qt/qtwidgets-5.6.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !<kde-frameworks/kactivities-5.20.0:5 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kactivitymanagerd-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=950b72a20832ed5989af56aceb0b4b9d
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.8.7 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.8.7
index dda1ba61f867..81bd4208ddd3 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[sqlite] >=dev-qt/qtwidgets-5.6.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !<kde-frameworks/kactivities-5.20.0:5 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kactivitymanagerd-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6900b9168c6af7d99241413f22b45930
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.9.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.9.5
index d7598ebdb094..1a7d793ea868 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.9.5
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !<kde-frameworks/kactivities-5.20.0:5 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kactivitymanagerd-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6900b9168c6af7d99241413f22b45930
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.8.6-r1 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.8.6-r1
index 0f79aeed1acd..ea5f6f590ed4 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.8.6-r1
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.8.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kde-cli-tools-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=33b34a7cdbf61eeb87d2cb13121f8f1a
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.8.7 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.8.7
index f34a06eaece5..0d815307390c 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.8.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kde-cli-tools-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fb01c3b313f28f68dc43068af4774075
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.9.5-r1 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.9.5-r1
index 9d2c1ee3b09d..20f4d0df9a8d 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.9.5-r1
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.9.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kde-cli-tools-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1ed2cd5453c5775a596ce1f41cbd5b93
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.8.6 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.8.6
index 1d0586f41797..ab0162853a86 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.8.6
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXcursor gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.8.6:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kde-gtk-config-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a6d40ecde7de694627c84d6f9cf08042
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.8.7 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.8.7
index 75b7074f38c0..cbc421e26fc4 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXcursor gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.8.7:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kde-gtk-config-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=41c7e2729b188314cfa0b9df8c7f9464
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.9.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.9.5
index 39e6f22ad907..a5b210e0a4ab 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXcursor gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.9.5:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kde-gtk-config-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=41c7e2729b188314cfa0b9df8c7f9464
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.8.6 b/metadata/md5-cache/kde-plasma/kdecoration-5.8.6
index 6922506916c5..87875c25fa4a 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.8.6
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.8.6
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kdecoration-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f5b559e370f754ce00eeadb078780919
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.8.7 b/metadata/md5-cache/kde-plasma/kdecoration-5.8.7
index e9bd178c8144..746f0dc4893a 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kdecoration-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=77c237790df985ee60025704d861b464
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.9.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.9.5
index 7e19f6fc8197..714044503b6b 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.9.5
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kdecoration-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=77c237790df985ee60025704d861b464
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.8.6 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.8.6
index f6f8f4fac9a3..8d29bcf0ea82 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.8.6
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kpackage-5.29.0:5 >=kde-frameworks/kross-5.29.0:5 >=kde-frameworks/krunner-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kunitconversion-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/sonnet-5.29.0:5 >=kde-plasma/plasma-workspace-5.8.6:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 share? ( dev-libs/purpose:5 ) >=kde-plasma/plasma-workspace-5.8.6:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kdeplasma-addons-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=221a2a660b353f0a80a6eb5b44f62956
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.8.7 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.8.7
index 1e4995042cc7..6c16cfcc071f 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kpackage-5.29.0:5 >=kde-frameworks/kross-5.29.0:5 >=kde-frameworks/krunner-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kunitconversion-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/sonnet-5.29.0:5 >=kde-plasma/plasma-workspace-5.8.7:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 share? ( dev-libs/purpose:5 ) >=kde-plasma/plasma-workspace-5.8.7:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kdeplasma-addons-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=993c806cd2efcf7c9b09dab3bef0c94a
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.9.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.9.5
index 494e23386c96..86514dd42d53 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kpackage-5.29.0:5 >=kde-frameworks/kross-5.29.0:5 >=kde-frameworks/krunner-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kunitconversion-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/sonnet-5.29.0:5 >=kde-plasma/plasma-workspace-5.9.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 share? ( dev-libs/purpose:5 ) >=kde-plasma/plasma-workspace-5.9.5:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kdeplasma-addons-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=993c806cd2efcf7c9b09dab3bef0c94a
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.8.6 b/metadata/md5-cache/kde-plasma/kgamma-5.8.6
index b65b97c494e0..d40ee084e4b1 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.8.6
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kgamma5-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=12992c15a5c145ba6882fde3202c3771
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.8.7 b/metadata/md5-cache/kde-plasma/kgamma-5.8.7
index e6efd32e93d6..911e41bfc114 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kgamma5-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=348130cb4f0d599552d8806eb1a5c13a
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.9.5 b/metadata/md5-cache/kde-plasma/kgamma-5.9.5
index 8ce40a4c0c82..72de8d5d05ac 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kgamma5-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=67911e80e242c9f277f1390d07cdd7bc
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.8.6 b/metadata/md5-cache/kde-plasma/khotkeys-5.8.6
index f81bd704cdf6..db6260abb9e1 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.8.6
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5[X] >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-plasma/plasma-workspace-5.8.6:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.29.0:5 >=kde-plasma/kde-cli-tools-5.8.6:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/khotkeys-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=265236eaa880c42added78d352782767
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.8.7 b/metadata/md5-cache/kde-plasma/khotkeys-5.8.7
index 4a02cf35688c..559a3952c7e1 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.8.7
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5[X] >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-plasma/plasma-workspace-5.8.7:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.29.0:5 >=kde-plasma/kde-cli-tools-5.8.7:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/khotkeys-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=396ced7318c0bb0187cee9bbc19bdbbf
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.9.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.9.5
index 61db04d90212..8ce819f8b4ff 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.9.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5[X] >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-plasma/plasma-workspace-5.9.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.29.0:5 >=kde-plasma/kde-cli-tools-5.9.5:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/khotkeys-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=396ced7318c0bb0187cee9bbc19bdbbf
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.8.6 b/metadata/md5-cache/kde-plasma/kinfocenter-5.8.6
index cbbac8d8d1d5..e026ae317dfb 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.8.6
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.8.6
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5
 REQUIRED_USE=egl? ( || ( gles2 opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kinfocenter-5.8.6.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7b3158158a1a73a01065e6dbedb24518
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.8.7 b/metadata/md5-cache/kde-plasma/kinfocenter-5.8.7
index 114f4c2d2fb8..6b9e9f4ee36a 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.8.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5
 REQUIRED_USE=egl? ( || ( gles2 opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kinfocenter-5.8.7.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=404fd57671faaa0744fea3b5f75f7bdf
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.9.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.9.5
index 807a130b7197..3d3e79aa68fd 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.9.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5
 REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kinfocenter-5.9.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a5a81232b1a8251cdf1d44302fa3e95e
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.8.6 b/metadata/md5-cache/kde-plasma/kmenuedit-5.8.6
index 76bc055cfe82..5fb3b325257c 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.8.6
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/sonnet-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.8.6:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kmenuedit-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=beb873fa98b129d97f47df0ebfb42906
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.8.7 b/metadata/md5-cache/kde-plasma/kmenuedit-5.8.7
index 24c7581930bc..3e8ff7f99544 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/sonnet-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.8.7:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kmenuedit-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=290066f8da5d085c24a51d1466a22382
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.9.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.9.5
index be7598da72cb..31e9167cadd6 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/sonnet-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.9.5:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kmenuedit-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=290066f8da5d085c24a51d1466a22382
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.8.6 b/metadata/md5-cache/kde-plasma/kscreen-5.8.6
index 83321b8a54ea..77f29fdff518 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.8.6
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.8.6
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kscreen-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=40ded9b4815cd3106b4335f969e48c03
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.8.7 b/metadata/md5-cache/kde-plasma/kscreen-5.8.7
index 5ec51be05c1b..1ddb7df7ed92 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.8.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kscreen-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=bc20d42ea774754856b03e57aface64e
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.9.5 b/metadata/md5-cache/kde-plasma/kscreen-5.9.5
index 05ebe92e25e2..5255482cd50d 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.9.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kscreen-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=bc20d42ea774754856b03e57aface64e
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.8.6 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.8.6
index 30dd00c29293..e21d57f1e1f9 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.8.6
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.8.6
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kscreenlocker-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=de9b3dec9c03e490f0104e1674fe63ff
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.8.6-r1 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.8.6-r1
index 6ad6a1939997..f973e16b5a2c 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.8.6-r1
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.8.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kscreenlocker-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1dfe02a62491521f13cbb74bab472cf0
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.8.7 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.8.7
index f48817545e4d..fdae3d160e51 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.8.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kscreenlocker-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e7ef938b6bdbf9b8987de3690d79d9b1
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.9.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.9.5
index b85244980009..f7faa64ce408 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.9.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kscreenlocker-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e6c04fd731b56b612293179b717a385d
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.8.6 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.8.6
index 01804af8d5a7..0034ccf5d288 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.8.6
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/ksshaskpass-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b1bcd759e0f8b231653597c58900bdd7
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.8.7 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.8.7
index d33d212b3b1a..d0e5285c379a 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.8.7
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/ksshaskpass-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=cbb8d0875cfe1b55a09c184f5cb9ccaa
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.9.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.9.5
index b273feeca2ec..6625b15363f7 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.9.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/ksshaskpass-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=cbb8d0875cfe1b55a09c184f5cb9ccaa
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.8.6 b/metadata/md5-cache/kde-plasma/ksysguard-5.8.6
index 8b685017e57a..903cdaaf5513 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.8.6
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-plasma/libksysguard-5.8.6:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kinit-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/ksysguard-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=989230ea240be57f9309482f5595360a
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.8.7 b/metadata/md5-cache/kde-plasma/ksysguard-5.8.7
index f93e59f003c9..fd9474bad633 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.8.7
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-plasma/libksysguard-5.8.7:5[-minimal(-)] >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kinit-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/ksysguard-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a45aeb5e5beb46a69b77046a3069dbe6
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.9.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.9.5
index b29b63146588..0908c206163c 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.9.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-plasma/libksysguard-5.9.5:5[-minimal(-)] >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kinit-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/ksysguard-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a45aeb5e5beb46a69b77046a3069dbe6
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.8.6 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.8.6
index cac6c74d5fb0..e25245a6ab67 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.8.6
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.8.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= virtual/pam !kde-apps/kwalletd-pam net-misc/socat
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kwallet-pam-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9efc1d6b7b144d67b913a9049a24610f
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.8.7 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.8.7
index a50e1dd1e99d..c1d4d3b00739 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.8.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= virtual/pam !kde-apps/kwalletd-pam net-misc/socat
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kwallet-pam-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=45ad8efba5b80f3dca760be76b869e7e
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.9.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.9.5
index 8cecb2d6438e..40e7ecdb31f2 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.9.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= virtual/pam !kde-apps/kwalletd-pam net-misc/socat
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kwallet-pam-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=45ad8efba5b80f3dca760be76b869e7e
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.8.6 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.8.6
index 21414c2ba9f4..95b2e000543a 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.8.6
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.8.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/kwayland-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kwayland-integration-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=74c80d00e005ddebbb9a13c553e84b75
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.8.7 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.8.7
index 25274d023de0..eaf6ae374338 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.8.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/kwayland-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kwayland-integration-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=824460f829f521bdd8cef20fd1006ec8
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.9.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.9.5
index 94f3294a95b4..94f0060f464d 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.9.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/kwayland-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kwayland-integration-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=824460f829f521bdd8cef20fd1006ec8
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.8.6 b/metadata/md5-cache/kde-plasma/kwin-5.8.6
index 422a4181aacc..70a0f85dcc1e 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.8.6
+++ b/metadata/md5-cache/kde-plasma/kwin-5.8.6
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kauth-5.29.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kwin-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=79725abf024be899e77f462e1d5440b5
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.8.7 b/metadata/md5-cache/kde-plasma/kwin-5.8.7
index d0c6cb9c114f..97cdcc85f1d3 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kwin-5.8.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kauth-5.29.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kwin-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=969d55b8eb3d87d42acf34599adff3c1
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.9.5 b/metadata/md5-cache/kde-plasma/kwin-5.9.5
index 9929cdc6fcbd..b14f810da570 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.9.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kauth-5.29.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kwin-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4322c87cf5cf43c6a8b09d1f3f08268e
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.8.6 b/metadata/md5-cache/kde-plasma/kwrited-5.8.6
index 8646a86160cc..5b2296af8d09 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.8.6
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kpty-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/kwrited-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9cd3b2c07f7e11bdaeb45958dfc4269c
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.8.7 b/metadata/md5-cache/kde-plasma/kwrited-5.8.7
index c594ee87aa10..76545c99a53c 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kpty-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kwrited-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=27373743d2481bc3ea460dc7bd693aac
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.9.5 b/metadata/md5-cache/kde-plasma/kwrited-5.9.5
index 92d44d52c43d..cd3037cc0d52 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kpty-5.29.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kwrited-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=27373743d2481bc3ea460dc7bd693aac
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.8.6 b/metadata/md5-cache/kde-plasma/libkscreen-5.8.6
index 2bb1831546f7..53d8310640de 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.8.6
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.8.6
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kwayland-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgu
 RESTRICT=test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.8.6/libkscreen-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=54d40c96fe8cd9e668f030d2735cab3c
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.8.7 b/metadata/md5-cache/kde-plasma/libkscreen-5.8.7
index f9a0ad8aafde..992949448283 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.8.7
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.8.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kwayland-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgu
 RESTRICT=test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.8.7/libkscreen-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=727eaf2b5b5a8b29d7fa65ac494d8d93
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.9.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.9.5
index ab582b549d22..35a6c4e0e9c1 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.9.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.9.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kwayland-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgu
 RESTRICT=test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.9.5/libkscreen-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=727eaf2b5b5a8b29d7fa65ac494d8d93
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.8.6 b/metadata/md5-cache/kde-plasma/libksysguard-5.8.6
index c87082bb3f24..f25645d88db8 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.8.6
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.8.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.6.1:5 ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/libksysguard-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=cb1343eed21b2b87a6acb9c1bf80dd48
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.8.7 b/metadata/md5-cache/kde-plasma/libksysguard-5.8.7
index ebad86e8b88d..bf966b074f9b 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.8.7
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.8.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.6.1:5 ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/libksysguard-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e9f40d2745296a953952421ff2a39092
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.9.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.9.5
index baf08d53b0a8..e470113786d1 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.9.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.9.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/libksysguard-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6ceb466afaafdc792d63f26771a0aaa1
diff --git a/metadata/md5-cache/kde-plasma/milou-5.8.6 b/metadata/md5-cache/kde-plasma/milou-5.8.6
index c0c72f67925d..83a72a061376 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.8.6
+++ b/metadata/md5-cache/kde-plasma/milou-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/krunner-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/milou-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=958342cec88e0ea61fc4a5b8e5621262
diff --git a/metadata/md5-cache/kde-plasma/milou-5.8.7 b/metadata/md5-cache/kde-plasma/milou-5.8.7
index 0df2af1d338f..b3255795d3ea 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.8.7
+++ b/metadata/md5-cache/kde-plasma/milou-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/krunner-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/milou-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=454afb1666f0a84fc09692170255ce40
diff --git a/metadata/md5-cache/kde-plasma/milou-5.9.5 b/metadata/md5-cache/kde-plasma/milou-5.9.5
index 1d9614b311fb..815a34d54995 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.9.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/krunner-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/milou-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=454afb1666f0a84fc09692170255ce40
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.8.6 b/metadata/md5-cache/kde-plasma/oxygen-5.8.6
index f0ec1e63bc26..8e1fec27fe80 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.8.6
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-plasma/kdecoration-5.8.6:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libxcb qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.29.0:5 ) >=kde-plasma/kde-cli-tools-5.8.6:5 qt4? ( !kde-plasma/kstyles:4 !kde-plasma/liboxygenstyle:4 ) !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/oxygen-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2754ec30cebf39b4cbbbcbe704680263
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.8.7 b/metadata/md5-cache/kde-plasma/oxygen-5.8.7
index e8c282c0d4f4..9cb850dd9e7e 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.8.7
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-plasma/kdecoration-5.8.7:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libxcb qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.29.0:5 ) >=kde-plasma/kde-cli-tools-5.8.7:5 qt4? ( !kde-plasma/kstyles:4 !kde-plasma/liboxygenstyle:4 ) !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/oxygen-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ff9627a7b5f503da275b67fa7ad53442
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.9.5 b/metadata/md5-cache/kde-plasma/oxygen-5.9.5
index 39d5b4283111..9bbec0acc8a2 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.9.5
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-plasma/kdecoration-5.9.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.29.0:5 ) >=kde-plasma/kde-cli-tools-5.9.5:5 qt4? ( !kde-plasma/kstyles:4 !kde-plasma/liboxygenstyle:4 ) !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/oxygen-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9219961cc39e83705cced00ff22c67e2
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 042a118bb3c0..371356fe7335 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3
+++ b/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3
@@ -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	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=575ba8e2b44079fa5876585bc4a040e2
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.8.6 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.8.6
index e17c42d9de7c..77e1eba4c2d4 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.8.6
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.8.6
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/attica-5.29.0:5 >=kde-frameworks/kactivities-5.29.0:5 >
 REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/plasma-desktop-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=037b97f5b951db2ffbd771884e63140d
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.8.7 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.8.7
index 9a46c50c3a5b..15207adeed26 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.8.7
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.8.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/attica-5.29.0:5 >=kde-frameworks/kactivities-5.29.0:5 >
 REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/plasma-desktop-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=59ef92e27b161436f7da91a71963c22d
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.9.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.9.5
index a833dc5a0e11..8b2e4b162123 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.9.5
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.9.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/attica-5.29.0:5 >=kde-frameworks/kactivities-5.29.0:5 >
 REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/plasma-desktop-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4281392de247e01645fb406d612b476b
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.8.6 b/metadata/md5-cache/kde-plasma/plasma-integration-5.8.6
index cb3e3dd15e38..ec3f56030652 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.8.6
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.8.6
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/plasma-integration-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1ba2e0da66199c976f75f184cdebb9fc
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.8.7 b/metadata/md5-cache/kde-plasma/plasma-integration-5.8.7
index 43e4699e7416..59fd5599043e 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.8.7
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.8.7
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/plasma-integration-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=18ce8d7c50e9ef2580671594b8114ec8
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.9.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.9.5
index 65feb50c56e6..d944e8fdf7e5 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.9.5
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.9.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/plasma-integration-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=23f5be335dce30e6502218105b2f8af8
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.8.6 b/metadata/md5-cache/kde-plasma/plasma-nm-5.8.6
index 7e00a6d60df5..01f9b20c5ed7 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.8.6
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.6.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.6.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.8.6:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/plasma-nm-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=de7528d2741473bbe168594a40db5543
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.8.7 b/metadata/md5-cache/kde-plasma/plasma-nm-5.8.7
index 870fc1150ab0..3ace966c8c2d 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.8.7
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.6.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.6.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.8.7:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/plasma-nm-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3e200c267b55d7edef959a34d2925139
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.9.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.9.5
index 3623d2acdb14..a7b8eaf37a87 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.9.5
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.9.5:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/plasma-nm-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3e200c267b55d7edef959a34d2925139
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.8.6 b/metadata/md5-cache/kde-plasma/plasma-pa-5.8.6
index 1e77bf63f494..2351ec37c3b5 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.8.6
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/plasma-pa-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a2a78d30e348ddf7755a98ff3c15d7b3
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.8.7 b/metadata/md5-cache/kde-plasma/plasma-pa-5.8.7
index 2de19f41f4f8..5cb441f79b55 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.8.7
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/plasma-pa-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2beea2639a29e0d9758bbc0163d4ffe0
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.9.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.9.5
index fb7bdec33598..e4db0908006f 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.9.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/plasma-pa-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2beea2639a29e0d9758bbc0163d4ffe0
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.8.6 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.8.6
index f996a270d278..228d04dfab5f 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.8.6
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/kpackage-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/kirigami:1 plasmate? ( >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=dev-qt/qtwebkit-5.6.1:5 dev-util/kdevplatform:5 ) !dev-util/plasmate >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/plasma-sdk-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f0536598f22f87f38d9a6ee023b7a880
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.8.7 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.8.7
index 07367ed8dfb6..ee9692a09a65 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.8.7
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/kpackage-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/kirigami:1 !dev-util/plasmate >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/plasma-sdk-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=472cd8d9eab21483dd3f20c53c165787
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.9.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.9.5
index 5e12d5302c8e..c714ee514b64 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.9.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/kpackage-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/kirigami:1 plasmate? ( >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=dev-qt/qtwebkit-5.7.1:5 dev-util/kdevplatform:5 ) !dev-util/plasmate >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/plasma-sdk-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2ff3cbcee294a3446b5003a53b38e3f8
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.8.6 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.8.6
index 542d0fe3c28e..327c882793db 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.8.6
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.8.6
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kauth-5.29.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/plasma-workspace-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	40a2ae377c3111aa116512aaf010f6ff	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	40a2ae377c3111aa116512aaf010f6ff	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9d4af6473ccf0ca6d8133800c750c9db
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.8.6-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.8.6-r1
new file mode 100644
index 000000000000..27ff42c63611
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.8.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kbookmarks-5.34.0:5 >=kde-frameworks/kcmutils-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdbusaddons-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kdelibs4support-5.34.0:5 >=kde-frameworks/kdesu-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemmodels-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kjsembed-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/knotifyconfig-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/krunner-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwallet-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/kxmlrpcclient-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-frameworks/solid-5.34.0:5 >=kde-plasma/kscreenlocker-5.8.6:5 >=kde-plasma/kwin-5.8.6:5 >=kde-plasma/libksysguard-5.8.6:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5[jpeg] >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/libdbusmenu-qt[qt5] 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 calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.34.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.34.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.34.0:5 ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.34.0:5 handbook? ( >=kde-frameworks/kdoctools-5.34.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma workspace
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+calendar geolocation gps prison qalculate +semantic-desktop test debug +handbook test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kbookmarks-5.34.0:5 >=kde-frameworks/kcmutils-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdbusaddons-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kdelibs4support-5.34.0:5 >=kde-frameworks/kdesu-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemmodels-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kjsembed-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/knotifyconfig-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/krunner-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwallet-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/kxmlrpcclient-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-frameworks/solid-5.34.0:5 >=kde-plasma/kscreenlocker-5.8.6:5 >=kde-plasma/kwin-5.8.6:5 >=kde-plasma/libksysguard-5.8.6:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5[jpeg] >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/libdbusmenu-qt[qt5] 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 calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.34.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.34.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.34.0:5 ) >=kde-frameworks/kded-5.34.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.8.6:5 >=kde-plasma/ksysguard-5.8.6:5 >=kde-plasma/milou-5.8.6:5 >=kde-plasma/plasma-integration-5.8.6:5 >=dev-qt/qdbus-5.6.1:5 >=dev-qt/qtgraphicaleffects-5.6.1:5 >=dev-qt/qtpaths-5.6.1:5 >=dev-qt/qtquickcontrols-5.6.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.8.6/plasma-workspace-5.8.6.tar.xz
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	40a2ae377c3111aa116512aaf010f6ff	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=29e5a5e3a41b66030d3c91ccab7453a7
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.8.7 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.8.7-r1
similarity index 50%
rename from metadata/md5-cache/kde-plasma/plasma-workspace-5.8.7
rename to metadata/md5-cache/kde-plasma/plasma-workspace-5.8.7-r1
index ff2516150983..71e1baa90bcd 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.8.7
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.8.7-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kdesu-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kjs-5.29.0:5 >=kde-frameworks/kjsembed-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kpackage-5.29.0:5 >=kde-frameworks/krunner-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwayland-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/kxmlrpcclient-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=kde-plasma/kscreenlocker-5.8.7:5 >=kde-plasma/kwin-5.8.7:5 >=kde-plasma/libksysguard-5.8.7:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5[jpeg] >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/libdbusmenu-qt[qt5] 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 calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.29.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.29.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.29.0:5 ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 handbook? ( >=kde-frameworks/kdoctools-5.29.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kbookmarks-5.34.0:5 >=kde-frameworks/kcmutils-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdbusaddons-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kdelibs4support-5.34.0:5 >=kde-frameworks/kdesu-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemmodels-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kjsembed-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/knotifyconfig-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/krunner-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwallet-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/kxmlrpcclient-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-frameworks/solid-5.34.0:5 >=kde-plasma/kscreenlocker-5.8.7:5 >=kde-plasma/kwin-5.8.7:5 >=kde-plasma/libksysguard-5.8.7:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5[jpeg] >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/libdbusmenu-qt[qt5] 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 calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.34.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.34.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.34.0:5 ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.34.0:5 handbook? ( >=kde-frameworks/kdoctools-5.34.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma workspace
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=+calendar geolocation gps prison qalculate +semantic-desktop test debug +handbook test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kdesu-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kjs-5.29.0:5 >=kde-frameworks/kjsembed-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kpackage-5.29.0:5 >=kde-frameworks/krunner-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwayland-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/kxmlrpcclient-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=kde-plasma/kscreenlocker-5.8.7:5 >=kde-plasma/kwin-5.8.7:5 >=kde-plasma/libksysguard-5.8.7:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5[jpeg] >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/libdbusmenu-qt[qt5] 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 calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.29.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.29.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.29.0:5 ) >=kde-frameworks/kded-5.29.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.8.7:5 >=kde-plasma/ksysguard-5.8.7:5 >=kde-plasma/milou-5.8.7:5 >=kde-plasma/plasma-integration-5.8.7:5 >=dev-qt/qdbus-5.6.1:5 >=dev-qt/qtgraphicaleffects-5.6.1:5 >=dev-qt/qtpaths-5.6.1:5 >=dev-qt/qtquickcontrols-5.6.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kbookmarks-5.34.0:5 >=kde-frameworks/kcmutils-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdbusaddons-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kdelibs4support-5.34.0:5 >=kde-frameworks/kdesu-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemmodels-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kjsembed-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/knotifyconfig-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/krunner-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwallet-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/kxmlrpcclient-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-frameworks/solid-5.34.0:5 >=kde-plasma/kscreenlocker-5.8.7:5 >=kde-plasma/kwin-5.8.7:5 >=kde-plasma/libksysguard-5.8.7:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5[jpeg] >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/libdbusmenu-qt[qt5] 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 calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.34.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.34.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.34.0:5 ) >=kde-frameworks/kded-5.34.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.8.7:5 >=kde-plasma/ksysguard-5.8.7:5 >=kde-plasma/milou-5.8.7:5 >=kde-plasma/plasma-integration-5.8.7:5 >=dev-qt/qdbus-5.6.1:5 >=dev-qt/qtgraphicaleffects-5.6.1:5 >=dev-qt/qtpaths-5.6.1:5 >=dev-qt/qtquickcontrols-5.6.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/plasma-workspace-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	40a2ae377c3111aa116512aaf010f6ff	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8c1caf4efa7319a2b3657098d46fd877
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	40a2ae377c3111aa116512aaf010f6ff	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=29e5a5e3a41b66030d3c91ccab7453a7
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.9.5.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.9.5.1
deleted file mode 100644
index bf69a3f438b2..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.9.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kdesu-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kjs-5.29.0:5 >=kde-frameworks/kjsembed-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kpackage-5.29.0:5 >=kde-frameworks/krunner-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwayland-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/kxmlrpcclient-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=kde-plasma/kscreenlocker-5.9.5:5 >=kde-plasma/kwin-5.9.5:5 >=kde-plasma/libksysguard-5.9.5:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1: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 calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.29.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.29.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.29.0:5 ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 handbook? ( >=kde-frameworks/kdoctools-5.29.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+calendar geolocation gps prison qalculate +semantic-desktop test debug +handbook test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kdesu-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kjs-5.29.0:5 >=kde-frameworks/kjsembed-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kpackage-5.29.0:5 >=kde-frameworks/krunner-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktexteditor-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwayland-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/kxmlrpcclient-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=kde-plasma/kscreenlocker-5.9.5:5 >=kde-plasma/kwin-5.9.5:5 >=kde-plasma/libksysguard-5.9.5:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1: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 calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.29.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.29.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.29.0:5 ) >=kde-frameworks/kded-5.29.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.9.5:5 >=kde-plasma/ksysguard-5.9.5:5 >=kde-plasma/milou-5.9.5:5 >=kde-plasma/plasma-integration-5.9.5:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.9.5/plasma-workspace-5.9.5.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	40a2ae377c3111aa116512aaf010f6ff	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4cfce848b91d7ba48c97e8b78cdec0ee
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.9.5.1-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.9.5.1-r1
index 9c4f5c9ecdf2..7a7e41bda61f 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.9.5.1-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.9.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.33.0:5 >=kde-frameworks/kauth-5.33.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/plasma-workspace-5.9.5.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	40a2ae377c3111aa116512aaf010f6ff	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	40a2ae377c3111aa116512aaf010f6ff	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=7ab128e933b9713ab6585490d4907cc0
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.8.6 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.8.6
index 9316d3ea8440..c31ae6972cb6 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.8.6
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.8.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/plasma-workspace-wallpapers-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=38482e7ac7a0917ad0cfebfd3de91d14
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.8.7 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.8.7
index d5f562e4b216..fd5f86f7e665 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.8.7
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.8.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/plasma-workspace-wallpapers-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4630b52bab9ed4e6f4115418c5f5afd7
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.9.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.9.5
index 38e6242aab90..bd82e1f8ba40 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.9.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.9.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/plasma-workspace-wallpapers-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4630b52bab9ed4e6f4115418c5f5afd7
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.8.6 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.8.6
index 1c4cc20be0a7..f9912cceb4e4 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.8.6
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 || ( >=kde-frameworks/polkit-qt-5.29.0: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-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/polkit-kde-agent-1-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=9d548a73f1aafa3bd565f40b9fc56f65
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.8.7 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.8.7
index f05f13df948c..b062d68bd476 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.8.7
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 || ( >=kde-frameworks/polkit-qt-5.29.0: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-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/polkit-kde-agent-1-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fc7ecdeb40d5de439c6e2f6dc1a096e5
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.9.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.9.5
index eb89e4dfd3bb..393bc3e7b184 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.9.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( >=kde-frameworks/polkit-qt-5.29.0: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-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/polkit-kde-agent-1-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fc7ecdeb40d5de439c6e2f6dc1a096e5
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.8.6 b/metadata/md5-cache/kde-plasma/powerdevil-5.8.6
index e3009b50058d..5386c56abdb5 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.8.6
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.8.6
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kauth-5.29.0:5[po
 REQUIRED_USE=elogind? ( !systemd ) systemd? ( !elogind )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/powerdevil-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fe074718255e8c722f34b8014e23359b
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.8.7 b/metadata/md5-cache/kde-plasma/powerdevil-5.8.7
index e428600cc573..d1e24ea9dc86 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.8.7
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kauth-5.29.0:5[policykit] >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwayland-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=kde-plasma/libkscreen-5.8.7:5 >=kde-plasma/plasma-workspace-5.8.7:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5 ) >=kde-plasma/kde-cli-tools-5.8.7:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-auth/polkit-pkla-compat sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/powerdevil-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6f539274eab594865c2f367e4cc8db12
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.9.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.9.5
index 487b3df54939..e59708dfc32b 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.9.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kauth-5.29.0:5[policykit] >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwayland-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=kde-plasma/libkscreen-5.9.5:5 >=kde-plasma/plasma-workspace-5.9.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5 ) >=kde-plasma/kde-cli-tools-5.9.5:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-auth/polkit-pkla-compat sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/powerdevil-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6f539274eab594865c2f367e4cc8db12
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.8.6 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.8.6
index 39306f613e0e..72238c176ec5 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.8.6
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.8.6:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/sddm-kcm-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=42307e6a15c1ccc975fb1e7267fbabaa
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.8.7 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.8.7
index 4cdfa4f8dc6f..f18a36630be1 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.8.7
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5[widgets] >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.8.7:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/sddm-kcm-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=fd44ff80085a4502c7c94d8fa674c016
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.9.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.9.5
index 1634a31586f8..fb12706df475 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.9.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.9.5:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/sddm-kcm-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e69317cf7cc4b27e6c17860b6b7b1c0d
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.8.6 b/metadata/md5-cache/kde-plasma/systemsettings-5.8.6
index 386fa367d365..3921a0f06afe 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.8.6
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 classic? ( >=kde-frameworks/khtml-5.29.0:5 ) gtk? ( >=kde-plasma/kde-gtk-config-5.8.6:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/systemsettings-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4cc443e8bf1be98a7d469295e4ba87ca
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.8.7 b/metadata/md5-cache/kde-plasma/systemsettings-5.8.7
index ea84d2e69aa1..2fc755c3436a 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.8.7
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 classic? ( >=kde-frameworks/khtml-5.29.0:5 ) gtk? ( >=kde-plasma/kde-gtk-config-5.8.7:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/systemsettings-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3f4cf3519799498a1083aa9d152f71f8
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.9.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.9.5
index 557403e51f5d..78c6440e2693 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.9.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 classic? ( >=kde-frameworks/khtml-5.29.0:5 ) gtk? ( >=kde-plasma/kde-gtk-config-5.9.5:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/systemsettings-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3f4cf3519799498a1083aa9d152f71f8
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.8.6 b/metadata/md5-cache/kde-plasma/user-manager-5.8.6
index 8b2422d9376c..b0097d2f91f6 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.8.6
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/user-manager-5.8.6.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0155541e41d774f08746dfd1c139910f
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.8.7 b/metadata/md5-cache/kde-plasma/user-manager-5.8.7
index f5f89d229a61..4e66b807626a 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.8.7
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/user-manager-5.8.7.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8264abe9acf896615efb4eb361abbb50
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.9.5 b/metadata/md5-cache/kde-plasma/user-manager-5.9.5
index 7003fa020679..4d03bea59c59 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.9.5
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/user-manager-5.9.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=67ba43e852869bb5f3e1eaee4be75100
diff --git a/metadata/md5-cache/mail-client/kube-0.1.0-r1 b/metadata/md5-cache/mail-client/kube-0.1.0-r1
index 06e716131ad0..324fff28ed49 100644
--- a/metadata/md5-cache/mail-client/kube-0.1.0-r1
+++ b/metadata/md5-cache/mail-client/kube-0.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/breeze-icons-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kube/0.1.0/src/kube-0.1.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=1d0777a62feec273beed7474ea96059e
diff --git a/metadata/md5-cache/mail-mta/nullmailer-2.0-r2 b/metadata/md5-cache/mail-mta/nullmailer-2.0-r2
new file mode 100644
index 000000000000..94c059dbe4fe
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/nullmailer-2.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=config configure install postinst postrm prepare setup
+DEPEND=sys-apps/groff ssl? ( net-libs/gnutls:0= ) test? ( sys-apps/ucspi-tcp[ipv6] sys-process/daemontools ) >=app-portage/elt-patches-20170317 !<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/pkgconfig
+DESCRIPTION=Simple relay-only local mail transport agent
+EAPI=6
+HOMEPAGE=http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer
+IUSE=ssl test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/logger virtual/shadow ssl? ( net-libs/gnutls:0= ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp
+SLOT=0
+SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-2.0.tar.gz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=6b7032fe445c564c34decbf7e8a998e9
diff --git a/metadata/md5-cache/media-gfx/darktable-2.2.3 b/metadata/md5-cache/media-gfx/darktable-2.2.3
index e1adae287e54..2a00b5d8c12e 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.2.3
+++ b/metadata/md5-cache/media-gfx/darktable-2.2.3
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.darktable.org/
 IUSE=colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret nls opencl openmp openexr pax_kernel webp l10n_ca l10n_cs l10n_da l10n_de l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_sk l10n_sl l10n_sv l10n_uk
 KEYWORDS=amd64 x86
 LICENSE=GPL-3 CC-BY-3.0
-RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( kde-apps/kwalletd:4 )
+RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( || ( >=kde-frameworks/kwallet-5.34.0-r1 kde-apps/kwalletd:4 ) )
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.2.3/darktable-2.2.3.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.2.0/darktable-usermanual.pdf -> darktable-usermanual-2.2.0.pdf )
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d4643ecd466ff5f2a948cb49a6278864
+_md5_=1851439f85f0c352971f879ae80939da
diff --git a/metadata/md5-cache/media-gfx/darktable-2.2.4 b/metadata/md5-cache/media-gfx/darktable-2.2.4
index 9d922753fe81..56018cb5949f 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.2.4
+++ b/metadata/md5-cache/media-gfx/darktable-2.2.4
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.darktable.org/
 IUSE=colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret nls opencl openmp openexr pax_kernel webp l10n_ca l10n_cs l10n_da l10n_de l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_sk l10n_sl l10n_sv l10n_uk
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 CC-BY-3.0
-RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( kde-apps/kwalletd:4 )
+RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( || ( >=kde-frameworks/kwallet-5.34.0-r1 kde-apps/kwalletd:4 ) )
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.2.4/darktable-2.2.4.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.2.0/darktable-usermanual.pdf -> darktable-usermanual-2.2.0.pdf )
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=efd69bee0113514589e3c96fd8ebe1bc
+_md5_=cdd0f76b3f4f4dbb7ef5a03ec43ce81d
diff --git a/metadata/md5-cache/media-gfx/darktable-9999 b/metadata/md5-cache/media-gfx/darktable-9999
index c7314e717af7..47cd82132e4b 100644
--- a/metadata/md5-cache/media-gfx/darktable-9999
+++ b/metadata/md5-cache/media-gfx/darktable-9999
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=http://www.darktable.org/
 IUSE=colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret nls opencl openmp openexr pax_kernel webp l10n_ca l10n_cs l10n_da l10n_de l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_sk l10n_sl l10n_sv l10n_uk
 LICENSE=GPL-3 CC-BY-3.0
-RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( kde-apps/kwalletd:4 )
+RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( || ( >=kde-frameworks/kwallet-5.34.0-r1 kde-apps/kwalletd:4 ) )
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=796e5d3220d864495c93e004cd892f57
+_md5_=16212bb3a00b329e4ae9bcce8a5e7943
diff --git a/metadata/md5-cache/media-gfx/digikam-5.5.0 b/metadata/md5-cache/media-gfx/digikam-5.5.0
index 7befc8e5a203..a877d04ade00 100644
--- a/metadata/md5-cache/media-gfx/digikam-5.5.0
+++ b/metadata/md5-cache/media-gfx/digikam-5.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.5.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2220a732120fd76459a962439df59927
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.25-r2 b/metadata/md5-cache/media-gfx/exiv2-0.25-r2
index 1115acc68a9d..389e9505e653 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.25-r2
+++ b/metadata/md5-cache/media-gfx/exiv2-0.25-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=virtual/libiconv-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(-)?] nls? ( >=virtual/libintl-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(-)?] ) png? ( >=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(-)?] ) webready? ( net-libs/libssh[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( >=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(-)?] ) doc? ( app-doc/doxygen dev-libs/libxslt virtual/pkgconfig media-gfx/graphviz || ( dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=virtual/libiconv-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(-)?] nls? ( >=virtual/libintl-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(-)?] ) png? ( >=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(-)?] ) webready? ( net-libs/libssh[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( >=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(-)?] ) doc? ( app-doc/doxygen dev-libs/libxslt virtual/pkgconfig media-gfx/graphviz || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=EXIF, IPTC and XMP metadata C++ library and command line utility
 EAPI=5
 HOMEPAGE=http://www.exiv2.org/
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 SLOT=0/14
 SRC_URI=http://www.exiv2.org/exiv2-0.25.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a52f714447a3cc2e824b6892fbd92a97
+_md5_=20281536193eb380e115806b4a28e5cd
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.8.6 b/metadata/md5-cache/media-gfx/imagemagick-6.9.8.6
index 58f2ed2a0792..6382c5d2fe1d 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.8.6
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.8.6
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=http://www.imagemagick.org/
 IUSE=autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 autotrace? ( >=media-gfx/autotrace-0.31.1 ) bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/6.9.8.6
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.8-6.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2d2c19f9327a3ba50a3125e48ffad83f
+_md5_=b1087c202ee8a7418603d9c3395fdd7d
diff --git a/metadata/md5-cache/media-gfx/kphotoalbum-5.2 b/metadata/md5-cache/media-gfx/kphotoalbum-5.2
index b099f9255d49..4f9956045a60 100644
--- a/metadata/md5-cache/media-gfx/kphotoalbum-5.2
+++ b/metadata/md5-cache/media-gfx/kphotoalbum-5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[sqlite] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-gfx/exiv2:= media-libs/phonon[qt5] virtual/jpeg:0 face? ( >=kde-apps/libkface-14.12.0:5 ) kipi? ( >=kde-apps/libkipi-14.12.0:5 ) map? ( >=kde-apps/libkgeomap-14.12.0:5 ) raw? ( >=kde-apps/libkdcraw-14.12.0:5 ) media-video/mplayer kipi? ( media-plugins/kipi-plugins:5 ) !media-gfx/kphotoalbum:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kphotoalbum/5.2/kphotoalbum-5.2.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=42e9b19ada611554772f5983bef66027
diff --git a/metadata/md5-cache/media-gfx/krita-3.1.2-r2 b/metadata/md5-cache/media-gfx/krita-3.1.2-r2
index 4823c3476c98..3c8d4366323d 100644
--- a/metadata/md5-cache/media-gfx/krita-3.1.2-r2
+++ b/metadata/md5-cache/media-gfx/krita-3.1.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5[-gles2] >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/boost:= media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.6.1:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/3.1.2/krita-3.1.2.1.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6337b984012093af5f658a98161f387b
diff --git a/metadata/md5-cache/media-gfx/krita-3.1.4 b/metadata/md5-cache/media-gfx/krita-3.1.4
index 84d1545f2058..d856c1359a9a 100644
--- a/metadata/md5-cache/media-gfx/krita-3.1.4
+++ b/metadata/md5-cache/media-gfx/krita-3.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemmodels-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5[-gles2] >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/boost:= media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.6.1:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/3.1.4/krita-3.1.4.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c118f9a87b5d800794e3846ee5f01352
diff --git a/metadata/md5-cache/media-gfx/kxstitch-2.0.0 b/metadata/md5-cache/media-gfx/kxstitch-2.0.0
index abdbdfa45233..c96e4a878893 100644
--- a/metadata/md5-cache/media-gfx/kxstitch-2.0.0
+++ b/metadata/md5-cache/media-gfx/kxstitch-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-gfx/imagemagick[cxx] x11-libs/libX11 !media-gfx/kxstitch:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kxstitch/2.0.0/src/kxstitch-2.0.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e8c889143be73ce84c56df21fde1a8ae
diff --git a/metadata/md5-cache/media-gfx/qrencode-python-1.01-r1 b/metadata/md5-cache/media-gfx/qrencode-python-1.01-r1
deleted file mode 100644
index 64099643b2d0..000000000000
--- a/metadata/md5-cache/media-gfx/qrencode-python-1.01-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-gfx/qrencode 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 simple wrapper for the C qrencode library
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/qrencode/ https://github.com/Arachnid/pyqrencode/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-gfx/qrencode 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/q/qrencode/qrencode-1.01.tar.gz -> qrencode-python-1.01.tar.gz
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ec0e1a4c37d84f38f64aa745d52338ab
diff --git a/metadata/md5-cache/media-gfx/qrencode-python-1.02_pre140921 b/metadata/md5-cache/media-gfx/qrencode-python-1.02_pre140921
index 33ce6619a446..73f3ade434e7 100644
--- a/metadata/md5-cache/media-gfx/qrencode-python-1.02_pre140921
+++ b/metadata/md5-cache/media-gfx/qrencode-python-1.02_pre140921
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] media-gfx/qrencode python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/qrencode 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A simple wrapper for the C qrencode library
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/qrencode/ https://github.com/Arachnid/pyqrencode/
-IUSE=python_targets_python2_7 python_targets_python3_4
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] media-gfx/qrencode python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/qrencode 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Arachnid/pyqrencode/tarball/486bb7b64e3ce5483f65e375a67da0fa6d02ca92 -> qrencode-python-1.02_pre140921.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ed0b2ae1e65ae110c2c3f475b5df370a
+_md5_=f5a619c2e27c4381400fbbd0ecfb5a53
diff --git a/metadata/md5-cache/media-gfx/symboleditor-2.0.0 b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
index d366d7d8a5d6..1889b6ce094c 100644
--- a/metadata/md5-cache/media-gfx/symboleditor-2.0.0
+++ b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !media-gfx/symboleditor:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/symboleditor/2.0.0/src/SymbolEditor-2.0.0.tar.bz2
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=096fa8c2f08cd4a870cc12b9e93ba8b5
diff --git a/metadata/md5-cache/media-libs/lensfun-0.3.2 b/metadata/md5-cache/media-libs/lensfun-0.3.2
index f596c984661d..80f8043aecb1 100644
--- a/metadata/md5-cache/media-libs/lensfun-0.3.2
+++ b/metadata/md5-cache/media-libs/lensfun-0.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.28 media-libs/libpng:0= sys-libs/zlib:= python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] doc? ( app-doc/doxygen dev-python/docutils ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-libs/glib-2.28 media-libs/libpng:0= sys-libs/zlib:= python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] doc? ( app-doc/doxygen dev-python/docutils ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=lensfun: A library for rectifying and simulating photographic lens distortions
 EAPI=5
 HOMEPAGE=http://lensfun.sourceforge.net/
-IUSE=doc cpu_flags_x86_sse cpu_flags_x86_sse2 test python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+IUSE=doc cpu_flags_x86_sse cpu_flags_x86_sse2 test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-3 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.28 media-libs/libpng:0= sys-libs/zlib:= python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+RDEPEND=>=dev-libs/glib-2.28 media-libs/libpng:0= sys-libs/zlib:= python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lensfun/lensfun-0.3.2.tar.gz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=96db8c400ffc3c57cf439c548397f6b3
+_md5_=c1bb9bcfc0166c3dfc92fb4edcf4c3e1
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta19 b/metadata/md5-cache/media-libs/libcaca-0.99_beta19
index 5c04f9393e9b..ebc5a0340614 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta19
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta19
@@ -10,5 +10,5 @@ RDEPEND=imlib? ( >=media-libs/imlib2-1.4.6-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7da0bb1a77e7fac872c84d8c88e0aa0f
diff --git a/metadata/md5-cache/media-libs/mesa-17.1.1 b/metadata/md5-cache/media-libs/mesa-17.1.1
new file mode 100644
index 000000000000..a4f7b8c8f62b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-17.1.1
@@ -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 >=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(-)?] >=sys-libs/zlib-1.2.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/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(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,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? ( virtual/libelf: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(-)?] vulkan? ( >=sys-devel/llvm-3.9.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(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) >=sys-devel/llvm-3.6.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(-)?] ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) 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-1.6.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) 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.11.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.77[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,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.77[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.77[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.77[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.77[video_cards_amdgpu] ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) llvm? ( video_cards_radeonsi? ( || ( sys-devel/llvm[llvm_targets_AMDGPU] sys-devel/llvm[video_cards_radeon] ) ) ) opencl? ( >=sys-devel/llvm-3.6.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(-)?] >=sys-devel/clang-3.6.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(-)?] >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) >=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(-)?] >=app-portage/elt-patches-20170317 !<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=6
+HOMEPAGE=https://www.mesa3d.org/
+IUSE=video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_imx video_cards_nouveau video_cards_vc4 video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa abi_x86_32 abi_x86_64 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 ~amd64-linux ~arm-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 >=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(-)?] >=sys-libs/zlib-1.2.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/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(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,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? ( virtual/libelf: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(-)?] vulkan? ( >=sys-devel/llvm-3.9.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(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) >=sys-devel/llvm-3.6.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(-)?] ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) 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-1.6.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) 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.11.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.77[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,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.77[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.77[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.77[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.77[video_cards_amdgpu] )
+REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( 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_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.1.1.tar.xz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	45ef89988bfb458ac81bb566c1eaa437	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=5ff183099c2a9224f0923937209faa57
diff --git a/metadata/md5-cache/media-libs/mlt-6.4.1-r1 b/metadata/md5-cache/media-libs/mlt-6.4.1-r1
index 5541926d5650..f89e1752f291 100644
--- a/metadata/md5-cache/media-libs/mlt-6.4.1-r1
+++ b/metadata/md5-cache/media-libs/mlt-6.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/archive/v6.4.1.tar.gz -> mlt-6.4.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
 _md5_=313fc6cccfa2d7c6d46c1d9b2f09b373
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.8 b/metadata/md5-cache/media-libs/tiff-4.0.8
index ad55023a604b..8dd087a78730 100644
--- a/metadata/md5-cache/media-libs/tiff-4.0.8
+++ b/metadata/md5-cache/media-libs/tiff-4.0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Tag Image File Format (TIFF) library
 EAPI=6
 HOMEPAGE=http://libtiff.maptools.org
 IUSE=+cxx jbig jpeg lzma static-libs test 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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=libtiff
 RDEPEND=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(-)?] ) jbig? ( >=media-libs/jbigkit-2.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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) 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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=test? ( jpeg )
 SLOT=0
 SRC_URI=http://download.osgeo.org/libtiff/tiff-4.0.8.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.8.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=0f19427af3c3cc86efe091b74047d872
+_md5_=d351d01899eb626559082f367f3628d9
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.0.46.0 b/metadata/md5-cache/media-libs/vulkan-loader-1.0.46.0
new file mode 100644
index 000000000000..8401c79a4a28
--- /dev/null
+++ b/metadata/md5-cache/media-libs/vulkan-loader-1.0.46.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( dev-lang/python:3.5 dev-lang/python:3.4 ) wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers
+IUSE=wayland 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
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-1.0.46.0.tar.gz -> vulkan-loader-1.0.46.0.tar.gz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=63b73cf15f3d1226b9330fff60d4f6d0
diff --git a/metadata/md5-cache/media-plugins/kipi-plugins-5.5.0 b/metadata/md5-cache/media-plugins/kipi-plugins-5.5.0
index 1bc9383d0afc..da5afa430795 100644
--- a/metadata/md5-cache/media-plugins/kipi-plugins-5.5.0
+++ b/metadata/md5-cache/media-plugins/kipi-plugins-5.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-apps/libkipi-14.12.0:5= >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=dev-qt/qtxmlpatterns-5.6.1:5 flashexport? ( >=kde-frameworks/karchive-5.29.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.29.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !media-plugins/kipi-plugins:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.5.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=15c90518768d93b179b14e37112d6666
diff --git a/metadata/md5-cache/media-sound/kid3-3.4.4 b/metadata/md5-cache/media-sound/kid3-3.4.4
index 45bfe7383dd8..1d6c54b4baff 100644
--- a/metadata/md5-cache/media-sound/kid3-3.4.4
+++ b/metadata/md5-cache/media-sound/kid3-3.4.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtcore-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5
 REQUIRED_USE=flac? ( vorbis )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.4.4.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d530dab007994b78058a9215997c48be
diff --git a/metadata/md5-cache/media-sound/kid3-3.4.5 b/metadata/md5-cache/media-sound/kid3-3.4.5
index 6389f3f8a12b..34a5bb6924c1 100644
--- a/metadata/md5-cache/media-sound/kid3-3.4.5
+++ b/metadata/md5-cache/media-sound/kid3-3.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.
 REQUIRED_USE=flac? ( vorbis )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.4.5.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=b011f8a32a933ef61323b4bb90ae9a63
diff --git a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20161029-r1 b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20161029-r1
index 6fe49647e923..41017012112e 100644
--- a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20161029-r1
+++ b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20161029-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=>=kde-frameworks/attica-5.29.0 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 app-crypt/qca:2[qt5] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5] >=dev-libs/quazip-0.7.2[qt5] media-libs/liblastfm[qt5] >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 hatchet? ( dev-cpp/websocketpp ) telepathy? ( net-libs/telepathy-qt[qt5] ) xmpp? ( net-libs/jreen[qt5] ) app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~johu/distfiles/tomahawk-0.9.0_pre20161029.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8aef782d3df49c171a1c1bb529824fb0
diff --git a/metadata/md5-cache/media-sound/tomahawk-9999 b/metadata/md5-cache/media-sound/tomahawk-9999
index 6144712691b7..7ce1b241fc89 100644
--- a/metadata/md5-cache/media-sound/tomahawk-9999
+++ b/metadata/md5-cache/media-sound/tomahawk-9999
@@ -7,5 +7,5 @@ IUSE=+hatchet telepathy xmpp debug
 LICENSE=GPL-3 BSD
 RDEPEND=>=kde-frameworks/attica-5.29.0 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 app-crypt/qca:2[qt5] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5] >=dev-libs/quazip-0.7.2[qt5] media-libs/liblastfm[qt5] >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 hatchet? ( dev-cpp/websocketpp ) telepathy? ( net-libs/telepathy-qt[qt5] ) xmpp? ( net-libs/jreen[qt5] ) app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=0
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d85828aae9bd54819003e357422ff48c
diff --git a/metadata/md5-cache/media-sound/xmms2-0.8-r4 b/metadata/md5-cache/media-sound/xmms2-0.8-r4
index a8b48c93e036..21d0a627f429 100644
--- a/metadata/md5-cache/media-sound/xmms2-0.8-r4
+++ b/metadata/md5-cache/media-sound/xmms2-0.8-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) gvfs? ( gnome-base/gnome-vfs ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) virtual/rubygems ) dev-lang/python virtual/pkgconfig perl? ( dev-perl/Module-Build virtual/perl-Module-Metadata ) python? ( >=dev-python/cython-0.15.1 dev-python/pyrex ) test? ( dev-util/cunit valgrind? ( dev-util/valgrind ) )
+DEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) gvfs? ( gnome-base/gnome-vfs ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) virtual/rubygems ) dev-lang/python virtual/pkgconfig perl? ( dev-perl/Module-Build virtual/perl-Module-Metadata ) python? ( >=dev-python/cython-0.15.1 dev-python/pyrex ) test? ( dev-util/cunit valgrind? ( dev-util/valgrind ) )
 DESCRIPTION=X(cross)platform Music Multiplexing System. Next generation of the XMMS player
 EAPI=5
 HOMEPAGE=http://xmms2.org/wiki/Main_Page
 IUSE=aac airplay +alsa ao asf cdda curl cxx ffmpeg flac gvfs ices jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa oss perl phonehome pulseaudio python ruby samba +server sid sndfile speex test valgrind +vorbis vocoder wavpack xml zeroconf python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
 KEYWORDS=alpha amd64 ppc x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) gvfs? ( gnome-base/gnome-vfs ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) virtual/rubygems )
+RDEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) gvfs? ( gnome-base/gnome-vfs ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) virtual/rubygems )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xmms2/xmms2-0.8DrO_o.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
 _md5_=57af368002b1d58796e823ace843d5cd
diff --git a/metadata/md5-cache/media-sound/xmms2-0.8_p20161122 b/metadata/md5-cache/media-sound/xmms2-0.8_p20161122
index 81404052d700..f873f4eacea4 100644
--- a/metadata/md5-cache/media-sound/xmms2-0.8_p20161122
+++ b/metadata/md5-cache/media-sound/xmms2-0.8_p20161122
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gvfs? ( gnome-base/gnome-vfs ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) virtual/rubygems ) dev-lang/python virtual/pkgconfig perl? ( dev-perl/Module-Build virtual/perl-Module-Metadata ) python? ( >=dev-python/cython-0.15.1 dev-python/pyrex ) test? ( dev-util/cunit valgrind? ( dev-util/valgrind ) )
+DEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gvfs? ( gnome-base/gnome-vfs ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) virtual/rubygems ) dev-lang/python virtual/pkgconfig perl? ( dev-perl/Module-Build virtual/perl-Module-Metadata ) python? ( >=dev-python/cython-0.15.1 dev-python/pyrex ) test? ( dev-util/cunit valgrind? ( dev-util/valgrind ) )
 DESCRIPTION=X(cross)platform Music Multiplexing System. Next generation of the XMMS player
 EAPI=6
 HOMEPAGE=http://xmms2.org/wiki/Main_Page
 IUSE=aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth gvfs ices jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss perl phonehome pulseaudio python ruby samba +server sid sndfile speex test valgrind +vorbis vocoder wavpack xml zeroconf python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
 KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gvfs? ( gnome-base/gnome-vfs ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) virtual/rubygems )
+RDEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gvfs? ( gnome-base/gnome-vfs ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) virtual/rubygems )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/xmms2-0.8DrO_o-949-gca15e830.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
 _md5_=4a862578d5874a35a8653f7c80988685
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.9 b/metadata/md5-cache/media-video/kaffeine-2.0.9
index 631d795d9b4f..0ecb0639884f 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.9
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.3 )
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[sqlite] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/libv4l media-video/vlc[X] x11-libs/libXScrnSaver !media-video/kaffeine:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/2.0.9/src/kaffeine-2.0.9.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=22fedca7a0dd11b3dc6711b697d3b68d
diff --git a/metadata/md5-cache/media-video/kamerka-0.12_p20161002 b/metadata/md5-cache/media-video/kamerka-0.12_p20161002
index 3d1d775d2f2d..aa4b34a5cf64 100644
--- a/metadata/md5-cache/media-video/kamerka-0.12_p20161002
+++ b/metadata/md5-cache/media-video/kamerka-0.12_p20161002
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.29.0 >=kde-frameworks/kconfig-5.29.0 >=kde-frameworks/kconfigwidgets-5.29.0 >=kde-frameworks/kcoreaddons-5.29.0 >=kde-frameworks/kdeclarative-5.29.0 >=kde-frameworks/kdelibs4support-5.29.0 >=kde-frameworks/ki18n-5.29.0 >=kde-frameworks/kio-5.29.0 >=kde-frameworks/knotifications-5.29.0 >=kde-frameworks/kwidgetsaddons-5.29.0 >=kde-frameworks/kxmlgui-5.29.0 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/libv4l media-libs/phonon[qt5] media-libs/qimageblitz[qt5] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=0
 SRC_URI=https://github.com/dos1/kamerka/archive/a201df47a0849a09a20617fedfee26a407dc847c.tar.gz -> kamerka-0.12_p20161002.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=276a71cfca43d40058872c318c478374
diff --git a/metadata/md5-cache/media-video/kamoso-3.2 b/metadata/md5-cache/media-video/kamoso-3.2
index 3d28e168438a..98bbf3e89f12 100644
--- a/metadata/md5-cache/media-video/kamoso-3.2
+++ b/metadata/md5-cache/media-video/kamoso-3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/purpose:5 media-libs/qt-gstreamer[qt5] virtual/libudev:= media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kamoso/3.2/src/kamoso-3.2.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c2002b38de5ef30062395202b3c9eed8
diff --git a/metadata/md5-cache/media-video/kamoso-3.2.2 b/metadata/md5-cache/media-video/kamoso-3.2.2
index 5fdd195e1a0b..03d93ce819bf 100644
--- a/metadata/md5-cache/media-video/kamoso-3.2.2
+++ b/metadata/md5-cache/media-video/kamoso-3.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/purpose:5 media-libs/qt-gstreamer[qt5] virtual/libudev:= media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kamoso/3.2/src/kamoso-3.2.2.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f83c8e2304504b5bf42cb41b88a7cc19
diff --git a/metadata/md5-cache/media-video/kmplayer-0.12.0b b/metadata/md5-cache/media-video/kmplayer-0.12.0b
index 2be52eb7652e..e81e728b27d9 100644
--- a/metadata/md5-cache/media-video/kmplayer-0.12.0b
+++ b/metadata/md5-cache/media-video/kmplayer-0.12.0b
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kmediaplayer-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libxcb cairo? ( x11-libs/cairo[xcb] ) npp? ( dev-libs/dbus-glib dev-libs/glib:2 www-plugins/adobe-flash:* >=x11-libs/gtk+-2.10.14:2 ) media-video/mplayer !media-video/kmplayer:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmplayer/0.12/kmplayer-0.12.0b.tar.bz2
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a772c17b98f883c7465f1bbff8aab06b
diff --git a/metadata/md5-cache/media-video/makemkv-1.10.5 b/metadata/md5-cache/media-video/makemkv-1.10.6
similarity index 87%
rename from metadata/md5-cache/media-video/makemkv-1.10.5
rename to metadata/md5-cache/media-video/makemkv-1.10.6
index 7993a80f41c2..2db9d612fd81 100644
--- a/metadata/md5-cache/media-video/makemkv-1.10.5
+++ b/metadata/md5-cache/media-video/makemkv-1.10.6
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs
 EAPI=6
 HOMEPAGE=http://www.makemkv.com/
 IUSE=libav multilib qt4 qt5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
 RDEPEND=sys-libs/glibc[multilib?] dev-libs/expat dev-libs/openssl:0[-bindist(-)] sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) net-misc/wget
 SLOT=0
-SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.10.5.tar.gz http://www.makemkv.com/download/makemkv-bin-1.10.5.tar.gz
+SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.10.6.tar.gz http://www.makemkv.com/download/makemkv-bin-1.10.6.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c93e5b70c4828a8af85f19d48c9ddb20
+_md5_=4f10316268c8660f0fb614f2170488ef
diff --git a/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5 b/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
index 680f0653a024..2d98195f7efc 100644
--- a/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
+++ b/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.29.0:5 >=kde-frameworks/kfilemetadata-5.29.0:5 ) >=kde-plasma/plasma-workspace-5.4.1:5 >=dev-qt/qtmultimedia-5.6.1:5[qml] !media-video/plasma-mediacenter:0 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.7.5/plasma-mediacenter-5.7.5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=e36402713f8d2cc8b55086679ea21c6b
diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.6.4 b/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
index ab7aef1a96c0..47646b60caae 100644
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!media-video/subtitlecomposer:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://github.com/maxrd2/subtitlecomposer/archive/v0.6.4.tar.gz -> subtitlecomposer-0.6.4.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=190d1caffe01548128acdf3ee81b7164
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.12.16 b/metadata/md5-cache/net-analyzer/metasploit-4.12.16
index 7b0c22341b32..1b7be5087a02 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-4.12.16
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.12.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 )
 RESTRICT=strip
 SLOT=4.12
 SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.12.16.tar.gz -> metasploit-4.12.16.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0439ff26f29f75124afcbf6f589df99e
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.12.7 b/metadata/md5-cache/net-analyzer/metasploit-4.12.7
index b5e847b3e90e..be29a59dc901 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-4.12.7
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.12.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 )
 RESTRICT=strip
 SLOT=4.12
 SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.12.7.tar.gz -> metasploit-4.12.7.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8d5abd53bc9c91734eb961af320031a9
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.14.16 b/metadata/md5-cache/net-analyzer/metasploit-4.14.16
index 90dda4b815a2..8dcdda072095 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-4.14.16
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.14.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 )
 RESTRICT=strip
 SLOT=4.14
 SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.14.16.tar.gz -> metasploit-4.14.16.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b4ae1b74a1f7d635f600f336a0439fb9
diff --git a/metadata/md5-cache/net-analyzer/metasploit-9999 b/metadata/md5-cache/net-analyzer/metasploit-9999
index 1b5ce5cafa2d..a4d7aface1f4 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-9999
+++ b/metadata/md5-cache/net-analyzer/metasploit-9999
@@ -9,5 +9,5 @@ RDEPEND=ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby23 )
 RESTRICT=strip
 SLOT=9999
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=25d2da45ebc5637a745fb880e7ba72d6
diff --git a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5 b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
index 5e05555ef72d..9777cb65e41e 100644
--- a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
+++ b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
@@ -4,9 +4,9 @@ DESCRIPTION=A wrapper for DNS name resolving or DNS faking
 EAPI=6
 HOMEPAGE=https://cwrap.org/resolv_wrapper.html
 IUSE=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=amd64 ppc64 x86
+KEYWORDS=alpha amd64 ppc64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/resolv_wrapper-1.1.5.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f1e5cef2169f0fbb941e1e06d983ec50
+_md5_=1377ec4d789b95f56314b059d28ca639
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.4.1 b/metadata/md5-cache/net-firewall/shorewall-5.1.4.1
new file mode 100644
index 000000000000..bbe259017c7a
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall-5.1.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A high-level tool for configuring Netfilter
+EAPI=6
+HOMEPAGE=http://www.shorewall.net/
+IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
+REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
+SLOT=0
+SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.4/shorewall-core-5.1.4.1.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.4/shorewall-5.1.4.1.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.4/shorewall6-5.1.4.1.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.4/shorewall-lite-5.1.4.1.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.4/shorewall6-lite-5.1.4.1.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.4/shorewall-init-5.1.4.1.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.4/shorewall-docs-html-5.1.4.1.tar.bz2 )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7d924d32d7594f4cc11ff661caa1a730
diff --git a/metadata/md5-cache/net-fs/samba-4.5.10 b/metadata/md5-cache/net-fs/samba-4.5.10
index 778da18c0089..805815be3d3a 100644
--- a/metadata/md5-cache/net-fs/samba-4.5.10
+++ b/metadata/md5-cache/net-fs/samba-4.5.10
@@ -4,11 +4,11 @@ DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=http://www.samba.org/
 IUSE=acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=alpha amd64 ppc64 x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/libarchive-3.1.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(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,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/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,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-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,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/ldb-1.1.27[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,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/libcap sys-libs/ncurses: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(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.10[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.31-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[abi_x86_32(-)?,abi_x86_64(-)?,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/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
 REQUIRED_USE=addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.5.10.tar.gz https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.5.0_rc1.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=02f5dc774f7e169839d2df2ab4d38367
+_md5_=3342fe32ecc676532a980dba1343dd5c
diff --git a/metadata/md5-cache/net-im/choqok-1.6.0 b/metadata/md5-cache/net-im/choqok-1.6.0
index 57fd23b314b2..23e02e7a702d 100644
--- a/metadata/md5-cache/net-im/choqok-1.6.0
+++ b/metadata/md5-cache/net-im/choqok-1.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kemoticons-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/sonnet-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 app-crypt/qca[qt5] dev-libs/qoauth:5 attica? ( >=kde-frameworks/attica-5.29.0:5 ) konqueror? ( >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kdewebkit-5.29.0:5 >=dev-qt/qtwebkit-5.6.1:5 ) telepathy? ( net-libs/telepathy-qt[qt5] ) !net-im/choqok:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/choqok/1.6/src/choqok-1.6.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=4bde2169cf480b03604f0a8f2a61e11b
diff --git a/metadata/md5-cache/net-im/ejabberd-16.04 b/metadata/md5-cache/net-im/ejabberd-16.04
deleted file mode 100644
index c7b58d71ea84..000000000000
--- a/metadata/md5-cache/net-im/ejabberd-16.04
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-erlang/cache_tab-1.0.2 >=dev-erlang/esip-1.0.4 >=dev-erlang/fast_tls-1.0.3 >=dev-erlang/fast_xml-1.1.3 >=dev-erlang/fast_yaml-1.0.3 >=dev-erlang/jiffy-0.14.7 >=dev-erlang/lager-3.0.2 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.4 >=dev-erlang/p1_xmlrpc-1.15.1 >=dev-erlang/stringprep-1.0.3 >=dev-erlang/stun-1.0.3 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] <dev-lang/erlang-19 >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.0 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/p1_pam-1.0.0 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.1.1_p20151111 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.1 ) >=sys-apps/gawk-4.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1 || ( dev-libs/openssl:0 dev-libs/libressl:0 ) virtual/pkgconfig
-DESCRIPTION=Robust, scalable and extensible XMPP server
-EAPI=6
-HOMEPAGE=http://www.ejabberd.im/ https://github.com/processone/ejabberd/
-IUSE=captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis riak roster-gw sqlite zlib
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-erlang/cache_tab-1.0.2 >=dev-erlang/esip-1.0.4 >=dev-erlang/fast_tls-1.0.3 >=dev-erlang/fast_xml-1.1.3 >=dev-erlang/fast_yaml-1.0.3 >=dev-erlang/jiffy-0.14.7 >=dev-erlang/lager-3.0.2 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.4 >=dev-erlang/p1_xmlrpc-1.15.1 >=dev-erlang/stringprep-1.0.3 >=dev-erlang/stun-1.0.3 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] <dev-lang/erlang-19 >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.0 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/p1_pam-1.0.0 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.1.1_p20151111 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.1 ) captcha? ( media-gfx/imagemagick[truetype,png] ) dev-lang/erlang
-REQUIRED_USE=mssql? ( odbc )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.process-one.net/downloads/ejabberd/16.04/ejabberd-16.04.tgz -> ejabberd-16.04.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	rebar	f135c419c43bc8841cd57d1d53ed1da8	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=bf8fb4e0369fcfa2115ec2abb7a1eeed
diff --git a/metadata/md5-cache/net-im/ejabberd-16.04-r1 b/metadata/md5-cache/net-im/ejabberd-16.04-r1
deleted file mode 100644
index 19d14fb5267e..000000000000
--- a/metadata/md5-cache/net-im/ejabberd-16.04-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-erlang/cache_tab-1.0.2 >=dev-erlang/esip-1.0.4 >=dev-erlang/fast_tls-1.0.3 >=dev-erlang/fast_xml-1.1.3 >=dev-erlang/fast_yaml-1.0.3 >=dev-erlang/jiffy-0.14.7 >=dev-erlang/lager-3.0.2 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.4 >=dev-erlang/p1_xmlrpc-1.15.1 >=dev-erlang/stringprep-1.0.3 >=dev-erlang/stun-1.0.3 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] <dev-lang/erlang-19 >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.0 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/p1_pam-1.0.0 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.1.1_p20151111 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.1 ) >=sys-apps/gawk-4.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1 || ( dev-libs/openssl:0 dev-libs/libressl:0 ) virtual/pkgconfig
-DESCRIPTION=Robust, scalable and extensible XMPP server
-EAPI=6
-HOMEPAGE=http://www.ejabberd.im/ https://github.com/processone/ejabberd/
-IUSE=captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis riak roster-gw sqlite zlib
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-erlang/cache_tab-1.0.2 >=dev-erlang/esip-1.0.4 >=dev-erlang/fast_tls-1.0.3 >=dev-erlang/fast_xml-1.1.3 >=dev-erlang/fast_yaml-1.0.3 >=dev-erlang/jiffy-0.14.7 >=dev-erlang/lager-3.0.2 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.4 >=dev-erlang/p1_xmlrpc-1.15.1 >=dev-erlang/stringprep-1.0.3 >=dev-erlang/stun-1.0.3 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] <dev-lang/erlang-19 >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.0 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/p1_pam-1.0.0 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.1.1_p20151111 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.1 ) captcha? ( media-gfx/imagemagick[truetype,png] ) dev-lang/erlang
-REQUIRED_USE=mssql? ( odbc )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.process-one.net/downloads/ejabberd/16.04/ejabberd-16.04.tgz -> ejabberd-16.04.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	rebar	f135c419c43bc8841cd57d1d53ed1da8	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=b6e1034e813460d343c62115b61ed743
diff --git a/metadata/md5-cache/net-im/ejabberd-16.08 b/metadata/md5-cache/net-im/ejabberd-16.08
deleted file mode 100644
index 116351db52f3..000000000000
--- a/metadata/md5-cache/net-im/ejabberd-16.08
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-erlang/cache_tab-1.0.3 >=dev-erlang/esip-1.0.7 >=dev-erlang/fast_tls-1.0.6 >=dev-erlang/fast_xml-1.1.14 >=dev-erlang/fast_yaml-1.0.5 >=dev-erlang/jiffy-0.14.7 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.5 >=dev-erlang/p1_xmlrpc-1.15.1 >=dev-erlang/stringprep-1.0.5 >=dev-erlang/stun-1.0.6 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.1 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/p1_pam-1.0.0 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.1.1_p20151111 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.1 ) >=sys-apps/gawk-4.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1 || ( dev-libs/openssl:0 dev-libs/libressl:0 ) virtual/pkgconfig
-DESCRIPTION=Robust, scalable and extensible XMPP server
-EAPI=6
-HOMEPAGE=http://www.ejabberd.im/ https://github.com/processone/ejabberd/
-IUSE=captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis riak roster-gw sqlite zlib
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-erlang/cache_tab-1.0.3 >=dev-erlang/esip-1.0.7 >=dev-erlang/fast_tls-1.0.6 >=dev-erlang/fast_xml-1.1.14 >=dev-erlang/fast_yaml-1.0.5 >=dev-erlang/jiffy-0.14.7 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.5 >=dev-erlang/p1_xmlrpc-1.15.1 >=dev-erlang/stringprep-1.0.5 >=dev-erlang/stun-1.0.6 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.1 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/p1_pam-1.0.0 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.1.1_p20151111 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.1 ) captcha? ( media-gfx/imagemagick[truetype,png] ) dev-lang/erlang
-REQUIRED_USE=mssql? ( odbc )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.process-one.net/downloads/ejabberd/16.08/ejabberd-16.08.tgz -> ejabberd-16.08.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	rebar	f135c419c43bc8841cd57d1d53ed1da8	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=771eddbc3fcd6853a7a427acc8179945
diff --git a/metadata/md5-cache/net-im/ejabberd-16.09 b/metadata/md5-cache/net-im/ejabberd-16.09
index 15e7e517490f..785243e4bcb1 100644
--- a/metadata/md5-cache/net-im/ejabberd-16.09
+++ b/metadata/md5-cache/net-im/ejabberd-16.09
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-erlang/cache_tab-1.0.4 >=dev-erlang/esip-1.0.8 >=dev-erlang/fast_tls-1.0.7 >=dev-erlang/fast_xml-1.1.15 >=dev-erlang/fast_yaml-1.0.6 >=dev-erlang/jiffy-0.14.7 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.5 >=dev-erlang/stringprep-1.0.6 >=dev-erlang/stun-1.0.7 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.2 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/p1_pam-1.0.0 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.1.1_p20151111 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.1 ) >=sys-apps/gawk-4.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1 || ( dev-libs/openssl:0 dev-libs/libressl:0 ) virtual/pkgconfig
+DEPEND=>=dev-erlang/cache_tab-1.0.4 >=dev-erlang/esip-1.0.8 >=dev-erlang/fast_tls-1.0.7 >=dev-erlang/fast_xml-1.1.15 >=dev-erlang/fast_yaml-1.0.6 >=dev-erlang/jiffy-0.14.7 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.5 >=dev-erlang/stringprep-1.0.6 >=dev-erlang/stun-1.0.7 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.2 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.0 <dev-erlang/epam-1.0.1 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.1.1_p20151111 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.1 ) >=sys-apps/gawk-4.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1 || ( dev-libs/openssl:0 dev-libs/libressl:0 ) virtual/pkgconfig
 DESCRIPTION=Robust, scalable and extensible XMPP server
 EAPI=6
 HOMEPAGE=http://www.ejabberd.im/ https://github.com/processone/ejabberd/
 IUSE=captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis riak roster-gw sqlite zlib
 KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-erlang/cache_tab-1.0.4 >=dev-erlang/esip-1.0.8 >=dev-erlang/fast_tls-1.0.7 >=dev-erlang/fast_xml-1.1.15 >=dev-erlang/fast_yaml-1.0.6 >=dev-erlang/jiffy-0.14.7 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.5 >=dev-erlang/stringprep-1.0.6 >=dev-erlang/stun-1.0.7 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.2 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/p1_pam-1.0.0 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.1.1_p20151111 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.1 ) captcha? ( media-gfx/imagemagick[truetype,png] ) dev-lang/erlang
+RDEPEND=>=dev-erlang/cache_tab-1.0.4 >=dev-erlang/esip-1.0.8 >=dev-erlang/fast_tls-1.0.7 >=dev-erlang/fast_xml-1.1.15 >=dev-erlang/fast_yaml-1.0.6 >=dev-erlang/jiffy-0.14.7 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.5 >=dev-erlang/stringprep-1.0.6 >=dev-erlang/stun-1.0.7 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.2 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.0 <dev-erlang/epam-1.0.1 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.1.1_p20151111 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.1 ) captcha? ( media-gfx/imagemagick[truetype,png] ) dev-lang/erlang
 REQUIRED_USE=mssql? ( odbc )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.process-one.net/downloads/ejabberd/16.09/ejabberd-16.09.tgz -> ejabberd-16.09.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	rebar	f135c419c43bc8841cd57d1d53ed1da8	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=35f07a0bc0659e4192ce2ce4743c45c5
+_md5_=c5aaed66a0e27531037c287d80767888
diff --git a/metadata/md5-cache/net-im/ejabberd-17.01 b/metadata/md5-cache/net-im/ejabberd-17.01
index 2041446929f9..215054ccc8d0 100644
--- a/metadata/md5-cache/net-im/ejabberd-17.01
+++ b/metadata/md5-cache/net-im/ejabberd-17.01
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-erlang/cache_tab-1.0.6 >=dev-erlang/esip-1.0.10 >=dev-erlang/fast_tls-1.0.10 >=dev-erlang/fast_xml-1.1.19 >=dev-erlang/fast_yaml-1.0.8 >=dev-erlang/jiffy-0.14.8 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.6 >=dev-erlang/stringprep-1.0.7 >=dev-erlang/stun-1.0.9 >=dev-erlang/xmpp-1.1.6 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.2 ) nls? ( >=dev-erlang/iconv-1.0.3 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/p1_pam-1.0.0 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.2 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.4.1 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.2 ) >=sys-apps/gawk-4.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1 || ( dev-libs/openssl:0 dev-libs/libressl:0 ) virtual/pkgconfig
+DEPEND=>=dev-erlang/cache_tab-1.0.6 >=dev-erlang/esip-1.0.10 >=dev-erlang/fast_tls-1.0.10 >=dev-erlang/fast_xml-1.1.19 >=dev-erlang/fast_yaml-1.0.8 >=dev-erlang/jiffy-0.14.8 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.6 >=dev-erlang/stringprep-1.0.7 >=dev-erlang/stun-1.0.9 >=dev-erlang/xmpp-1.1.6 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.2 ) nls? ( >=dev-erlang/iconv-1.0.3 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.0 <dev-erlang/epam-1.0.1 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.2 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.4.1 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.2 ) >=sys-apps/gawk-4.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1 || ( dev-libs/openssl:0 dev-libs/libressl:0 ) virtual/pkgconfig
 DESCRIPTION=Robust, scalable and extensible XMPP server
 EAPI=6
 HOMEPAGE=http://www.ejabberd.im/ https://github.com/processone/ejabberd/
 IUSE=captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis riak roster-gw sqlite zlib
 KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-erlang/cache_tab-1.0.6 >=dev-erlang/esip-1.0.10 >=dev-erlang/fast_tls-1.0.10 >=dev-erlang/fast_xml-1.1.19 >=dev-erlang/fast_yaml-1.0.8 >=dev-erlang/jiffy-0.14.8 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.6 >=dev-erlang/stringprep-1.0.7 >=dev-erlang/stun-1.0.9 >=dev-erlang/xmpp-1.1.6 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.2 ) nls? ( >=dev-erlang/iconv-1.0.3 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/p1_pam-1.0.0 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.2 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.4.1 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.2 ) captcha? ( media-gfx/imagemagick[truetype,png] ) dev-lang/erlang
+RDEPEND=>=dev-erlang/cache_tab-1.0.6 >=dev-erlang/esip-1.0.10 >=dev-erlang/fast_tls-1.0.10 >=dev-erlang/fast_xml-1.1.19 >=dev-erlang/fast_yaml-1.0.8 >=dev-erlang/jiffy-0.14.8 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.6 >=dev-erlang/stringprep-1.0.7 >=dev-erlang/stun-1.0.9 >=dev-erlang/xmpp-1.1.6 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.2 ) nls? ( >=dev-erlang/iconv-1.0.3 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.0 <dev-erlang/epam-1.0.1 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.2 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.4.1 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.2 ) captcha? ( media-gfx/imagemagick[truetype,png] ) dev-lang/erlang
 REQUIRED_USE=mssql? ( odbc )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.process-one.net/downloads/ejabberd/17.01/ejabberd-17.01.tgz -> ejabberd-17.01.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	rebar	f135c419c43bc8841cd57d1d53ed1da8	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=25992c708e6dfa26dc0266744f9a0294
+_md5_=cec0c2d97843d3d4b678b01c4161dd7f
diff --git a/metadata/md5-cache/net-im/ejabberd-17.01-r1 b/metadata/md5-cache/net-im/ejabberd-17.01-r1
new file mode 100644
index 000000000000..e7b7933fdf6f
--- /dev/null
+++ b/metadata/md5-cache/net-im/ejabberd-17.01-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-erlang/cache_tab-1.0.6 >=dev-erlang/esip-1.0.10 >=dev-erlang/fast_tls-1.0.10 >=dev-erlang/fast_xml-1.1.19 >=dev-erlang/fast_yaml-1.0.8 >=dev-erlang/jiffy-0.14.8 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.6 >=dev-erlang/stringprep-1.0.7 >=dev-erlang/stun-1.0.9 >=dev-erlang/xmpp-1.1.6 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.2 ) nls? ( >=dev-erlang/iconv-1.0.3 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.0-r1 <dev-erlang/epam-1.0.1 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.2 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.4.1 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.2 ) >=sys-apps/gawk-4.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1 || ( dev-libs/openssl:0 dev-libs/libressl:0 ) virtual/pkgconfig
+DESCRIPTION=Robust, scalable and extensible XMPP server
+EAPI=6
+HOMEPAGE=http://www.ejabberd.im/ https://github.com/processone/ejabberd/
+IUSE=captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis riak roster-gw sqlite zlib
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-erlang/cache_tab-1.0.6 >=dev-erlang/esip-1.0.10 >=dev-erlang/fast_tls-1.0.10 >=dev-erlang/fast_xml-1.1.19 >=dev-erlang/fast_yaml-1.0.8 >=dev-erlang/jiffy-0.14.8 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.6 >=dev-erlang/stringprep-1.0.7 >=dev-erlang/stun-1.0.9 >=dev-erlang/xmpp-1.1.6 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.2 ) nls? ( >=dev-erlang/iconv-1.0.3 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.0-r1 <dev-erlang/epam-1.0.1 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.2 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.4.1 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.2 ) captcha? ( media-gfx/imagemagick[truetype,png] ) dev-lang/erlang
+REQUIRED_USE=mssql? ( odbc )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.process-one.net/downloads/ejabberd/17.01/ejabberd-17.01.tgz -> ejabberd-17.01.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	rebar	f135c419c43bc8841cd57d1d53ed1da8	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=16d98c4610e72dc091ad1c6b4c8e62bb
diff --git a/metadata/md5-cache/net-im/ejabberd-17.04 b/metadata/md5-cache/net-im/ejabberd-17.04
new file mode 100644
index 000000000000..4f58553af9fd
--- /dev/null
+++ b/metadata/md5-cache/net-im/ejabberd-17.04
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-erlang/cache_tab-1.0.7 >=dev-erlang/esip-1.0.11 >=dev-erlang/fast_tls-1.0.11 >=dev-erlang/fast_xml-1.1.21 >=dev-erlang/fast_yaml-1.0.9 >=dev-erlang/jiffy-0.14.8 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.8 >=dev-erlang/stringprep-1.0.8 >=dev-erlang/stun-1.0.10 >=dev-erlang/xmpp-1.1.9 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.2 ) nls? ( >=dev-erlang/iconv-1.0.4 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.2 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.2 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.4.1 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.2 ) >=sys-apps/gawk-4.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1 || ( dev-libs/openssl:0 dev-libs/libressl:0 ) virtual/pkgconfig
+DESCRIPTION=Robust, scalable and extensible XMPP server
+EAPI=6
+HOMEPAGE=http://www.ejabberd.im/ https://github.com/processone/ejabberd/
+IUSE=captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis riak roster-gw sqlite zlib
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-erlang/cache_tab-1.0.7 >=dev-erlang/esip-1.0.11 >=dev-erlang/fast_tls-1.0.11 >=dev-erlang/fast_xml-1.1.21 >=dev-erlang/fast_yaml-1.0.9 >=dev-erlang/jiffy-0.14.8 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.8 >=dev-erlang/stringprep-1.0.8 >=dev-erlang/stun-1.0.10 >=dev-erlang/xmpp-1.1.9 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.2 ) nls? ( >=dev-erlang/iconv-1.0.4 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.2 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.2 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.4.1 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.2 ) captcha? ( media-gfx/imagemagick[truetype,png] ) dev-lang/erlang
+REQUIRED_USE=mssql? ( odbc )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.process-one.net/downloads/ejabberd/17.04/ejabberd-17.04.tgz -> ejabberd-17.04.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	rebar	f135c419c43bc8841cd57d1d53ed1da8	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=05e742d49823deb753086c3ae6100f09
diff --git a/metadata/md5-cache/net-im/empathy-3.12.12 b/metadata/md5-cache/net-im/empathy-3.12.12
index 7da6e430eaa1..d5084b1fecd8 100644
--- a/metadata/md5-cache/net-im/empathy-3.12.12
+++ b/metadata/md5-cache/net-im/empathy-3.12.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.37.6:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.4:3 x11-libs/pango >=dev-libs/dbus-glib-0.51 >=dev-libs/folks-0.9.5:=[telepathy] dev-libs/libgee:0.8= >=app-crypt/libsecret-0.5 >=media-libs/libcanberra-0.25[gtk3] >=net-libs/gnutls-2.8.5:= >=net-libs/webkit-gtk-1.9.1:3 >=x11-libs/libnotify-0.7:= media-libs/gstreamer:1.0 >=media-libs/clutter-1.10.0:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 media-libs/clutter-gst:2.0 >=media-libs/cogl-1.14:1.0= net-libs/farstream:0.2= >=net-libs/telepathy-farstream-0.6.0:= >=net-libs/telepathy-glib-0.23.2 >=net-im/telepathy-logger-0.8.0:= app-crypt/gcr dev-libs/libxml2:2 gnome-base/gsettings-desktop-schemas media-sound/pulseaudio[glib] net-libs/libsoup:2.4 x11-libs/libX11 geolocation? ( >=app-misc/geoclue-2.1:2.0 >=sci-geosciences/geocode-glib-3.10 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1:= ) map? ( >=media-libs/clutter-1.7.14:1.0 >=media-libs/clutter-gtk-0.90.3:1.0 >=media-libs/libchamplain-0.12.1:0.12[gtk] ) spell? ( >=app-text/enchant-1.2 >=app-text/iso-codes-0.35 ) v4l? ( media-plugins/gst-plugins-v4l2:1.0 >=media-video/cheese-3.4:= virtual/libgudev:= ) || ( dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.50.0 dev-util/itstool virtual/pkgconfig test? ( sys-apps/grep >=dev-libs/check-0.9.4 ) >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.37.6:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.4:3 x11-libs/pango >=dev-libs/dbus-glib-0.51 >=dev-libs/folks-0.9.5:=[telepathy] dev-libs/libgee:0.8= >=app-crypt/libsecret-0.5 >=media-libs/libcanberra-0.25[gtk3] >=net-libs/gnutls-2.8.5:= >=net-libs/webkit-gtk-1.9.1:3 >=x11-libs/libnotify-0.7:= media-libs/gstreamer:1.0 >=media-libs/clutter-1.10.0:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 media-libs/clutter-gst:2.0 >=media-libs/cogl-1.14:1.0= net-libs/farstream:0.2= >=net-libs/telepathy-farstream-0.6.0:= >=net-libs/telepathy-glib-0.23.2 >=net-im/telepathy-logger-0.8.0:= app-crypt/gcr dev-libs/libxml2:2 gnome-base/gsettings-desktop-schemas media-sound/pulseaudio[glib] net-libs/libsoup:2.4 x11-libs/libX11 geolocation? ( >=app-misc/geoclue-2.1:2.0 >=sci-geosciences/geocode-glib-3.10 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1:= ) map? ( >=media-libs/clutter-1.7.14:1.0 >=media-libs/clutter-gtk-0.90.3:1.0 >=media-libs/libchamplain-0.12.1:0.12[gtk] ) spell? ( >=app-text/enchant-1.2 >=app-text/iso-codes-0.35 ) v4l? ( media-plugins/gst-plugins-v4l2:1.0 >=media-video/cheese-3.4:= virtual/libgudev:= ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.50.0 dev-util/itstool virtual/pkgconfig test? ( sys-apps/grep >=dev-libs/check-0.9.4 ) >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Telepathy instant messaging and video/audio call client for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Empathy
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.37.6:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9
 SLOT=0
 SRC_URI=mirror://gnome/sources/empathy/3.12/empathy-3.12.12.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9510392b162b112a361a50ee628e14a5
+_md5_=100ca0898abe0c90c83590af2f8c4a2f
diff --git a/metadata/md5-cache/net-irc/epic5-1.1.10-r1 b/metadata/md5-cache/net-irc/epic5-1.1.10-r1
index cd2aeae238d3..6af473b1401d 100644
--- a/metadata/md5-cache/net-irc/epic5-1.1.10-r1
+++ b/metadata/md5-cache/net-irc/epic5-1.1.10-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0 >=sys-libs/ncurses-5.6-r2 virtual/libicon
 REQUIRED_USE=ruby? ( ^^ ( ruby_targets_ruby21 ruby_targets_ruby22 ) ) ruby_targets_ruby21? ( ruby ) ruby_targets_ruby22? ( ruby )
 SLOT=0
 SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-1.1.10.tar.bz2
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=20b811464fdfcc3b395be8df2087a5fc
diff --git a/metadata/md5-cache/net-irc/konversation-1.6.2 b/metadata/md5-cache/net-irc/konversation-1.6.2
index fef14d21577d..107466c668ec 100644
--- a/metadata/md5-cache/net-irc/konversation-1.6.2
+++ b/metadata/md5-cache/net-irc/konversation-1.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kemoticons-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=kde-frameworks/sonnet-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] sys-devel/gettext crypt? ( app-crypt/qca:2[qt5] ) !net-irc/konversation:4 crypt? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/konversation/1.6.2/src/konversation-1.6.2.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f04d021659a8628c13d6ebe3ea68d556
diff --git a/metadata/md5-cache/net-irc/konversation-1.7.2 b/metadata/md5-cache/net-irc/konversation-1.7.2
index 39ae9e4f70d5..aff21881cce2 100644
--- a/metadata/md5-cache/net-irc/konversation-1.7.2
+++ b/metadata/md5-cache/net-irc/konversation-1.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kbookmarks-5.29.0:5 >=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kemoticons-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kidletime-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] sys-devel/gettext crypt? ( app-crypt/qca:2[qt5] ) !net-irc/konversation:4 crypt? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/konversation/1.7.2/src/konversation-1.7.2.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d1433d5b5238dc0e3444b648b78a385b
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325
index 116a4e7cb34d..6f7b35fb5c21 100644
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325
@@ -10,5 +10,5 @@ RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) fi
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-rbot/rbot/archive/e358601cc521d8aced941eb928fae2d8c53cf0c2.tar.gz -> rbot-0.9.15_p20160325.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3cbd3fa3be17a3e8cd7ae94873cefdbf
diff --git a/metadata/md5-cache/net-libs/kimap2-0.1.1 b/metadata/md5-cache/net-libs/kimap2-0.1.1
index 0c73ada2af79..49586e9fc99f 100644
--- a/metadata/md5-cache/net-libs/kimap2-0.1.1
+++ b/metadata/md5-cache/net-libs/kimap2-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kimap2/0.1.1/src/kimap2-0.1.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c78eca5def300bf3b0625ca8a1ae7e29
diff --git a/metadata/md5-cache/net-libs/libktorrent-2.0.1 b/metadata/md5-cache/net-libs/libktorrent-2.0.1
index fc791588036a..3e640fc0d367 100644
--- a/metadata/md5-cache/net-libs/libktorrent-2.0.1
+++ b/metadata/md5-cache/net-libs/libktorrent-2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 app-crypt/qca:2[qt5] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= !net-libs/libktorrent:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.0/libktorrent-2.0.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=6246e2d41bec21d75ef6fe0707497996
diff --git a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0_pre20170128 b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0_pre20170128
index 51f87b16acf5..b8ff4b85c25b 100644
--- a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0_pre20170128
+++ b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0_pre20170128
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5
 RESTRICT=test
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/libkvkontakte-5.0.0_pre20170128.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f4ae54711bc93f1d8d42dbfe9ce136bb
diff --git a/metadata/md5-cache/net-libs/libmediawiki-5.0.0_pre20170128 b/metadata/md5-cache/net-libs/libmediawiki-5.0.0_pre20170128
index 8da279e3437e..fa7b91c29346 100644
--- a/metadata/md5-cache/net-libs/libmediawiki-5.0.0_pre20170128
+++ b/metadata/md5-cache/net-libs/libmediawiki-5.0.0_pre20170128
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=dev-qt/qtnetwork-5.6.1:5 !net-libs/libmediawiki:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/libmediawiki-5.0.0_pre20170128.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=044a0d98e93f3b9548e4c3dbcece657b
diff --git a/metadata/md5-cache/net-libs/libupnp-1.6.22 b/metadata/md5-cache/net-libs/libupnp-1.6.22
new file mode 100644
index 000000000000..81945b933dcd
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libupnp-1.6.22
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-portage/elt-patches-20170317 !<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=An Portable Open Source UPnP Development Kit
+EAPI=6
+HOMEPAGE=http://pupnp.sourceforge.net/
+IUSE=debug doc ipv6 static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://sourceforge/pupnp/libupnp-1.6.22.tar.bz2
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=c5f46e88a8727becc16a351079e94a69
diff --git a/metadata/md5-cache/net-libs/opal-3.10.11-r1 b/metadata/md5-cache/net-libs/opal-3.10.11-r1
new file mode 100644
index 000000000000..ce950af8314a
--- /dev/null
+++ b/metadata/md5-cache/net-libs/opal-3.10.11-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=>=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[http,xml,vxml] ) java? ( >=virtual/jre-1.4:* ) plugins? ( media-sound/gsm celt? ( media-libs/celt:0 ) ffmpeg? ( libav? ( media-video/libav:0=[encode] ) !libav? ( media-video/ffmpeg:0=[encode] ) ) ilbc? ( dev-libs/ilbc-rfc3951 ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( virtual/ffmpeg media-libs/x264 ) ) srtp? ( net-libs/libsrtp:0= ) vxml? ( net-libs/ptlib[http,vxml] ) virtual/pkgconfig java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=C++ class library normalising numerous telephony protocols
+EAPI=6
+HOMEPAGE=http://www.opalvoip.org/
+IUSE=celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc ipv6 ivr java ldap libav lid +plugins sbc +sip +sipim +sound srtp ssl static-libs stats swig theora +video vpb vxml +wav x264 x264-static +xml elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MPL-1.0
+RDEPEND=>=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[http,xml,vxml] ) java? ( >=virtual/jre-1.4:* ) plugins? ( media-sound/gsm celt? ( media-libs/celt:0 ) ffmpeg? ( libav? ( media-video/libav:0=[encode] ) !libav? ( media-video/ffmpeg:0=[encode] ) ) ilbc? ( dev-libs/ilbc-rfc3951 ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( virtual/ffmpeg media-libs/x264 ) ) srtp? ( net-libs/libsrtp:0= ) vxml? ( net-libs/ptlib[http,vxml] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=x264-static? ( x264 ) h281? ( h224 ) sip? ( sipim )
+SLOT=0
+SRC_URI=mirror://sourceforge/opalvoip/opal-3.10.11.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.10.11-htmldoc.tar.bz2 )
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a739adcea68952c4012580ea412e1aa3
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 e08bab3906fc..3bab737beb4b 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
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.6.1:5 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5] sys-apps/dbus >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1: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	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ad8d7532b9971f92a29493b2590ddba6
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.16.2 b/metadata/md5-cache/net-libs/webkit-gtk-2.16.2
index 3fbf92044f01..703c709051e0 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.16.2
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.16.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 dev-libs/hyphen >=dev-libs/icu-3.8.1-r1:= >=dev-libs/libxml2-2.8:2 >=dev-libs/libxslt-1.1.7 >=media-libs/fontconfig-2.8:1.0 >=media-libs/freetype-2.4.2:2 >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= dev-libs/libgcrypt:0= >=net-libs/libsoup-2.42:2.4[introspection?] >=x11-libs/cairo-1.10.2:= >=x11-libs/gtk+-3.14:3[introspection?] >=x11-libs/pango-1.30.0 virtual/jpeg:0= aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) egl? ( media-libs/mesa[egl] ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) gles2? ( media-libs/mesa[gles2] ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) libnotify? ( x11-libs/libnotify ) nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) spell? ( >=app-text/enchant-0.22:= ) wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) X? ( x11-libs/cairo[X] >=x11-libs/gtk+-3.14:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender x11-libs/libXt ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems >=dev-lang/perl-5.10 >=app-accessibility/at-spi2-core-2.5.3 >=dev-libs/atk-2.8.0 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig dev-lang/perl virtual/perl-Data-Dumper virtual/perl-Carp doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) dev-util/ninja >=dev-util/cmake-3.7.2 >=app-portage/elt-patches-20170317 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=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 dev-libs/hyphen >=dev-libs/icu-3.8.1-r1:= >=dev-libs/libxml2-2.8:2 >=dev-libs/libxslt-1.1.7 >=media-libs/fontconfig-2.8:1.0 >=media-libs/freetype-2.4.2:2 >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= dev-libs/libgcrypt:0= >=net-libs/libsoup-2.42:2.4[introspection?] >=x11-libs/cairo-1.10.2:= >=x11-libs/gtk+-3.14:3[introspection?] >=x11-libs/pango-1.30.0 virtual/jpeg:0= aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) egl? ( media-libs/mesa[egl] ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) gles2? ( media-libs/mesa[gles2] ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) libnotify? ( x11-libs/libnotify ) nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) spell? ( >=app-text/enchant-0.22:= ) wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) X? ( x11-libs/cairo[X] >=x11-libs/gtk+-3.14:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender x11-libs/libXt ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems >=dev-lang/perl-5.10 >=app-accessibility/at-spi2-core-2.5.3 >=dev-libs/atk-2.8.0 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig dev-lang/perl virtual/perl-Data-Dumper virtual/perl-Carp doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) dev-util/ninja >=dev-util/cmake-3.7.2 >=app-portage/elt-patches-20170317 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=Open source web browser engine
 EAPI=6
 HOMEPAGE=http://www.webkitgtk.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl ) introspection? ( gstr
 RESTRICT=test
 SLOT=4/37
 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.16.2.tar.xz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=14a3683346f396db503f577343d22677
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.16.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.16.3
index c91465d4bb3f..6321e08b6e4e 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.16.3
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.16.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 dev-libs/hyphen >=dev-libs/icu-3.8.1-r1:= >=dev-libs/libxml2-2.8:2 >=dev-libs/libxslt-1.1.7 >=media-libs/fontconfig-2.8:1.0 >=media-libs/freetype-2.4.2:2 >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= dev-libs/libgcrypt:0= >=net-libs/libsoup-2.42:2.4[introspection?] >=x11-libs/cairo-1.10.2:= >=x11-libs/gtk+-3.14:3[introspection?] >=x11-libs/pango-1.30.0 virtual/jpeg:0= aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) egl? ( media-libs/mesa[egl] ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) gles2? ( media-libs/mesa[gles2] ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) libnotify? ( x11-libs/libnotify ) nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) spell? ( >=app-text/enchant-0.22:= ) wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) X? ( x11-libs/cairo[X] >=x11-libs/gtk+-3.14:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender x11-libs/libXt ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems >=dev-lang/perl-5.10 >=app-accessibility/at-spi2-core-2.5.3 >=dev-libs/atk-2.8.0 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig dev-lang/perl virtual/perl-Data-Dumper virtual/perl-Carp doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) dev-util/ninja >=dev-util/cmake-3.7.2 >=app-portage/elt-patches-20170317 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=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 dev-libs/hyphen >=dev-libs/icu-3.8.1-r1:= >=dev-libs/libxml2-2.8:2 >=dev-libs/libxslt-1.1.7 >=media-libs/fontconfig-2.8:1.0 >=media-libs/freetype-2.4.2:2 >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= dev-libs/libgcrypt:0= >=net-libs/libsoup-2.42:2.4[introspection?] >=x11-libs/cairo-1.10.2:= >=x11-libs/gtk+-3.14:3[introspection?] >=x11-libs/pango-1.30.0 virtual/jpeg:0= aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) egl? ( media-libs/mesa[egl] ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) gles2? ( media-libs/mesa[gles2] ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) libnotify? ( x11-libs/libnotify ) nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) spell? ( >=app-text/enchant-0.22:= ) wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) X? ( x11-libs/cairo[X] >=x11-libs/gtk+-3.14:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender x11-libs/libXt ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems >=dev-lang/perl-5.10 >=app-accessibility/at-spi2-core-2.5.3 >=dev-libs/atk-2.8.0 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig dev-lang/perl virtual/perl-Data-Dumper virtual/perl-Carp doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) dev-util/ninja >=dev-util/cmake-3.7.2 >=app-portage/elt-patches-20170317 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=Open source web browser engine
 EAPI=6
 HOMEPAGE=http://www.webkitgtk.org/
 IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2+ BSD
 RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 dev-libs/hyphen >=dev-libs/icu-3.8.1-r1:= >=dev-libs/libxml2-2.8:2 >=dev-libs/libxslt-1.1.7 >=media-libs/fontconfig-2.8:1.0 >=media-libs/freetype-2.4.2:2 >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= dev-libs/libgcrypt:0= >=net-libs/libsoup-2.42:2.4[introspection?] >=x11-libs/cairo-1.10.2:= >=x11-libs/gtk+-3.14:3[introspection?] >=x11-libs/pango-1.30.0 virtual/jpeg:0= aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) egl? ( media-libs/mesa[egl] ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) gles2? ( media-libs/mesa[gles2] ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) libnotify? ( x11-libs/libnotify ) nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) spell? ( >=app-text/enchant-0.22:= ) wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) X? ( x11-libs/cairo[X] >=x11-libs/gtk+-3.14:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender x11-libs/libXt )
 REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl ) introspection? ( gstreamer ) nsplugin? ( X ) webgl? ( ^^ ( gles2 opengl ) ) !webgl? ( ?? ( gles2 opengl ) ) webgl? ( gstreamer ) wayland? ( egl ) || ( aqua wayland X )
 RESTRICT=test
 SLOT=4/37
 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.16.3.tar.xz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=558d90a29010f20681c856bfa14455ab
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=74b552c4741fd70504c73dd3455adda5
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.4.11-r1 b/metadata/md5-cache/net-libs/webkit-gtk-2.4.11-r1
index ebcf1ee23f4d..fbe7866a92d0 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.4.11-r1
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.4.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=dev-libs/icu-3.8.1-r1:= >=dev-libs/libxml2-2.6:2 >=dev-libs/libxslt-1.1.7 >=media-libs/fontconfig-2.5:1.0 >=media-libs/freetype-2.4.2:2 >=media-libs/harfbuzz-0.9.7:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= >=net-libs/libsoup-2.42:2.4[introspection?] virtual/jpeg:0= >=x11-libs/cairo-1.10:=[X?] >=x11-libs/gtk+-3.20.0:3[X?,aqua?,introspection?] >=x11-libs/pango-1.30.0 >=x11-libs/gtk+-2.24.10:2 egl? ( media-libs/mesa[egl] ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) gles2? ( media-libs/mesa[gles2] ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gstreamer-1.2:1.0 >=media-libs/gst-plugins-base-1.2:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) opengl? ( virtual/opengl ) spell? ( >=app-text/enchant-0.22:= ) wayland? ( >=x11-libs/gtk+-3.10:3[wayland] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) X? ( x11-libs/libX11 x11-libs/libXrender x11-libs/libXt ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) virtual/rubygems >=dev-lang/perl-5.10 >=app-accessibility/at-spi2-core-2.5.3 >=dev-libs/atk-2.8.0 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 >=sys-devel/flex-2.5.34 || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) sys-devel/gettext >=sys-devel/make-3.82-r4 virtual/pkgconfig geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) >=app-portage/elt-patches-20170317 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=dev-libs/icu-3.8.1-r1:= >=dev-libs/libxml2-2.6:2 >=dev-libs/libxslt-1.1.7 >=media-libs/fontconfig-2.5:1.0 >=media-libs/freetype-2.4.2:2 >=media-libs/harfbuzz-0.9.7:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= >=net-libs/libsoup-2.42:2.4[introspection?] virtual/jpeg:0= >=x11-libs/cairo-1.10:=[X?] >=x11-libs/gtk+-3.20.0:3[X?,aqua?,introspection?] >=x11-libs/pango-1.30.0 >=x11-libs/gtk+-2.24.10:2 egl? ( media-libs/mesa[egl] ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) gles2? ( media-libs/mesa[gles2] ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gstreamer-1.2:1.0 >=media-libs/gst-plugins-base-1.2:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) opengl? ( virtual/opengl ) spell? ( >=app-text/enchant-0.22:= ) wayland? ( >=x11-libs/gtk+-3.10:3[wayland] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) X? ( x11-libs/libX11 x11-libs/libXrender x11-libs/libXt ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.3 ) virtual/rubygems >=dev-lang/perl-5.10 >=app-accessibility/at-spi2-core-2.5.3 >=dev-libs/atk-2.8.0 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 >=sys-devel/flex-2.5.34 || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) sys-devel/gettext >=sys-devel/make-3.82-r4 virtual/pkgconfig geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) >=app-portage/elt-patches-20170317 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open source web browser engine
 EAPI=6
 HOMEPAGE=http://www.webkitgtk.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=dev-libs/icu-3.8.1-r1:= >=dev-
 REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl ) introspection? ( gstreamer ) webgl? ( ^^ ( gles2 opengl ) ) !webgl? ( ?? ( gles2 opengl ) ) || ( aqua wayland X )
 SLOT=3/25
 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=68dda88677b152eb248b802e25282feb
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.4.11-r200 b/metadata/md5-cache/net-libs/webkit-gtk-2.4.11-r200
index 3cae56c6c37d..efe16a3f7d7d 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.4.11-r200
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.4.11-r200
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=dev-libs/icu-3.8.1-r1:= >=dev-libs/libxml2-2.6:2 >=dev-libs/libxslt-1.1.7 >=media-libs/fontconfig-2.5:1.0 >=media-libs/freetype-2.4.2:2 >=media-libs/harfbuzz-0.9.7:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= >=net-libs/libsoup-2.42:2.4[introspection?] virtual/jpeg:0= >=x11-libs/cairo-1.10:=[X] >=x11-libs/gtk+-2.24.10:2[aqua?,introspection?] x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.30.0 egl? ( media-libs/mesa[egl] ) geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) gles2? ( media-libs/mesa[gles2] ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gstreamer-1.2:1.0 >=media-libs/gst-plugins-base-1.2:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) opengl? ( virtual/opengl ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) virtual/rubygems >=dev-lang/perl-5.10 >=dev-libs/atk-2.8.0 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 >=sys-devel/flex-2.5.34 || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) sys-devel/gettext >=sys-devel/make-3.82-r4 virtual/pkgconfig geoloc? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) >=app-portage/elt-patches-20170317 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=dev-libs/icu-3.8.1-r1:= >=dev-libs/libxml2-2.6:2 >=dev-libs/libxslt-1.1.7 >=media-libs/fontconfig-2.5:1.0 >=media-libs/freetype-2.4.2:2 >=media-libs/harfbuzz-0.9.7:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= >=net-libs/libsoup-2.42:2.4[introspection?] virtual/jpeg:0= >=x11-libs/cairo-1.10:=[X] >=x11-libs/gtk+-2.24.10:2[aqua?,introspection?] x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.30.0 egl? ( media-libs/mesa[egl] ) geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) gles2? ( media-libs/mesa[gles2] ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gstreamer-1.2:1.0 >=media-libs/gst-plugins-base-1.2:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) opengl? ( virtual/opengl ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.3 ) virtual/rubygems >=dev-lang/perl-5.10 >=dev-libs/atk-2.8.0 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 >=sys-devel/flex-2.5.34 || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) sys-devel/gettext >=sys-devel/make-3.82-r4 virtual/pkgconfig geoloc? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) >=app-portage/elt-patches-20170317 !<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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open source web browser engine
 EAPI=6
 HOMEPAGE=http://www.webkitgtk.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=dev-libs/icu-3.8.1-r1:= >=dev-
 REQUIRED_USE=geoloc? ( introspection ) gles2? ( egl ) introspection? ( gstreamer ) webgl? ( ^^ ( gles2 opengl ) ) !webgl? ( ?? ( gles2 opengl ) ) || ( aqua X )
 SLOT=2
 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=738e5d63a99726ae342c2f4d8a10f595
diff --git a/metadata/md5-cache/net-mail/mailshears-0.0.3 b/metadata/md5-cache/net-mail/mailshears-0.0.3
index 839d5332697d..11c425cfe20a 100644
--- a/metadata/md5-cache/net-mail/mailshears-0.0.3
+++ b/metadata/md5-cache/net-mail/mailshears-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pg-0.17[ruby_targets_ruby21] <dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mailshears-0.0.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=67dd6ae6048671b9ec772598cc301e45
diff --git a/metadata/md5-cache/net-mail/notmuch-0.24.1 b/metadata/md5-cache/net-mail/notmuch-0.24.1
index 027ad94e854d..93417171c5f7 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.24.1
+++ b/metadata/md5-cache/net-mail/notmuch-0.24.1
@@ -11,4 +11,4 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_ta
 SLOT=0/4
 SRC_URI=http://notmuchmail.org/releases/notmuch-0.24.1.tar.gz test? ( http://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d1b0170ff59599bb084714f9da05c74e
+_md5_=040e28cfebede513a3697fe3f441ca6f
diff --git a/metadata/md5-cache/net-misc/gns3-converter-1.3.0 b/metadata/md5-cache/net-misc/gns3-converter-1.3.0
index d6e5c33cd072..f4bb6c5b43e0 100644
--- a/metadata/md5-cache/net-misc/gns3-converter-1.3.0
+++ b/metadata/md5-cache/net-misc/gns3-converter-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Designed to convert old ini-style GNS3 topologies
 EAPI=6
 HOMEPAGE=https://github.com/dlintott/gns3-converter
-IUSE=python_targets_python3_4
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=dev-python/configobj[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
+RDEPEND=dev-python/configobj[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-converter/archive/v1.3.0.tar.gz -> gns3-converter-1.3.0.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=766d14e7583dffa9f905d698eec02b03
+_md5_=b48bce126f41f779c339577214c0c558
diff --git a/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211 b/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
index b3e8183c1153..4cc164365d16 100644
--- a/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
+++ b/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kglobalaccel-5.29.0:5 >=kde-frameworks/kguiaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/plasma-5.29.0:5 >=kde-plasma/libksysguard-5.4.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[sqlite] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/libnl:3 sys-apps/net-tools wifi? ( net-wireless/wireless-tools ) !net-misc/knemo:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/knemo-0.8.0_pre20161211.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=d451d074a7508e7f7b64b7f374745bbf
diff --git a/metadata/md5-cache/net-misc/mikutter-3.4.2 b/metadata/md5-cache/net-misc/mikutter-3.4.2
index fda358a87d6f..392737e4cf16 100644
--- a/metadata/md5-cache/net-misc/mikutter-3.4.2
+++ b/metadata/md5-cache/net-misc/mikutter-3.4.2
@@ -10,5 +10,5 @@ RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://mikutter.hachune.net/bin/mikutter.3.4.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f93c39c4befa0c0662df8a798d1e77cc
diff --git a/metadata/md5-cache/net-misc/mikutter-3.5.4 b/metadata/md5-cache/net-misc/mikutter-3.5.4
index 113c06aea6d1..cdfc62539ef0 100644
--- a/metadata/md5-cache/net-misc/mikutter-3.5.4
+++ b/metadata/md5-cache/net-misc/mikutter-3.5.4
@@ -10,5 +10,5 @@ RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=http://mikutter.hachune.net/bin/mikutter.3.5.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9b89c4fb07bebc1d2e6c8693426a9521
diff --git a/metadata/md5-cache/net-misc/mikutter-9999 b/metadata/md5-cache/net-misc/mikutter-9999
index a263b3ee475d..c5d79dbb65b6 100644
--- a/metadata/md5-cache/net-misc/mikutter-9999
+++ b/metadata/md5-cache/net-misc/mikutter-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/delayer-deferred[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/json:0[ruby_targets_ruby21] dev-ruby/instance_storage[ruby_targets_ruby21] dev-ruby/memoist[ruby_targets_ruby21] >=dev-ruby/moneta-0.7[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby21] dev-ruby/pluggaloid[ruby_targets_ruby21] dev-ruby/rcairo[ruby_targets_ruby21] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby21] dev-ruby/ruby-hmac[ruby_targets_ruby21] dev-ruby/totoridipjp[ruby_targets_ruby21] dev-ruby/twitter-text[ruby_targets_ruby21] dev-ruby/typed-array[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/delayer-deferred[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] dev-ruby/instance_storage[ruby_targets_ruby22] dev-ruby/memoist[ruby_targets_ruby22] >=dev-ruby/moneta-0.7[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby22] dev-ruby/pluggaloid[ruby_targets_ruby22] dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby22] dev-ruby/ruby-hmac[ruby_targets_ruby22] dev-ruby/totoridipjp[ruby_targets_ruby22] dev-ruby/twitter-text[ruby_targets_ruby22] dev-ruby/typed-array[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-2	195a672bfaf52d868442171c9469bbb6	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-2	195a672bfaf52d868442171c9469bbb6	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f93c39c4befa0c0662df8a798d1e77cc
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.4.4-r1 b/metadata/md5-cache/net-misc/networkmanager-1.4.4-r1
index d8e025f7f85d..5bc015f81e35 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.4.4-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-1.4.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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/glib-2.37.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(-)?] >=dev-libs/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.40:2.4= net-misc/iputils sys-apps/util-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(-)?] sys-libs/readline:0= >=virtual/libgudev-165:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( dev-libs/jansson ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vala? ( || ( dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.5 dev-python/dbus-python[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/dbus-python[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbus-python[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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/glib-2.37.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(-)?] >=dev-libs/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.40:2.4= net-misc/iputils sys-apps/util-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(-)?] sys-libs/readline:0= >=virtual/libgudev-165:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( dev-libs/jansson ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vala? ( || ( dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.5 dev-python/dbus-python[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/dbus-python[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbus-python[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
 DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=audit bluetooth connection-sharing consolekit +dhclient gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux systemd teamd test vala +wext +wifi 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 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
-RDEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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/glib-2.37.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(-)?] >=dev-libs/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.40:2.4= net-misc/iputils sys-apps/util-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(-)?] sys-libs/readline:0= >=virtual/libgudev-165:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( dev-libs/jansson ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( >=net-misc/libteam-1.9 ) wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+RDEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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/glib-2.37.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(-)?] >=dev-libs/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.40:2.4= net-misc/iputils sys-apps/util-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(-)?] sys-libs/readline:0= >=virtual/libgudev-165:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( dev-libs/jansson ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( >=net-misc/libteam-1.9 ) wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.4/NetworkManager-1.4.4.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	vala	f86cd45e9ae738c40c92f990266f39a7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7378b90e1769ef1f925c2d5668fd6afd
+_md5_=b4df324d161f692ee2f81db613ffc455
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.8.0 b/metadata/md5-cache/net-misc/networkmanager-1.8.0
index a84dcab616b9..62a7206ad4d9 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.8.0
+++ b/metadata/md5-cache/net-misc/networkmanager-1.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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/glib-2.37.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(-)?] >=dev-libs/libnl-3.2.8: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-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.40:2.4= net-misc/iputils sys-apps/util-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(-)?] sys-libs/readline:0= >=virtual/libgudev-165:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( dev-libs/jansson ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( || ( ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/dbus-python[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/dbus-python[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbus-python[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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/glib-2.37.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(-)?] >=dev-libs/libnl-3.2.8: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp net-misc/curl net-misc/iputils sys-apps/util-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(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( sys-auth/elogind ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( dev-libs/jansson ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( || ( ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/dbus-python[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/dbus-python[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbus-python[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
 DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing consolekit +dhclient gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux systemd teamd test vala +wext +wifi 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
+IUSE=audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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/glib-2.37.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(-)?] >=dev-libs/libnl-3.2.8: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-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.40:2.4= net-misc/iputils sys-apps/util-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(-)?] sys-libs/readline:0= >=virtual/libgudev-165:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( dev-libs/jansson ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( >=net-misc/libteam-1.9 ) wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls )
+RDEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,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/glib-2.37.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(-)?] >=dev-libs/libnl-3.2.8: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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp net-misc/curl net-misc/iputils sys-apps/util-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(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( sys-auth/elogind ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( dev-libs/jansson ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.8/NetworkManager-1.8.0.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	vala	f86cd45e9ae738c40c92f990266f39a7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=cadf0d015b4fc2cfcf32d29c0b9f4fab
+_md5_=8d02ed10442388d4c31d8dcc2090a7d1
diff --git a/metadata/md5-cache/net-misc/networkmanager-libreswan-1.2.6 b/metadata/md5-cache/net-misc/networkmanager-libreswan-1.2.6
new file mode 100644
index 000000000000..0089472796ee
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-libreswan-1.2.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3 >=net-misc/networkmanager-1.2.0:= net-vpn/libreswan gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) !net-misc/networkmanager-openswan sys-devel/gettext dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=NetworkManager libreswan plugin
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/VPN
+IUSE=gtk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3 >=net-misc/networkmanager-1.2.0:= net-vpn/libreswan gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) !net-misc/networkmanager-openswan
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager-libreswan/1.2/NetworkManager-libreswan-1.2.6.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=bfabe52c13e6b79cc307a7f08da20ddb
diff --git a/metadata/md5-cache/net-misc/smb4k-2.0.0-r1 b/metadata/md5-cache/net-misc/smb4k-2.0.0-r1
index 82069b133eeb..a531928579a2 100644
--- a/metadata/md5-cache/net-misc/smb4k-2.0.0-r1
+++ b/metadata/md5-cache/net-misc/smb4k-2.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qttest-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !net-misc/smb4k:4 >=net-fs/samba-3.4.2[cups] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/smb4k/smb4k-2.0.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a2b6f0de325d5b0d5d57582cb071f902
diff --git a/metadata/md5-cache/net-p2p/ktorrent-5.0.1 b/metadata/md5-cache/net-p2p/ktorrent-5.0.1
index 7b92b1d8e3ad..fffb76fda3e8 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-5.0.1
+++ b/metadata/md5-cache/net-p2p/ktorrent-5.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcmutils-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/knotifyconfig-5.29.0:5 >=kde-frameworks/kparts-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=kde-frameworks/sonnet-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 <net-libs/libktorrent-2.1:5 >=net-libs/libktorrent-2.0.1:5 infowidget? ( dev-libs/geoip ) mediaplayer? ( media-libs/phonon[qt5] >=media-libs/taglib-1.5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.4.1:5 ) stats? ( >=kde-frameworks/kplotting-5.29.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.29.0:5 ) !net-p2p/ktorrent:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a8d31768a86159151fa62779e49c19ce
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.2 b/metadata/md5-cache/net-vpn/openvpn-2.4.2-r1
similarity index 95%
rename from metadata/md5-cache/net-vpn/openvpn-2.4.2
rename to metadata/md5-cache/net-vpn/openvpn-2.4.2-r1
index 8cf1b97b95f7..55dc3e4c7e06 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.2
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.2-r1
@@ -3,7 +3,7 @@ DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sy
 DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
 EAPI=6
 HOMEPAGE=http://openvpn.net/
-IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins polarssl selinux +ssl static systemd test userland_BSD
+IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl static systemd test userland_BSD
 KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:* ) libressl? ( dev-libs/libressl ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
@@ -11,4 +11,4 @@ REQUIRED_USE=static? ( !plugins !pkcs11 ) mbedtls? ( ssl !libressl ) pkcs11? ( s
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.4.2.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.2/tests/unit_tests/openvpn/mock_msg.h )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=42fabe976de44d714e788745511f7902
+_md5_=8078b3b1056e740c8d38f4214c146fa6
diff --git a/metadata/md5-cache/net-vpn/openvpn-9999 b/metadata/md5-cache/net-vpn/openvpn-9999
index 784b1eb6f4bf..f43f47772b48 100644
--- a/metadata/md5-cache/net-vpn/openvpn-9999
+++ b/metadata/md5-cache/net-vpn/openvpn-9999
@@ -3,10 +3,10 @@ DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sy
 DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
 EAPI=6
 HOMEPAGE=http://openvpn.net/
-IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins polarssl selinux +ssl static systemd test userland_BSD
+IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl static systemd test userland_BSD
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:* ) libressl? ( dev-libs/libressl ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
 REQUIRED_USE=static? ( !plugins !pkcs11 ) lzo? ( !lz4 ) pkcs11? ( ssl ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=374943e40674c2360bf2eac156242b3a
+_md5_=19d6e3215a4d885bac33b0ea9201f5df
diff --git a/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109 b/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
index 8d8fa29a5fef..6699d184fc27 100644
--- a/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
+++ b/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
@@ -10,5 +10,5 @@ RDEPEND=ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ) python? ( python_ta
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/lorcon-0.0_p20150109.tar.xz
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=816a2a1327c4a7d02ef3157cc0938cf0
diff --git a/metadata/md5-cache/net-wireless/lorcon-9999 b/metadata/md5-cache/net-wireless/lorcon-9999
index c4142e4ae3fb..93154c9c21f3 100644
--- a/metadata/md5-cache/net-wireless/lorcon-9999
+++ b/metadata/md5-cache/net-wireless/lorcon-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ) 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(-)] ) dev-libs/libnl:3= net-libs/libpcap
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=ada0f161927a7186d32c962216f0cf0c
diff --git a/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1 b/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1
index 9403bd488e3c..c9d2171c95a8 100644
--- a/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1
+++ b/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/libxml[ruby_targets_ruby21] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://www.bioruby.org/archive/bioruby-1.4.3.0001.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5c85b93179ee11b962ff0328399497f6
diff --git a/metadata/md5-cache/sci-biology/bioruby-9999 b/metadata/md5-cache/sci-biology/bioruby-9999
index bd7825f63a9b..ec22f8086e7a 100644
--- a/metadata/md5-cache/sci-biology/bioruby-9999
+++ b/metadata/md5-cache/sci-biology/bioruby-9999
@@ -8,5 +8,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby21? ( dev-ruby/libxml[ruby_targets_ruby21] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-2	195a672bfaf52d868442171c9469bbb6	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-2	195a672bfaf52d868442171c9469bbb6	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=62f85ead0efdc1239f23d00c9b8ec065
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.23.10 b/metadata/md5-cache/sci-electronics/klayout-0.23.10
index 0eb5b4172d45..348735563d90 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.23.10
+++ b/metadata/md5-cache/sci-electronics/klayout-0.23.10
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/designer:4 dev-qt/qtgui:4[qt3support] ruby_targets_ruby21? ( dev-
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://178.77.72.242/downloads/klayout-0.23.10.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=97a42248d7a260b1478f2e670b534d66
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.24.9 b/metadata/md5-cache/sci-electronics/klayout-0.24.9
index bb285d234a81..772f2d68c945 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.24.9
+++ b/metadata/md5-cache/sci-electronics/klayout-0.24.9
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/designer:4 dev-qt/qtgui:4[qt3support] sys-libs/zlib ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://www.klayout.org/downloads/source/klayout-0.24.9.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=682ce74adecc68b0b8ec88e7804b3e63
diff --git a/metadata/md5-cache/sci-geosciences/seawater-3.3.2 b/metadata/md5-cache/sci-geosciences/seawater-3.3.2
deleted file mode 100644
index 7b4ed571c786..000000000000
--- a/metadata/md5-cache/sci-geosciences/seawater-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/oct2py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/seawater/
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/s/seawater/seawater-3.3.2.tar.gz
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9cae93d70bc6838828769aef49de39bb
diff --git a/metadata/md5-cache/sci-geosciences/seawater-3.3.3 b/metadata/md5-cache/sci-geosciences/seawater-3.3.3
deleted file mode 100644
index 062b59b067c4..000000000000
--- a/metadata/md5-cache/sci-geosciences/seawater-3.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/oct2py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/seawater/
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/s/seawater/seawater-3.3.3.tar.gz
-_eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7bd4344d5140249270a2f3b00b2c9e1a
diff --git a/metadata/md5-cache/sci-geosciences/seawater-3.3.4 b/metadata/md5-cache/sci-geosciences/seawater-3.3.4
index 21f45da43c05..a048bd5a4994 100644
--- a/metadata/md5-cache/sci-geosciences/seawater-3.3.4
+++ b/metadata/md5-cache/sci-geosciences/seawater-3.3.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/oct2py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/oct2py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/seawater/
-IUSE=test python_targets_python2_7 python_targets_python3_4
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/seawater/seawater-3.3.4.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7bd4344d5140249270a2f3b00b2c9e1a
+_md5_=7361a6f325f34a6b441615016127da1a
diff --git a/metadata/md5-cache/sci-libs/libsc-1.0 b/metadata/md5-cache/sci-libs/libsc-1.0-r1
similarity index 96%
rename from metadata/md5-cache/sci-libs/libsc-1.0
rename to metadata/md5-cache/sci-libs/libsc-1.0-r1
index 260ea8bb1291..da76f86b00f4 100644
--- a/metadata/md5-cache/sci-libs/libsc-1.0
+++ b/metadata/md5-cache/sci-libs/libsc-1.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=romio? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/cburstedde/libsc/archive/v1.0.tar.gz -> libsc-1.0.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=6fc55cc256d234dcd8776aa6969366d1
+_md5_=3fcbb0cd1c5dff5b6a10bab6a9d2237f
diff --git a/metadata/md5-cache/sci-libs/libsc-1.1 b/metadata/md5-cache/sci-libs/libsc-1.1-r1
similarity index 96%
rename from metadata/md5-cache/sci-libs/libsc-1.1
rename to metadata/md5-cache/sci-libs/libsc-1.1-r1
index 312a04c924d0..2d5ea3688a04 100644
--- a/metadata/md5-cache/sci-libs/libsc-1.1
+++ b/metadata/md5-cache/sci-libs/libsc-1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=romio? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/cburstedde/libsc/archive/v1.1.tar.gz -> libsc-1.1.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=b69e4a1f071b905c3886de730138a618
+_md5_=edc1aa1be01304f1f0f353c7d2a14ec6
diff --git a/metadata/md5-cache/sci-libs/libsc-9999 b/metadata/md5-cache/sci-libs/libsc-9999
index 38d44421b2d2..ab27ae2cfeac 100644
--- a/metadata/md5-cache/sci-libs/libsc-9999
+++ b/metadata/md5-cache/sci-libs/libsc-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/lua:* sys-apps/util-linux virtual/blas virtual/lapack mpi? ( vi
 REQUIRED_USE=romio? ( mpi )
 SLOT=0
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=bd7d3e69b81e9bfa0ac3e1aa480e2b37
+_md5_=7475b16ef0c100ebd9b6e9c7414de5c6
diff --git a/metadata/md5-cache/sci-physics/cernlib-2006-r6 b/metadata/md5-cache/sci-physics/cernlib-2006-r6
index 2b285aaf443c..351fb373dc67 100644
--- a/metadata/md5-cache/sci-physics/cernlib-2006-r6
+++ b/metadata/md5-cache/sci-physics/cernlib-2006-r6
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/motif:0 virtual/lapack dev-lang/cfortran virtual/fortran
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/cernlib/cernlib_20061220+dfsg3.orig.tar.gz mirror://debian/pool/main/c/cernlib/cernlib_20061220+dfsg3-4.1.debian.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=5e5ee47e9a4ac7e2b7f087669837f97a
+_md5_=977355301ed35ff822315e1ef30ba489
diff --git a/metadata/md5-cache/sci-visualization/labplot-2.4.0 b/metadata/md5-cache/sci-visualization/labplot-2.4.0
index c1b73addf723..21e0fa4ca324 100644
--- a/metadata/md5-cache/sci-visualization/labplot-2.4.0
+++ b/metadata/md5-cache/sci-visualization/labplot-2.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-14.12.0:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) netcdf? ( sci-libs/netcdf:= ) !sci-visualization/labplot:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/labplot/2.4.0/labplot-2.4.0-kf5.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=47c01a51a03a09bb1a95c1ca3364fc5f
diff --git a/metadata/md5-cache/sci-visualization/labplot-9999 b/metadata/md5-cache/sci-visualization/labplot-9999
index 1a2a1dcade24..5baeb9fa7fb9 100644
--- a/metadata/md5-cache/sci-visualization/labplot-9999
+++ b/metadata/md5-cache/sci-visualization/labplot-9999
@@ -7,5 +7,5 @@ IUSE=cantor fftw fits hdf5 netcdf debug +handbook
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.29.0:5 >=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/knewstuff-5.29.0:5 >=kde-frameworks/ktextwidgets-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-5.9999:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) netcdf? ( sci-libs/netcdf:= ) !sci-visualization/labplot:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=dce661ac899ae534407324f9cff75034
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.4 b/metadata/md5-cache/sys-apps/etckeeper-1.18.4
deleted file mode 100644
index 34cdb485a026..000000000000
--- a/metadata/md5-cache/sys-apps/etckeeper-1.18.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=bazaar? ( dev-vcs/bzr )
-DESCRIPTION=A collection of tools to let /etc be stored in a repository
-EAPI=5
-HOMEPAGE=https://etckeeper.branchable.com/
-IUSE=bazaar cron python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=bazaar? ( dev-vcs/bzr ) app-portage/portage-utils cron? ( virtual/cron ) bazaar? ( 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(-)] ) !bazaar? ( || ( dev-vcs/git dev-vcs/mercurial dev-vcs/darcs ) )
-REQUIRED_USE=bazaar? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://github.com/joeyh/etckeeper/archive/1.18.4.tar.gz -> etckeeper-1.18.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=c9763d1ecfd6028161beeacb1ae002f4
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.5 b/metadata/md5-cache/sys-apps/etckeeper-1.18.5
deleted file mode 100644
index 7d075d8c4f53..000000000000
--- a/metadata/md5-cache/sys-apps/etckeeper-1.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=bazaar? ( dev-vcs/bzr )
-DESCRIPTION=A collection of tools to let /etc be stored in a repository
-EAPI=5
-HOMEPAGE=https://etckeeper.branchable.com/
-IUSE=bazaar cron python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=bazaar? ( dev-vcs/bzr ) app-portage/portage-utils cron? ( virtual/cron ) bazaar? ( 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(-)] ) !bazaar? ( || ( dev-vcs/git dev-vcs/mercurial dev-vcs/darcs ) )
-REQUIRED_USE=bazaar? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://github.com/joeyh/etckeeper/archive/1.18.5.tar.gz -> etckeeper-1.18.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=c9763d1ecfd6028161beeacb1ae002f4
diff --git a/metadata/md5-cache/sys-apps/file-5.30 b/metadata/md5-cache/sys-apps/file-5.30
index e6591a58a2f1..3da04336d6d6 100644
--- a/metadata/md5-cache/sys-apps/file-5.30
+++ b/metadata/md5-cache/sys-apps/file-5.30
@@ -4,11 +4,11 @@ DESCRIPTION=identify a file's format by scanning binary data for patterns
 EAPI=5
 HOMEPAGE=http://www.darwinsys.com/file/ http://mx.gw.com/pipermail/file/
 IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_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
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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(-)?] ) python? ( !dev-python/python-magic )
 REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.30.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.30.tar.gz
 _eclasses_=distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f60f4cc6a1367034dd8ceb50e092268b
+_md5_=a8ab645d62324d8476821eac08736cc6
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.21 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.21
new file mode 100644
index 000000000000..60f49d186ca9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-auth/polkit-0.111 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=PC/SC Architecture smartcard middleware library
+EAPI=6
+HOMEPAGE=http://pcsclite.alioth.debian.org/
+IUSE=python libusb policykit selinux +udev python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_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
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD ISC MIT GPL-3+ GPL-2
+RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-auth/polkit-0.111 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) !<app-crypt/ccid-1.4.1-r1 !<sys-apps/baselayout-2 !<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-pcscd )
+REQUIRED_USE=^^ ( udev libusb ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
+SLOT=0
+SRC_URI=http://alioth.debian.org/download.php/file/4216/pcsc-lite-1.8.21.tar.bz2
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=4c9487bb0907754b49e4a4725479d2fb
diff --git a/metadata/md5-cache/sys-auth/elogind-229.3 b/metadata/md5-cache/sys-auth/elogind-229.3
index 09e6ca11217b..308d3a830ac0 100644
--- a/metadata/md5-cache/sys-auth/elogind-229.3
+++ b/metadata/md5-cache/sys-auth/elogind-229.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-util/gperf dev-util/intltool sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170317 !<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/pkgconfig
+DEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-util/gperf dev-util/intltool sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170317 !<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/pkgconfig
 DESCRIPTION=The systemd project's logind, extracted to a standalone package
 EAPI=6
 HOMEPAGE=https://github.com/elogind/elogind
 IUSE=acl debug pam policykit selinux
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=CC0-1.0 LGPL-2.1+ public-domain
-PDEPEND=policykit? ( sys-auth/polkit )
-RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) sys-apps/dbus !sys-apps/systemd
+PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
+RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v229.3.tar.gz -> elogind-229.3.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b3b47fcba736bd3e89a6598d58c9ef9b
+_md5_=bce6b9be8048a1ea328ac1a5f6c39618
diff --git a/metadata/md5-cache/sys-auth/ykpers-1.18.0 b/metadata/md5-cache/sys-auth/ykpers-1.18.0
index 39c0ea8af5ed..79c65fcce248 100644
--- a/metadata/md5-cache/sys-auth/ykpers-1.18.0
+++ b/metadata/md5-cache/sys-auth/ykpers-1.18.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=>=sys-auth/libyubikey-1.6 virtual/libusb:1 consolekit? ( sys-auth/consolekit[acl] )
 SLOT=0
-SRC_URI=https://github.com/Yubico/yubikey-personalization/archive/v1.18.0.tar.gz
+SRC_URI=https://github.com/Yubico/yubikey-personalization/archive/v1.18.0.tar.gz -> ykpers-1.18.0.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=822d41db0961d53425e404ac20ffeead
+_md5_=eaee86efd13704e443be8fc23c81879c
diff --git a/metadata/md5-cache/sys-block/kvpm-0.9.10 b/metadata/md5-cache/sys-block/kvpm-0.9.10
index 7fc678b9691e..2d29c8cacc65 100644
--- a/metadata/md5-cache/sys-block/kvpm-0.9.10
+++ b/metadata/md5-cache/sys-block/kvpm-0.9.10
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-apps/util-linux >=sys-block/parted-2.3 >=sys-fs/lvm2-2.02.120 !sys-block/kvpm:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kvpm/kvpm-0.9.10.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=2f189daf0432c2a30c10016436607262
diff --git a/metadata/md5-cache/sys-block/partitionmanager-3.0.1 b/metadata/md5-cache/sys-block/partitionmanager-3.0.1
index 965bedb18bb6..1678a51af966 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-3.0.1
+++ b/metadata/md5-cache/sys-block/partitionmanager-3.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kjobwidgets-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-apps/util-linux >=sys-libs/kpmcore-3.0.2:5= >=kde-plasma/kde-cli-tools-5.4.1:5[kdesu] !sys-block/partitionmanager:0 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/partitionmanager/3.0.1/src/partitionmanager-3.0.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=3b23e3627a9c91da106016f8d3a16c0b
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.6.4 b/metadata/md5-cache/sys-cluster/kubectl-1.6.4
new file mode 100644
index 000000000000..14bbceae9a75
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.6.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.7:=
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.6.4.tar.gz -> kubernetes-1.6.4.tar.gz
+_eclasses_=golang-base	2983c8674b8e3b3a99ec61986356c76a	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	7fb5d554a7e656be19ec465fa5bb66db	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=e16f7b5513140548e571136aec401cd4
diff --git a/metadata/md5-cache/sys-firmware/amdgpu-ucode-20161121 b/metadata/md5-cache/sys-firmware/amdgpu-ucode-20161121
deleted file mode 100644
index 7f93a090e711..000000000000
--- a/metadata/md5-cache/sys-firmware/amdgpu-ucode-20161121
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DESCRIPTION=Microcode for C.Islands/V.Islands/A.Islands Radeon GPUs and APUs
-EAPI=5
-HOMEPAGE=https://people.freedesktop.org/~agd5f/radeon_ucode/
-IUSE=legacy
-KEYWORDS=amd64 x86
-LICENSE=radeon-ucode
-RDEPEND=legacy? ( !sys-firmware/radeon-ucode ) !>sys-kernel/linux-firmware-20150812[-savedconfig]
-SLOT=0
-SRC_URI=mirror://gentoo/linux-firmware-20170113.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c65dbbd09bece2f4f82ffe85de61e782
diff --git a/metadata/md5-cache/sys-firmware/radeon-ucode-20161005 b/metadata/md5-cache/sys-firmware/radeon-ucode-20161005
deleted file mode 100644
index f580a5ea1fba..000000000000
--- a/metadata/md5-cache/sys-firmware/radeon-ucode-20161005
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DESCRIPTION=IRQ microcode for r6xx/r7xx/Evergreen/N.Islands/S.Islands Radeon GPUs and APUs
-EAPI=5
-HOMEPAGE=https://people.freedesktop.org/~agd5f/radeon_ucode/
-KEYWORDS=amd64 x86
-LICENSE=radeon-ucode
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=0
-SRC_URI=mirror://gentoo/linux-firmware-20170113.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d064094d70474ba193120b8813103a89
diff --git a/metadata/md5-cache/sys-fs/cryfs-0.9.7 b/metadata/md5-cache/sys-fs/cryfs-0.9.7
index 3a3d72cae15d..fab0ddb42546 100644
--- a/metadata/md5-cache/sys-fs/cryfs-0.9.7
+++ b/metadata/md5-cache/sys-fs/cryfs-0.9.7
@@ -4,10 +4,10 @@ DESCRIPTION=Encrypted FUSE filesystem that conceals metadata
 EAPI=6
 HOMEPAGE=https://www.cryfs.org/
 IUSE=test update-check
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3 BSD-2 MIT
 RDEPEND=>=dev-libs/boost-1.56:= >=dev-libs/crypto++-5.6.3:= net-misc/curl:= >=sys-fs/fuse-2.8.6:= dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://github.com/cryfs/cryfs/releases/download/0.9.7/cryfs-0.9.7.tar.xz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6e0e537edf08e5c62dec0087c760f620
+_md5_=f0eac5c459c9823612a147424968249d
diff --git a/metadata/md5-cache/sys-fs/cryfs-9999 b/metadata/md5-cache/sys-fs/cryfs-9999
index 04618e7bc2d1..6a74d1530ade 100644
--- a/metadata/md5-cache/sys-fs/cryfs-9999
+++ b/metadata/md5-cache/sys-fs/cryfs-9999
@@ -8,4 +8,4 @@ LICENSE=LGPL-3 BSD-2 MIT
 RDEPEND=>=dev-libs/boost-1.56:= >=dev-libs/crypto++-5.6.3:= net-misc/curl:= >=sys-fs/fuse-2.8.6:= dev-libs/openssl:0=
 SLOT=0
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6e0e537edf08e5c62dec0087c760f620
+_md5_=f0eac5c459c9823612a147424968249d
diff --git a/metadata/md5-cache/sys-libs/kpmcore-3.0.3 b/metadata/md5-cache/sys-libs/kpmcore-3.0.3
index 1a166146d00b..78dc154aa5d9 100644
--- a/metadata/md5-cache/sys-libs/kpmcore-3.0.3
+++ b/metadata/md5-cache/sys-libs/kpmcore-3.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libatasmart sys-apps/util-linux >=sys-block/parted-3.2 !<sys-block/partitionmanager-2.0.0 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kpmcore/3.0.3/src/kpmcore-3.0.3.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=adc1ffcd2d7a62631c4db230b3a57011
diff --git a/metadata/md5-cache/sys-libs/ldb-1.1.29-r1 b/metadata/md5-cache/sys-libs/ldb-1.1.29-r1
index 79994e7e4a2c..dd26f992973f 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.1.29-r1
+++ b/metadata/md5-cache/sys-libs/ldb-1.1.29-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=http://ldb.samba.org
 IUSE=doc +ldap +python python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,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/popt[abi_x86_32(-)?,abi_x86_64(-)?,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/talloc-2.1.8[python?,abi_x86_32(-)?,abi_x86_64(-)?,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/tevent-0.9.31[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,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/tdb-1.3.12[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ldap? ( net-nds/openldap )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/1.1.29
 SRC_URI=http://www.samba.org/ftp/pub/ldb/ldb-1.1.29.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=f9b94c15f863a680981485a787970244
+_md5_=19689c133362805de8eba144e731512d
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.9 b/metadata/md5-cache/sys-libs/talloc-2.1.9
index 5798361523ec..93fb9e25ecc8 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.1.9
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.9
@@ -4,7 +4,7 @@ DESCRIPTION=Samba talloc library
 EAPI=6
 HOMEPAGE=http://talloc.samba.org/
 IUSE=compat +python python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris
 LICENSE=GPL-3 LGPL-3+ LGPL-2
 RDEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) !!<sys-libs/talloc-2.0.5
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-2.1.9.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=c2bd7e3a87fad72023fca49afb254ed6
+_md5_=d1b38a714f6af67f7d5b77403ef9f9e7
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.13 b/metadata/md5-cache/sys-libs/tdb-1.3.13
index 405eda9a0b35..a4da4513270e 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.3.13
+++ b/metadata/md5-cache/sys-libs/tdb-1.3.13
@@ -4,11 +4,11 @@ DESCRIPTION=A simple database API
 EAPI=6
 HOMEPAGE=http://tdb.samba.org/
 IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.3.13.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=5c3ac5a0bdc0a7ac4bf9319f0a4b4e6b
+_md5_=817658635e2385cc3fb533a12dc777bb
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.31-r1 b/metadata/md5-cache/sys-libs/tevent-0.9.31-r1
index dddb28cece91..ef7b80682850 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.9.31-r1
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.31-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Samba tevent library
 EAPI=6
 HOMEPAGE=http://tevent.samba.org/
 IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/talloc-2.1.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(-)?] python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/tevent/tevent-0.9.31.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=b3307ceb48f85e0bbb6225e18630a958
+_md5_=f139794bdaf648734447bfaf46c34a49
diff --git a/metadata/md5-cache/virtual/emacs-25 b/metadata/md5-cache/virtual/emacs-25
index 276bc96aa730..239c80e54635 100644
--- a/metadata/md5-cache/virtual/emacs-25
+++ b/metadata/md5-cache/virtual/emacs-25
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for GNU Emacs
 EAPI=6
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( app-editors/emacs:25 >=app-editors/emacs-vcs-25.1 )
 SLOT=0
-_md5_=84b93a7fe1b8a923bb97adcdefbf98f5
+_md5_=ce3a986bac0eb97f6f32d8e4e64d6d07
diff --git a/metadata/md5-cache/virtual/ruby-1 b/metadata/md5-cache/virtual/ruby-1
index ed36ac4195ef..76aa62e6dc50 100644
--- a/metadata/md5-cache/virtual/ruby-1
+++ b/metadata/md5-cache/virtual/ruby-1
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual ebuild for ruby
 EAPI=5
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) virtual/rubygems
+RDEPEND=|| ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) virtual/rubygems
 SLOT=0
-_eclasses_=ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3
+_eclasses_=ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62
 _md5_=35eb8fac62aa9a93496661a4eddbfbc5
diff --git a/metadata/md5-cache/virtual/ruby-ffi-3 b/metadata/md5-cache/virtual/ruby-ffi-3
index e0549d389651..f9add8b01c12 100644
--- a/metadata/md5-cache/virtual/ruby-ffi-3
+++ b/metadata/md5-cache/virtual/ruby-ffi-3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~
 RDEPEND=ruby_targets_ruby21? ( dev-ruby/ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=540a38bf3542ce9919d0a0c5a7927821
diff --git a/metadata/md5-cache/virtual/ruby-ffi-4 b/metadata/md5-cache/virtual/ruby-ffi-4
index bed41c01502f..5a3ddf87a77c 100644
--- a/metadata/md5-cache/virtual/ruby-ffi-4
+++ b/metadata/md5-cache/virtual/ruby-ffi-4
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-
 RDEPEND=ruby_targets_ruby21? ( dev-ruby/ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b87cdaac41108481cef196dd021044ec
diff --git a/metadata/md5-cache/virtual/ruby-minitest-0-r4 b/metadata/md5-cache/virtual/ruby-minitest-0-r4
index ca212eb33480..1c8f15b9aa8a 100644
--- a/metadata/md5-cache/virtual/ruby-minitest-0-r4
+++ b/metadata/md5-cache/virtual/ruby-minitest-0-r4
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fb
 RDEPEND=ruby_targets_ruby21? ( || ( dev-ruby/minitest[ruby_targets_ruby21] dev-lang/ruby:2.1 ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f80849e638ca10736cf46e1b121c29cd
diff --git a/metadata/md5-cache/virtual/ruby-minitest-1 b/metadata/md5-cache/virtual/ruby-minitest-1
index 5133ff54ed58..8cef5d3d4d66 100644
--- a/metadata/md5-cache/virtual/ruby-minitest-1
+++ b/metadata/md5-cache/virtual/ruby-minitest-1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fb
 RDEPEND=ruby_targets_ruby21? ( || ( dev-ruby/minitest[ruby_targets_ruby21] dev-lang/ruby:2.1 ) ) ruby_targets_ruby22? ( || ( dev-ruby/minitest[ruby_targets_ruby22] dev-lang/ruby:2.2 ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=32bc833e6457821f39e5f102f8b575dc
diff --git a/metadata/md5-cache/virtual/ruby-ssl-8 b/metadata/md5-cache/virtual/ruby-ssl-8
index 5267e8b884eb..10073fd10cfe 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-8
+++ b/metadata/md5-cache/virtual/ruby-ssl-8
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fb
 RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1[ssl] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2[ssl] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3[ssl] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b10a7e95d465280fc5181cb5a3d292e6
diff --git a/metadata/md5-cache/virtual/ruby-ssl-9 b/metadata/md5-cache/virtual/ruby-ssl-9
index 5f9bf64d7355..7fea6de84bf0 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-9
+++ b/metadata/md5-cache/virtual/ruby-ssl-9
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1[ssl] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2[ssl] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3[ssl] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4[ssl] ) 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_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ee4bbfab8284564ff98ab39f866521c5
diff --git a/metadata/md5-cache/virtual/rubygems-10 b/metadata/md5-cache/virtual/rubygems-10
index fa79d9c646a9..589eed62ed20 100644
--- a/metadata/md5-cache/virtual/rubygems-10
+++ b/metadata/md5-cache/virtual/rubygems-10
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~pp
 RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.0.14[ruby_targets_ruby21] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=14be364fe9e2125bc6fd54e56b2a0f99
diff --git a/metadata/md5-cache/virtual/rubygems-11 b/metadata/md5-cache/virtual/rubygems-11
index 5e5bfc1ff117..61b7eb3acba4 100644
--- a/metadata/md5-cache/virtual/rubygems-11
+++ b/metadata/md5-cache/virtual/rubygems-11
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x
 RDEPEND=ruby_targets_rbx? ( dev-lang/rubinius ) ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.5.1[ruby_targets_ruby23] ) 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_rbx? ( dev-lang/rubinius )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_rbx )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=49d808111d6fe395ed104f171713e32c
diff --git a/metadata/md5-cache/virtual/rubygems-12 b/metadata/md5-cache/virtual/rubygems-12
index b61889a693c3..7d82f92eeada 100644
--- a/metadata/md5-cache/virtual/rubygems-12
+++ b/metadata/md5-cache/virtual/rubygems-12
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 RDEPEND=ruby_targets_rbx? ( dev-lang/rubinius ) ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.5.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rubygems-2.6.8[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_rbx? ( dev-lang/rubinius )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_rbx )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=51bec4f1f54472da4c428e0702a33303
diff --git a/metadata/md5-cache/virtual/rubygems-13 b/metadata/md5-cache/virtual/rubygems-13
index 6fb376a74d85..0d1d714f8dda 100644
--- a/metadata/md5-cache/virtual/rubygems-13
+++ b/metadata/md5-cache/virtual/rubygems-13
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 RDEPEND=ruby_targets_rbx? ( dev-lang/rubinius ) ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.5.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rubygems-2.6.11[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_rbx? ( dev-lang/rubinius )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_rbx )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=886a4abb7563bb9b67055986454ee769
diff --git a/metadata/md5-cache/www-apache/passenger-5.1.2 b/metadata/md5-cache/www-apache/passenger-5.1.2
index 89bf2b5e6a3f..0f362b669096 100644
--- a/metadata/md5-cache/www-apache/passenger-5.1.2
+++ b/metadata/md5-cache/www-apache/passenger-5.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.1.2.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5efdfcab4587b0d7a89fc62f72e9c0c2
diff --git a/metadata/md5-cache/www-apache/passenger-5.1.4-r1 b/metadata/md5-cache/www-apache/passenger-5.1.4-r1
index 1e52c9038222..252c20c92758 100644
--- a/metadata/md5-cache/www-apache/passenger-5.1.4-r1
+++ b/metadata/md5-cache/www-apache/passenger-5.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.1.4.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0f18cb84de60bb761ae7565f87ba9732
diff --git a/metadata/md5-cache/www-apps/jekyll-3.1.6-r1 b/metadata/md5-cache/www-apps/jekyll-3.1.6-r1
index f447f775042c..9a3257e62122 100644
--- a/metadata/md5-cache/www-apps/jekyll-3.1.6-r1
+++ b/metadata/md5-cache/www-apps/jekyll-3.1.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( <dev-ruby/colorator-1.0[ruby_targets_ruby21] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll/archive/v3.1.6.tar.gz -> jekyll-3.1.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a1162b7080817b6105879d486ebd1520
diff --git a/metadata/md5-cache/www-apps/jekyll-3.2.1-r2 b/metadata/md5-cache/www-apps/jekyll-3.2.1-r2
index a1790c0d463c..c7dcdf14823a 100644
--- a/metadata/md5-cache/www-apps/jekyll-3.2.1-r2
+++ b/metadata/md5-cache/www-apps/jekyll-3.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/colorator-1.0[ruby_targets_ruby21] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll/archive/v3.2.1.tar.gz -> jekyll-3.2.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=210297a1afe63248961cb2a6d5f1a405
diff --git a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1 b/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
index b078462fd2c5..9949f556ef55 100644
--- a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
+++ b/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/coffee-script[ruby_targets_ruby21] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-coffeescript/archive/v1.0.1.tar.gz -> jekyll-coffeescript-1.0.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d24d43b00751243f1cf3d98c7152d430
diff --git a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.2 b/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.2
index 48b22d41db4e..0cd206497ed2 100644
--- a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.2
+++ b/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-coffeescript/archive/v1.0.2.tar.gz -> jekyll-coffeescript-1.0.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=21b75fecadcef3898d59d1a03dccbb29
diff --git a/metadata/md5-cache/www-apps/jekyll-gist-1.4.0 b/metadata/md5-cache/www-apps/jekyll-gist-1.4.0
index 65ce78c24995..3793f61e7d55 100644
--- a/metadata/md5-cache/www-apps/jekyll-gist-1.4.0
+++ b/metadata/md5-cache/www-apps/jekyll-gist-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/octokit-4.2[ruby_targets_ruby21] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-gist/archive/v1.4.0.tar.gz -> jekyll-gist-1.4.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fbd9fcccff56d2eda3f31808d7f4ccb6
diff --git a/metadata/md5-cache/www-apps/jekyll-paginate-1.1.0 b/metadata/md5-cache/www-apps/jekyll-paginate-1.1.0
index f9fe34da23a1..9108724f0e24 100644
--- a/metadata/md5-cache/www-apps/jekyll-paginate-1.1.0
+++ b/metadata/md5-cache/www-apps/jekyll-paginate-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-paginate/archive/v1.1.0.tar.gz -> jekyll-paginate-1.1.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e2eadca0f52fca04514d38b8cea6f6c4
diff --git a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0 b/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0
index af0dd8b1319b..f58efc959c23 100644
--- a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0
+++ b/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/sass:3.4[ruby_targets_ruby21] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sass-converter/archive/v1.4.0.tar.gz -> jekyll-sass-converter-1.4.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9804a855d19847082858ba1b84063590
diff --git a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.5.0 b/metadata/md5-cache/www-apps/jekyll-sass-converter-1.5.0
index f3aa83a321ca..4f216221cbf5 100644
--- a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.5.0
+++ b/metadata/md5-cache/www-apps/jekyll-sass-converter-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/sass:3.4[ruby_targets_ruby21] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sass-converter/archive/v1.5.0.tar.gz -> jekyll-sass-converter-1.5.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=459bdfff3d9594d7ecbd68738dbd5957
diff --git a/metadata/md5-cache/www-apps/jekyll-sitemap-0.11.0 b/metadata/md5-cache/www-apps/jekyll-sitemap-0.11.0
index a07320214ccc..799a72ed477f 100644
--- a/metadata/md5-cache/www-apps/jekyll-sitemap-0.11.0
+++ b/metadata/md5-cache/www-apps/jekyll-sitemap-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby21]
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sitemap/archive/v0.11.0.tar.gz -> jekyll-sitemap-0.11.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9efc44aa681b2a63bef858fd438050c6
diff --git a/metadata/md5-cache/www-apps/jekyll-watch-1.3.1 b/metadata/md5-cache/www-apps/jekyll-watch-1.3.1
index 7a3fe2c19bb4..ad3221ae6964 100644
--- a/metadata/md5-cache/www-apps/jekyll-watch-1.3.1
+++ b/metadata/md5-cache/www-apps/jekyll-watch-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/listen-3.0[ruby_targets_ruby21] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-watch/archive/v1.3.1.tar.gz -> jekyll-watch-1.3.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7db33bc72eb8037c9d3afc43ca406471
diff --git a/metadata/md5-cache/www-apps/nanoc-4.3.5 b/metadata/md5-cache/www-apps/nanoc-4.3.5
index 0f93d3a38641..b12e3ce2d133 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.3.5
+++ b/metadata/md5-cache/www-apps/nanoc-4.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanoc-4.3.5.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ba04815164eca853190fad49bb374e83
diff --git a/metadata/md5-cache/www-apps/nanoc-4.3.8 b/metadata/md5-cache/www-apps/nanoc-4.3.8
index 6eb7e2a82a42..d6aa0000f8c4 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.3.8
+++ b/metadata/md5-cache/www-apps/nanoc-4.3.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanoc-4.3.8.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0c6874ca5fc75bf88a7fa1e743d37557
diff --git a/metadata/md5-cache/www-apps/nanoc-4.4.7 b/metadata/md5-cache/www-apps/nanoc-4.4.7
index 44a5cda23dc6..e05f447fddee 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.4.7
+++ b/metadata/md5-cache/www-apps/nanoc-4.4.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanoc-4.4.7.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1f82f705e73ecaa5d1f853f94824f91d
diff --git a/metadata/md5-cache/www-apps/nanoc-4.5.4 b/metadata/md5-cache/www-apps/nanoc-4.5.4
index 3f57f958385e..7244c18dd0a5 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.5.4
+++ b/metadata/md5-cache/www-apps/nanoc-4.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanoc-4.5.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9c997cf1efe8ca4cb5bdc9450e971a1a
diff --git a/metadata/md5-cache/www-apps/nanoc-4.6.4 b/metadata/md5-cache/www-apps/nanoc-4.6.4
index cfbc4ea39cc1..26c90541c926 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.6.4
+++ b/metadata/md5-cache/www-apps/nanoc-4.6.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanoc-4.6.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b1fb932a06b07ab6dfa445077d187613
diff --git a/metadata/md5-cache/www-apps/owncloud-10.0.1 b/metadata/md5-cache/www-apps/owncloud-10.0.1
new file mode 100644
index 000000000000..e88522c191a7
--- /dev/null
+++ b/metadata/md5-cache/www-apps/owncloud-10.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web-based storage application where all your data is under your own control
+EAPI=6
+HOMEPAGE=http://owncloud.org
+IUSE=+curl mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip] virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=10.0.1
+SRC_URI=http://download.owncloud.org/community/owncloud-10.0.1.tar.bz2 -> owncloud-10.0.1.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=88bbd2b5471aeb31b517109de5225d98
diff --git a/metadata/md5-cache/www-apps/redmine-3.2.1 b/metadata/md5-cache/www-apps/redmine-3.2.1
index fde482d7f659..62b9f8b8b41e 100644
--- a/metadata/md5-cache/www-apps/redmine-3.2.1
+++ b/metadata/md5-cache/www-apps/redmine-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( dev-ruby/rubygems[ruby_targets_ruby21] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://www.redmine.org/releases/redmine-3.2.1.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7fcad5bbdc5d97492d9907b071633a68
diff --git a/metadata/md5-cache/www-client/firefox-53.0-r1 b/metadata/md5-cache/www-client/firefox-53.0-r1
deleted file mode 100644
index d99187dd97ae..000000000000
--- a/metadata/md5-cache/www-client/firefox-53.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.29.5 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-mozilla ) pgo? ( >=sys-devel/gcc-4.5 ) rust? ( dev-lang/rust ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.28:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/firefox
-IUSE=bindist +gmp-autoupdate hardened hwaccel jack nsplugin pgo rust selinux test custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi pgo l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.29.5 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.28:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ach.xpi -> firefox-53.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/af.xpi -> firefox-53.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/an.xpi -> firefox-53.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ar.xpi -> firefox-53.0-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/as.xpi -> firefox-53.0-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ast.xpi -> firefox-53.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/az.xpi -> firefox-53.0-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/bg.xpi -> firefox-53.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/bn-BD.xpi -> firefox-53.0-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/bn-IN.xpi -> firefox-53.0-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/br.xpi -> firefox-53.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/bs.xpi -> firefox-53.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ca.xpi -> firefox-53.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/cak.xpi -> firefox-53.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/cs.xpi -> firefox-53.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/cy.xpi -> firefox-53.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/da.xpi -> firefox-53.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/de.xpi -> firefox-53.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/dsb.xpi -> firefox-53.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/el.xpi -> firefox-53.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/en-GB.xpi -> firefox-53.0-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/en-ZA.xpi -> firefox-53.0-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/eo.xpi -> firefox-53.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/es-AR.xpi -> firefox-53.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/es-CL.xpi -> firefox-53.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/es-ES.xpi -> firefox-53.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/es-MX.xpi -> firefox-53.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/et.xpi -> firefox-53.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/eu.xpi -> firefox-53.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/fa.xpi -> firefox-53.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ff.xpi -> firefox-53.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/fi.xpi -> firefox-53.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/fr.xpi -> firefox-53.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/fy-NL.xpi -> firefox-53.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ga-IE.xpi -> firefox-53.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/gd.xpi -> firefox-53.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/gl.xpi -> firefox-53.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/gn.xpi -> firefox-53.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/gu-IN.xpi -> firefox-53.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/he.xpi -> firefox-53.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/hi-IN.xpi -> firefox-53.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/hr.xpi -> firefox-53.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/hsb.xpi -> firefox-53.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/hu.xpi -> firefox-53.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/hy-AM.xpi -> firefox-53.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/id.xpi -> firefox-53.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/is.xpi -> firefox-53.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/it.xpi -> firefox-53.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ja.xpi -> firefox-53.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ka.xpi -> firefox-53.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/kab.xpi -> firefox-53.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/kk.xpi -> firefox-53.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/km.xpi -> firefox-53.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/kn.xpi -> firefox-53.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ko.xpi -> firefox-53.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/lij.xpi -> firefox-53.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/lt.xpi -> firefox-53.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/lv.xpi -> firefox-53.0-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/mai.xpi -> firefox-53.0-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/mk.xpi -> firefox-53.0-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ml.xpi -> firefox-53.0-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/mr.xpi -> firefox-53.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ms.xpi -> firefox-53.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/nb-NO.xpi -> firefox-53.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/nl.xpi -> firefox-53.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/nn-NO.xpi -> firefox-53.0-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/or.xpi -> firefox-53.0-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/pa-IN.xpi -> firefox-53.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/pl.xpi -> firefox-53.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/pt-BR.xpi -> firefox-53.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/pt-PT.xpi -> firefox-53.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/rm.xpi -> firefox-53.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ro.xpi -> firefox-53.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ru.xpi -> firefox-53.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/si.xpi -> firefox-53.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/sk.xpi -> firefox-53.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/sl.xpi -> firefox-53.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/son.xpi -> firefox-53.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/sq.xpi -> firefox-53.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/sr.xpi -> firefox-53.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/sv-SE.xpi -> firefox-53.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/ta.xpi -> firefox-53.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/te.xpi -> firefox-53.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/th.xpi -> firefox-53.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/tr.xpi -> firefox-53.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/uk.xpi -> firefox-53.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/uz.xpi -> firefox-53.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/vi.xpi -> firefox-53.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/xh.xpi -> firefox-53.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/zh-CN.xpi -> firefox-53.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/53.0/linux-i686/xpi/zh-TW.xpi -> firefox-53.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/53.0/source/firefox-53.0.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-53.0-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-53.0-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-53.0-patches-02.tar.xz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.53	df168e9bed6604a7c419f60bed9c3a4b	mozcoreconf-v4	6492fb2259ea94a750f79656278d8218	mozextension	e5d920147bfccf4930062e462e2a417d	mozlinguas-v2	e3c0b93bb284269205def793bf37bef5	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f304a24ca537b3da6d87e42931e9ccd8
diff --git a/metadata/md5-cache/www-client/firefox-53.0.3 b/metadata/md5-cache/www-client/firefox-53.0.3
new file mode 100644
index 000000000000..c387a5546155
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-53.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.29.5 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-mozilla ) pgo? ( >=sys-devel/gcc-4.5 ) rust? ( dev-lang/rust ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.28:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=http://www.mozilla.com/firefox
+IUSE=bindist +gmp-autoupdate hardened hwaccel jack nsplugin pgo rust selinux test custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi pgo l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.29.5 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.28:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ach.xpi -> firefox-53.0.3-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/af.xpi -> firefox-53.0.3-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/an.xpi -> firefox-53.0.3-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ar.xpi -> firefox-53.0.3-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/as.xpi -> firefox-53.0.3-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ast.xpi -> firefox-53.0.3-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/az.xpi -> firefox-53.0.3-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/bg.xpi -> firefox-53.0.3-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/bn-BD.xpi -> firefox-53.0.3-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/bn-IN.xpi -> firefox-53.0.3-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/br.xpi -> firefox-53.0.3-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/bs.xpi -> firefox-53.0.3-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ca.xpi -> firefox-53.0.3-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/cak.xpi -> firefox-53.0.3-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/cs.xpi -> firefox-53.0.3-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/cy.xpi -> firefox-53.0.3-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/da.xpi -> firefox-53.0.3-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/de.xpi -> firefox-53.0.3-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/dsb.xpi -> firefox-53.0.3-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/el.xpi -> firefox-53.0.3-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/en-GB.xpi -> firefox-53.0.3-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/en-ZA.xpi -> firefox-53.0.3-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/eo.xpi -> firefox-53.0.3-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/es-AR.xpi -> firefox-53.0.3-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/es-CL.xpi -> firefox-53.0.3-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/es-ES.xpi -> firefox-53.0.3-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/es-MX.xpi -> firefox-53.0.3-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/et.xpi -> firefox-53.0.3-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/eu.xpi -> firefox-53.0.3-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/fa.xpi -> firefox-53.0.3-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ff.xpi -> firefox-53.0.3-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/fi.xpi -> firefox-53.0.3-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/fr.xpi -> firefox-53.0.3-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/fy-NL.xpi -> firefox-53.0.3-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ga-IE.xpi -> firefox-53.0.3-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/gd.xpi -> firefox-53.0.3-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/gl.xpi -> firefox-53.0.3-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/gn.xpi -> firefox-53.0.3-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/gu-IN.xpi -> firefox-53.0.3-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/he.xpi -> firefox-53.0.3-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/hi-IN.xpi -> firefox-53.0.3-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/hr.xpi -> firefox-53.0.3-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/hsb.xpi -> firefox-53.0.3-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/hu.xpi -> firefox-53.0.3-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/hy-AM.xpi -> firefox-53.0.3-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/id.xpi -> firefox-53.0.3-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/is.xpi -> firefox-53.0.3-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/it.xpi -> firefox-53.0.3-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ja.xpi -> firefox-53.0.3-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ka.xpi -> firefox-53.0.3-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/kab.xpi -> firefox-53.0.3-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/kk.xpi -> firefox-53.0.3-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/km.xpi -> firefox-53.0.3-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/kn.xpi -> firefox-53.0.3-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ko.xpi -> firefox-53.0.3-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/lij.xpi -> firefox-53.0.3-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/lt.xpi -> firefox-53.0.3-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/lv.xpi -> firefox-53.0.3-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/mai.xpi -> firefox-53.0.3-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/mk.xpi -> firefox-53.0.3-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ml.xpi -> firefox-53.0.3-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/mr.xpi -> firefox-53.0.3-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ms.xpi -> firefox-53.0.3-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/nb-NO.xpi -> firefox-53.0.3-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/nl.xpi -> firefox-53.0.3-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/nn-NO.xpi -> firefox-53.0.3-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/or.xpi -> firefox-53.0.3-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/pa-IN.xpi -> firefox-53.0.3-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/pl.xpi -> firefox-53.0.3-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/pt-BR.xpi -> firefox-53.0.3-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/pt-PT.xpi -> firefox-53.0.3-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/rm.xpi -> firefox-53.0.3-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ro.xpi -> firefox-53.0.3-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ru.xpi -> firefox-53.0.3-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/si.xpi -> firefox-53.0.3-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/sk.xpi -> firefox-53.0.3-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/sl.xpi -> firefox-53.0.3-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/son.xpi -> firefox-53.0.3-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/sq.xpi -> firefox-53.0.3-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/sr.xpi -> firefox-53.0.3-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/sv-SE.xpi -> firefox-53.0.3-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/ta.xpi -> firefox-53.0.3-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/te.xpi -> firefox-53.0.3-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/th.xpi -> firefox-53.0.3-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/tr.xpi -> firefox-53.0.3-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/uk.xpi -> firefox-53.0.3-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/uz.xpi -> firefox-53.0.3-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/vi.xpi -> firefox-53.0.3-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/xh.xpi -> firefox-53.0.3-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/zh-CN.xpi -> firefox-53.0.3-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xpi/zh-TW.xpi -> firefox-53.0.3-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/53.0.3/source/firefox-53.0.3.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-53.0-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-53.0-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-53.0-patches-02.tar.xz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.53	df168e9bed6604a7c419f60bed9c3a4b	mozcoreconf-v4	6492fb2259ea94a750f79656278d8218	mozextension	e5d920147bfccf4930062e462e2a417d	mozlinguas-v2	e3c0b93bb284269205def793bf37bef5	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=f304a24ca537b3da6d87e42931e9ccd8
diff --git a/metadata/md5-cache/www-client/phantomjs-2.0.0 b/metadata/md5-cache/www-client/phantomjs-2.0.0
index 84508c5bd68b..a06f0918227f 100644
--- a/metadata/md5-cache/www-client/phantomjs-2.0.0
+++ b/metadata/md5-cache/www-client/phantomjs-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-libs/icu:= dev-libs/openssl:0 media-libs/fontconfig media-libs/freetype media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libpng:0= virtual/jpeg:0 || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) virtual/rubygems net-misc/openssh[-bindist] app-arch/unzip virtual/pkgconfig
+DEPEND=dev-libs/icu:= dev-libs/openssl:0 media-libs/fontconfig media-libs/freetype media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libpng:0= virtual/jpeg:0 || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) virtual/rubygems net-misc/openssh[-bindist] app-arch/unzip virtual/pkgconfig
 DESCRIPTION=A headless WebKit scriptable with a JavaScript API
 EAPI=5
 HOMEPAGE=http://phantomjs.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/icu:= dev-libs/openssl:0 media-libs/fontconfig media-libs/freetype media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libpng:0= virtual/jpeg:0
 SLOT=0
 SRC_URI=https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.0.0-source.zip
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
 _md5_=e93029939653f381c51625930aa830f0
diff --git a/metadata/md5-cache/www-client/phantomjs-2.0.0-r1 b/metadata/md5-cache/www-client/phantomjs-2.0.0-r1
index 24fe86608fc3..a19cce82cc4d 100644
--- a/metadata/md5-cache/www-client/phantomjs-2.0.0-r1
+++ b/metadata/md5-cache/www-client/phantomjs-2.0.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-libs/icu:= !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) media-libs/fontconfig media-libs/freetype media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libpng:0= virtual/jpeg:0 || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) virtual/rubygems net-misc/openssh[-bindist] app-arch/unzip virtual/pkgconfig
+DEPEND=dev-libs/icu:= !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) media-libs/fontconfig media-libs/freetype media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libpng:0= virtual/jpeg:0 || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) virtual/rubygems net-misc/openssh[-bindist] app-arch/unzip virtual/pkgconfig
 DESCRIPTION=A headless WebKit scriptable with a JavaScript API
 EAPI=5
 HOMEPAGE=http://phantomjs.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/icu:= !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) media-libs/fontconfig media-libs/freetype media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libpng:0= virtual/jpeg:0
 SLOT=0
 SRC_URI=https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.0.0-source.zip
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
 _md5_=bc333bfac41452d014ed20f3f815b9a3
diff --git a/metadata/md5-cache/www-servers/adsf-1.2.1 b/metadata/md5-cache/www-servers/adsf-1.2.1
index 4d22e572c8e3..4b12d7d60463 100644
--- a/metadata/md5-cache/www-servers/adsf-1.2.1
+++ b/metadata/md5-cache/www-servers/adsf-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ddfreyne/adsf/archive/1.2.1.tar.gz -> adsf-1.2.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=91995278a7f3803ee80a8bfff435e098
diff --git a/metadata/md5-cache/www-servers/puma-3.1.1 b/metadata/md5-cache/www-servers/puma-3.1.1
index 232ac8c8f612..141a35e20181 100644
--- a/metadata/md5-cache/www-servers/puma-3.1.1
+++ b/metadata/md5-cache/www-servers/puma-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v3.1.1.tar.gz -> puma-3.1.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c7bb776a458cb2fd48ee8f00a59d7d07
diff --git a/metadata/md5-cache/www-servers/puma-3.6.1 b/metadata/md5-cache/www-servers/puma-3.6.1
index 2c9da6ef30fb..a6a3820ec5da 100644
--- a/metadata/md5-cache/www-servers/puma-3.6.1
+++ b/metadata/md5-cache/www-servers/puma-3.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v3.6.1.tar.gz -> puma-3.6.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c2bdff0a28b90aaa9c04891c32f70a9d
diff --git a/metadata/md5-cache/www-servers/puma-3.6.2 b/metadata/md5-cache/www-servers/puma-3.6.2
index 69746676f56d..e4a71e59fd84 100644
--- a/metadata/md5-cache/www-servers/puma-3.6.2
+++ b/metadata/md5-cache/www-servers/puma-3.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v3.6.2.tar.gz -> puma-3.6.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c2bdff0a28b90aaa9c04891c32f70a9d
diff --git a/metadata/md5-cache/www-servers/thin-1.7.0 b/metadata/md5-cache/www-servers/thin-1.7.0
index c1e6ce1affbe..75d44e1adf21 100644
--- a/metadata/md5-cache/www-servers/thin-1.7.0
+++ b/metadata/md5-cache/www-servers/thin-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/macournoyer/thin/archive/v1.7.0.tar.gz -> thin-1.7.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9967c3e34217377b5af81de476102f5f
diff --git a/metadata/md5-cache/www-servers/thin-1.7.0-r1 b/metadata/md5-cache/www-servers/thin-1.7.0-r1
index a52ac69bfd45..8d42fc591267 100644
--- a/metadata/md5-cache/www-servers/thin-1.7.0-r1
+++ b/metadata/md5-cache/www-servers/thin-1.7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/macournoyer/thin/archive/v1.7.0.tar.gz -> thin-1.7.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fa1896d3ef82796456f403448d8857b3
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.13.1-r1 b/metadata/md5-cache/www-servers/uwsgi-2.0.13.1-r1
index 1dd205753512..facce0920d9f 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.13.1-r1
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.13.1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso
 REQUIRED_USE=|| ( cgi mono perl go 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_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) php? ( || ( php_targets_php5-6 php_targets_php7-0 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.13.1.tar.gz -> uwsgi-2.0.13.1.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7027963e8e8cc12c91117bdb9225dc26	depend.apache	0917334d570e07f9743a04ff85b3bf1b	distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	php-ext-source-r2	6b0fe3f9cc5ad2f4e3ffcea3e9112c4c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7027963e8e8cc12c91117bdb9225dc26	depend.apache	0917334d570e07f9743a04ff85b3bf1b	distutils-r1	3cf8c7d6a9b2e3582f6b1f9aa9115ab6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	php-ext-source-r2	6b0fe3f9cc5ad2f4e3ffcea3e9112c4c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=f8cbd2c75f9cc9ed35624c0e92fe7c48
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.14-r1 b/metadata/md5-cache/www-servers/uwsgi-2.0.14-r1
index bd4d9663dc82..c21804f8a9ce 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.14-r1
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.14-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso
 REQUIRED_USE=|| ( cgi mono perl go 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_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php5-6 php_targets_php7-0 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.14.tar.gz -> uwsgi-2.0.14.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7027963e8e8cc12c91117bdb9225dc26	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	php-ext-source-r2	6b0fe3f9cc5ad2f4e3ffcea3e9112c4c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7027963e8e8cc12c91117bdb9225dc26	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	php-ext-source-r2	6b0fe3f9cc5ad2f4e3ffcea3e9112c4c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a7de5e95f8f0d43ffae23db345a351d5
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.15 b/metadata/md5-cache/www-servers/uwsgi-2.0.15
index 8a2ddfc788f6..3a5eeaadbb5f 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.15
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.15
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso
 REQUIRED_USE=|| ( cgi mono perl go 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_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php5-6 php_targets_php7-0 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.15.tar.gz -> uwsgi-2.0.15.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7027963e8e8cc12c91117bdb9225dc26	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	php-ext-source-r2	6b0fe3f9cc5ad2f4e3ffcea3e9112c4c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7027963e8e8cc12c91117bdb9225dc26	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	php-ext-source-r2	6b0fe3f9cc5ad2f4e3ffcea3e9112c4c	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c3a5887f67f8fb1fcbf691264218a803
diff --git a/metadata/md5-cache/www-servers/varnish-5.1.2 b/metadata/md5-cache/www-servers/varnish-5.1.2
index a946a54cb5bd..54083a4af11b 100644
--- a/metadata/md5-cache/www-servers/varnish-5.1.2
+++ b/metadata/md5-cache/www-servers/varnish-5.1.2
@@ -3,13 +3,13 @@ DEPEND=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc
 DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
 EAPI=6
 HOMEPAGE=http://www.varnish-cache.org/
-IUSE=jemalloc jit static-libs python_targets_pypy python_targets_python2_7 python_targets_python3_4
+IUSE=jemalloc jit static-libs python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=BSD-2 GPL-2
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= sys-devel/gcc
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= sys-devel/gcc
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://repo.varnish-cache.org/source/varnish-5.1.2.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	f86a9a1499559655f609fd001c3ceba8	python-utils-r1	7aaf8e4bc5ba6cae58ff688b5a857866	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=85669915f9de9a0f50c5cc744d39eb25
+_md5_=b4d608479bd0486b69f90a64b8531173
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.81 b/metadata/md5-cache/x11-libs/libdrm-2.4.81
new file mode 100644
index 000000000000..c1440447c740
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.81
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.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-opengl[-abi_x86_32(-)] ) valgrind? ( dev-util/valgrind ) >=app-portage/elt-patches-20170317 !<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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=X.Org libdrm library
+EAPI=5
+HOMEPAGE=https://dri.freedesktop.org/
+IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.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-opengl[-abi_x86_32(-)] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.81.tar.bz2
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xorg-2	85b1e64779a3286b1224aef7dcfbca28
+_md5_=7a6cc8bb2527aae177475898c8259c36
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.1.2 b/metadata/md5-cache/x11-misc/kronometer-2.1.2
index 9bdb2e00538f..4e040456719c 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.1.2
+++ b/metadata/md5-cache/x11-misc/kronometer-2.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.1.2/src/kronometer-2.1.2.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8f71340e05a8e764ff34ab9351166e5d
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.1.4 b/metadata/md5-cache/x11-misc/kronometer-2.1.4
index b7f474078c3f..a6edd0ed1b8b 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.1.4
+++ b/metadata/md5-cache/x11-misc/kronometer-2.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kcrash-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.1.4/src/kronometer-2.1.4.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=a3643d979447acc0840d253bb2148954
diff --git a/metadata/md5-cache/x11-misc/qt5ct-0.32 b/metadata/md5-cache/x11-misc/qt5ct-0.32
index 98c4e182075f..ade901f7bdcc 100644
--- a/metadata/md5-cache/x11-misc/qt5ct-0.32
+++ b/metadata/md5-cache/x11-misc/qt5ct-0.32
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] ) dev-qt/linguist-tools:5
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 >=dev-qt/qtgui-5.7:5[dbus] ) dev-qt/linguist-tools:5
 DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/qt5ct/
 IUSE=+dbus
 KEYWORDS=~amd64
 LICENSE=BSD-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 >=dev-qt/qtgui-5.7:5[dbus] )
 SLOT=0
 SRC_URI=mirror://sourceforge/qt5ct/qt5ct-0.32.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	40a2ae377c3111aa116512aaf010f6ff	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=4025fc46f4acf1e67d4f8fb8b9f12fbd
+_md5_=2f004161f9be60eec92e6570d14ad3c9
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.13_p20150111 b/metadata/md5-cache/x11-misc/x11vnc-0.9.13_p20150111
deleted file mode 100644
index aef962e786c7..000000000000
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.13_p20150111
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr >=x11-libs/libXtst-1.1.0 avahi? ( >=net-dns/avahi-0.6.4 ) ssl? ( dev-libs/openssl:= ) >=net-libs/libvncserver-0.9.8 xinerama? ( x11-libs/libXinerama ) x11-libs/libXt x11-proto/inputproto x11-proto/trapproto x11-proto/recordproto x11-proto/xproto x11-proto/xextproto xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170317 !<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 VNC server for real X displays
-EAPI=5
-HOMEPAGE=http://www.karlrunge.com/x11vnc/
-IUSE=avahi crypt fbcon ssl xinerama
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr >=x11-libs/libXtst-1.1.0 avahi? ( >=net-dns/avahi-0.6.4 ) ssl? ( dev-libs/openssl:= ) >=net-libs/libvncserver-0.9.8 xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=https://github.com/LibVNC/x11vnc/archive/82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=428760205a65a552d2a8ac245ba877d0
diff --git a/metadata/md5-cache/x11-themes/qtcurve-1.8.18-r1 b/metadata/md5-cache/x11-themes/qtcurve-1.8.18-r1
index 527f53279484..2d4e4896667d 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-1.8.18-r1
+++ b/metadata/md5-cache/x11-themes/qtcurve-1.8.18-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=gtk? ( X ) || ( gtk qt4 qt5 )
 SLOT=0
 SRC_URI=https://github.com/QtCurve/qtcurve/archive/1.8.18.tar.gz -> qtcurve-1.8.18.tar.gz https://github.com/QtCurve/qtcurve/commit/020b70404f6202490d5ca131f0ec084355cb98e3.patch -> qtcurve-1.8.18-dont_use_c++11.patch
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=daaa045ab9ca6d3148d0b0f194262488
+_md5_=51cf32a251a7abe68f668729f691c4c2
diff --git a/metadata/md5-cache/x11-themes/qtcurve-9999 b/metadata/md5-cache/x11-themes/qtcurve-9999
index 233d11b184fd..0cafb6c9902e 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-9999
+++ b/metadata/md5-cache/x11-themes/qtcurve-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2+
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 ) plasma? ( >=kde-frameworks/karchive-5.29.0 >=kde-frameworks/kcompletion-5.29.0 >=kde-frameworks/kconfig-5.29.0 >=kde-frameworks/kconfigwidgets-5.29.0 >=kde-frameworks/kcoreaddons-5.29.0 >=kde-frameworks/kdelibs4support-5.29.0 >=kde-frameworks/kguiaddons-5.29.0 >=kde-frameworks/ki18n-5.29.0 >=kde-frameworks/kiconthemes-5.29.0 >=kde-frameworks/kio-5.29.0 >=kde-frameworks/kwidgetsaddons-5.29.0 >=kde-frameworks/kwindowsystem-5.29.0 >=kde-frameworks/kxmlgui-5.29.0 >=dev-qt/qtprintsupport-5.6.1:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) !x11-themes/gtk-engines-qtcurve
 REQUIRED_USE=gtk? ( X ) || ( gtk qt4 qt5 ) plasma? ( qt5 )
 SLOT=0
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	4fc0940feb870201784402ca0519ff9c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	b4e90cc66aee4c911166b9c8bf94bbb1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=0f248a88d1a7bcd492105d08d0960650
diff --git a/metadata/md5-cache/x11-wm/subtle-0.11.3244 b/metadata/md5-cache/x11-wm/subtle-0.11.3244
index 48999e031625..7db241b46790 100644
--- a/metadata/md5-cache/x11-wm/subtle-0.11.3244
+++ b/metadata/md5-cache/x11-wm/subtle-0.11.3244
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXineram
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/subtle-0.11.3244.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b89ae5df309ee6c6096dad48bc5c8f3c
diff --git a/metadata/md5-cache/x11-wm/subtle-9999 b/metadata/md5-cache/x11-wm/subtle-9999
index f765cfb10a5b..6abb3037d7fe 100644
--- a/metadata/md5-cache/x11-wm/subtle-9999
+++ b/metadata/md5-cache/x11-wm/subtle-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) ruby_targets_ruby21? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	3f0a6a3bb422dfe69c1632b7f5b152e6	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	3f0a6a3bb422dfe69c1632b7f5b152e6	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b89ae5df309ee6c6096dad48bc5c8f3c
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7345383e6d74..7bc9b99cf98d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 27 May 2017 10:39:44 +0000
+Mon, 29 May 2017 06:08:46 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index dcf8fdd7b6c1..6f4db430d8f9 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat May 27 10:39:44 UTC 2017
+Mon May 29 06:08:45 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f88efb7065e4..97ce2861b950 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 27 May 2017 11:00:01 +0000
+Mon, 29 May 2017 06:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c568a60fef5e..ebebed583d98 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-bb7884c9d789f98b3d46e344b34c6faa000445e3 1495879462 2017-05-27T10:04:22+00:00
+5cdd1aebee8c90e7b35e879c1452bd51dbd2efe8 1496036891 2017-05-29T05:48:11+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0edf8eb15ebc..7a8ab6b21ed8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1495881301 Sat 27 May 2017 10:35:01 AM UTC
+1496037901 Mon 29 May 2017 06:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7345383e6d74..f22a66875eb1 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 27 May 2017 10:39:44 +0000
+Mon, 29 May 2017 06:08:45 +0000
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
index 22354e39040c..3da15bce6304 100644
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://cwrap.org/resolv_wrapper.html"
 SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="alpha amd64 ppc64 x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 46444ec74aca..3f73710063b5 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
 DIST shorewall-5.0.15.3.tar.bz2 525470 SHA256 c71c42e9697057b39ae27593725d2fcc5829cc8eab78ef2109a1f16ed89534db SHA512 a0990a23870740e96d86dc5f02aa55d0f762e030a0a08ba9ce8801065712a1908889d9d82052cdeefcd14d851462217fd0096101a4535de96d5ff141a8ec7faa WHIRLPOOL f95ce4cbf856a8d4d635cf926408e782c44317ea4866c476b5ba8372f62fac1b16651a4b3ce8266e2bd8ff211254e2c6fa32dfef5e381c540e12651c7c695a2b
 DIST shorewall-5.0.15.6.tar.bz2 525827 SHA256 17ae4613eac68a62d4cd520af8c63b54b36ae79aac4e22fc57c74929a968ef46 SHA512 d1665a30a9b1273e3cfdb7e8001a679beb3d09e75e8fd21caadcd528d3912cceca5525c6ef7c8191865e8e62d1abaa894480a403cc2e8ef6545301ca36f83b32 WHIRLPOOL 1e2e613de27e6caf449b8f3127526dc68971d08693b7235a7f504abc8cf2afcdda244f910b726e37e2554080830f13eb197424995a0a5155b73d5c538042ce5d
+DIST shorewall-5.1.4.1.tar.bz2 510816 SHA256 c561dd91c4b88ef087a6d172bafb4ac5d01c0055c47b855568536a0c422ff232 SHA512 4650e2ec73dcf6c38cf2992fefdbd2e302a34a9687a933d8a375d227df2621db96c9a2e54ebbfac50014152caffc0736a7bc1192f479c69c56f78f7874bc09b3 WHIRLPOOL 065cbd0f4e07a09e5326968680919de7fb988db092a406b0e809335374e8c5e68c0c8e4abeb4b8bd7dbb727869bcb7e0dc65bc38c33d783ff355943966183287
 DIST shorewall-5.1.4.tar.bz2 509894 SHA256 e25cfac5ea16309d5b24f1d4b9612ca2f3ba724f6d09acd8a99de697d0972f29 SHA512 67da4db601981071d030c3e2000899ea599b6b69465c9b778fc7d6afed0a4dec4c52f3d5cbfcd54ca4fdce64af19ba24508a6144fa19445a53939348bf6b96ac WHIRLPOOL 2223b8018264b36fb5b5e60dc19cf01105fa8fcc049087471518b01830a2a6c86206bdaaac03bb31fc47bf7c659c0857baa3a7ff37c22e902557bcfcbb8bf60f
 DIST shorewall-core-5.0.15.3.tar.bz2 65108 SHA256 0d174d9aabd3608e000a4536470b35d15a856d7394f5e8bd22ef410d8501b989 SHA512 4a5cca151bc5e8e538e7cb0f4d36461e32232bc7d94e72f82ddefc8c4d5622f14d8c625892295275b41b5ca99dc5217e3fafbf9c1d25d872117f78eed621575c WHIRLPOOL 71f0011684a1bfadaa5439eaa4e0852189262381a1a39b6c17e6f3ee0d4e397faf6ec5516b0288ac9a80896d56f275ae1c85b385adf69d98b4a780a60491e7bf
 DIST shorewall-core-5.0.15.6.tar.bz2 65272 SHA256 6b1c461494922f207397ce2d9ed12b0a105d82ee3528a02a4448bc6c028623b8 SHA512 5e33ef55c4ca43a5c49747d5b3f40c9f43b0696e7084a6db56df73810551d216bd313860eb5354f50b1f9849c4d332f665e3f4832ff1cf3a9542bb6a43a73119 WHIRLPOOL 1b66e763e0d37b78b0343c8ad4964d46459347114bbebfeb965af075d73bbf71a8c695310f051f4160e5dd1cc7033e32545a5404538acce7d0452aa1618af4cd
+DIST shorewall-core-5.1.4.1.tar.bz2 75813 SHA256 3d1446f7e437104c8f8c7257ccdbddfc0dc7df3ea68b80274c11dd94cc1c8629 SHA512 118378698e0fa1216b52ace92fe9eae0f7d32c39becbc50837a895d7367674b2c973b1633c8919045d9d16dd2a5fdbedb9d62ff1513547ee4770a2e9116d8b1e WHIRLPOOL 02ef5428faeb68f2ca3cf6c1e00ab15d0146d5ad931942528ba1832ce96e490df67976a40ed576014f30f06e2e4869ba691c1606d57b22364ab2e6b7ed32a019
 DIST shorewall-core-5.1.4.tar.bz2 75254 SHA256 3a4c287fed059e476fbfa0ccaf10d99cbb2c512a502b0bdb391dbf76ad6cad8a SHA512 f11c53465d8b9cd68f757377bb547e056e88220220fde915a871dbd18ffbde0044efe91b6acbeaf353f9a7f9b12a2b2a48b5bb372a4cbe59307f6b927214a1db WHIRLPOOL 01b0fb3b2f19ff7057f903106e049c751aebcdc208759e01c389e28c28de2dac9827126303343aab254fcb10d7d5d22c43bd4949aeec9d054477751e6fe0e901
 DIST shorewall-docs-html-5.0.15.3.tar.bz2 4290905 SHA256 5e519eb6956fb51058e7c977f7130ab4c91b519097c624c83de980808e555849 SHA512 bca31dcb50246aa081512ee61c6e46545361777c9b033912023624872d7fb8fb4fc0b0b821fd0422698fab9000b4f087b8f4ef6799ee2d55b5f3cfbf81276a87 WHIRLPOOL 84c6c3777cfd228ef98880c84832fd5e23ae46fb38397783ad3dacd93eb57e5e0dc662014d3c9e98a1cd4647e3b84a84ecd3564be098a3ca20820215ae4b13db
 DIST shorewall-docs-html-5.0.15.6.tar.bz2 4290931 SHA256 e6b253591fd9df7d00bf0bbcfd9c563f4248013119e13b22b34d947b244ce4e4 SHA512 e1304ea2b0e05645654b04ea825d255de70e02edc5f183dcf9eba88641aaeda8cd9781bf46a84b98628a7ed148bf1450e37e7871ef2a577e54ffd3707d7d85c3 WHIRLPOOL f1c038886f1428480c1f6b6be688717cee11717a8ae2b31ea35aef915245d2e46f7934e5bc0e54aaca7a9c83b0328cb3e96c949ed96730bada25896d85fbbf4a
+DIST shorewall-docs-html-5.1.4.1.tar.bz2 4284060 SHA256 0d077e38503832e75f5432d4a1b1c478f0ef02576c8aeb00480a3a101ec9a105 SHA512 ccc36bae8daacf3dca75002bee207abba667bd9a467afbde7f6cb1c18fa5d33fa53a4f93dfabfe0e85fd479449ebff2d12851cba5b494b7f3ce256cd79328687 WHIRLPOOL fa3c5a2abd61d005003f090492801a7a2c88512d28ed3ba174d4ecc998236132e7d923f780de30edcad44fe5fcc684bba13441f5fb9a1974d915607b4fd62eda
 DIST shorewall-docs-html-5.1.4.tar.bz2 4284146 SHA256 c17bf2f6f7448a89a97afa00425a503d1cc202a042af096bbacec6b66ced22e0 SHA512 5be7f4f5725e5a4ff2c8314ff869a9d902184f1050b26dda1be0febdd4d7dc997a45a5f286d9857539241e1bc9bfc1910fa89005672619c61c1628d565cb6478 WHIRLPOOL 0b64bce92e26ef2a22a2b48b54fd5ac3c4be15946ba936ebf0875f38c3401b19f24b572a14d811a5fd0b3b175f8d8400c85fd434db8bf3e53bf785ae56514a29
 DIST shorewall-init-5.0.15.3.tar.bz2 42608 SHA256 00fc0f1bd04010626debf8b076b5b4e9a7451eff9d813ee6bf9cd507679a6443 SHA512 fae316724fe64cc93e20f08e221959156f59abc0b9349f830f6f4f8ba6be9f0a4ffedf68db5ee18b1a765c4ab51a3c9cb8153b70f1319b2b3bde38086208c628 WHIRLPOOL 35a5b06fe158ff4d173dec2246cdd329bcd573021b7e49db70065f9ea4ac3e5ca0321ed7ada9347eb0753fb68dfbd37ed6d65c599b005b25f024ffafe6a5882e
 DIST shorewall-init-5.0.15.6.tar.bz2 42934 SHA256 c7afa1aff586186c4ce0cbe0f4e0fc06a84e936349f3dc69c84ef97c815fc6c1 SHA512 11c639b20992005e74ccd4aaa855a519fe6f96b030f171e91d68ec4ba1ca5ff5f73c6a1c823c5ffc88e3ad8e3cc2809dd24a91e0c892ab1f71d6c957113367e9 WHIRLPOOL c1190c31f5c2556fa7e73385856c8bbeb3b0cadb5ebed834e9b2138eee90059a864d85301095d3accdf537b6b4347cffe213d26c6a2201e040887647c65f4291
+DIST shorewall-init-5.1.4.1.tar.bz2 30878 SHA256 c61b83601d3a4bb10e2bd8705682ddbed5ab3adcdc6074bc1ca4cb8d030e84e9 SHA512 4b9fa872a1ce0535d9c9054ad8e9750f7f797c4fd14777c77554c5218162882973fe1caf22c7242b6b38b4a5c2a122e901851757e86a560ea5f8030be063b70a WHIRLPOOL 76a360c00dc9c28576cb121360372b1218c7a9c399e89ae3366458e5aa2f5f20c7845fc4a49de5a55619e7589372c5b07eeea195604e4a4eac380739659611f1
 DIST shorewall-init-5.1.4.tar.bz2 30353 SHA256 f8d75ff55bf2264a8961f16dbd8cd69054f7e1f3e4eb5e52a9f1aab2096fdaca SHA512 de9c712bd35adf6156bf51fb1a7482b7d8019feba6e1c596eb16bc15cd8ebd834b674895c285f9e9b0b359fa807e338678a29977b4009a8584ab5e11073f5c3e WHIRLPOOL 4cab6192321768b377d531d6424ed5aef7ec2c1ad54313a8799711d7733a0d5becd1c7d02be17c1e9c59b06189e43493a16d5dac7e05edc25c7e0f1c63f0395d
 DIST shorewall-lite-5.0.15.3.tar.bz2 59024 SHA256 5e32b0346edea2ceef4930b80e1a5797048c4e419c96a870499ea0d6336e9eef SHA512 c71957f243e5e93810f04bfb4154a6bc0ae96ea7040753d15a4856d3b7d153871e29394b07ff1fba92a7f832a3880a6e58ac55303ae7c81e5df8ace7fadd8129 WHIRLPOOL b864fb2f776540d26e578ba038368ae9d014979fff9008ce9241d1acd893ac41df46696a2513866c280cd86d363257e8b9b1f2f47237c13f54d489a034adc5a6
 DIST shorewall-lite-5.0.15.6.tar.bz2 59347 SHA256 393a2aea8fe8c9d43babaad969e00c80508900123d78a0433d3a3ac6470fd6a8 SHA512 e49f74bfa39d65fffca00657487bc4d8600d6330af0413d3b146ff9192769def1e3f66e181c02bf541d50b73e327ff4035f86fd4ded5a133fc02b84c958a4bbc WHIRLPOOL 85e25de97e5594ae41e2277f6a48500d14add389710c0727483a270b8d071dec2ef66c8d2633b96a34109b432c4025832cdb7c05c9eb4de4d8ac9aba755651e8
+DIST shorewall-lite-5.1.4.1.tar.bz2 36647 SHA256 e90d419ed8a6da615c3a0d6fdcb9481f8e71f89c2bdcff09ab027198ca2ce293 SHA512 c06e365d06c484e7ef673e5a8597d70996f1008a00163aae2d7a53d0d720739a8b0317a093b3e75487ef1c8a02ac4c4c542480757226a974671f82ab08353896 WHIRLPOOL 0077886083aadcc5973c6f515da8e99fdbbcc4e64e0e4cc4893a47cda7afc17331d2ff175da314aa38dc0186ea074bee65facacc5dc7212c0c8836cbfc0c9a02
 DIST shorewall-lite-5.1.4.tar.bz2 36155 SHA256 293ec572444ec5ff1119dd2cab0bc1fcc3e5ff5483ddea5d08cff566035bb363 SHA512 5093fe0d85049b7495bfefbc2525c935db21e10731389451f787c7fd0e9c7fa0258a6de1100633db1056562d912e68639e22285260a642fa40806360ab89f352 WHIRLPOOL f63315b05535ba7185b3ff2d4955c22c8e3e97a83e24cf04936c0436d369b389e96ee1483261e1a520ae13611c7e38b070f93861a5a06ef84b522105f18a3712
 DIST shorewall6-5.0.15.3.tar.bz2 241045 SHA256 79b91e33b24ac620a682e91c48ca18590dbac33e36c0fea37bdb2b1f3db47d7e SHA512 141fe6e23883d71f3d1fb8cb3d305a5eb439170430d71c9a066feb2acd734d4db54f386c91345c91c14f017ca5b4da7b08ad521e580545632411ae4c43d99e5b WHIRLPOOL 03c2f0731f988d094c96dd74271437c8bddc494b780980edab914c77944ded0343d6df0b94b871e33508d293f9ccfde89e4023a56b0ca2866433aa1c87ac2595
 DIST shorewall6-5.0.15.6.tar.bz2 240682 SHA256 1434b973e76ed75080aa1853986406a2346e57f0f21b094a2e1793a8b6bd7ee4 SHA512 26ea371bf40548ceda7bff786b790dd74e9a1a74a3745dcc683e7101ea5303eef87006116704d15aa688b0c40c0777c7732a7727fe714c71c8566b85ae4c560a WHIRLPOOL 92097d48bcd77ff814ab2ce9a0edb9514f2ec2e27725fd01492982ae9e4731e4366b6a5a10d903122ec7e0c43a4107d370b8f2ee11dc213a9ae78a19df6dd172
+DIST shorewall6-5.1.4.1.tar.bz2 224863 SHA256 e3da805b4aa1e8c483f1bb451cb47a869e1977b213a86145a82d42e9bc12ea36 SHA512 3b5c228693936103eb1479e5b0968c5a7d24d94beea410b3ad79f9e7e3b32cca286384b91ee3b09ce006758d27f9b2efe22c589d07d05eeef9ef981818da0b80 WHIRLPOOL 810739511bfb730c6040c8cd9a8a06c836e085a70ea5b4e148d3d364d92648e194ce2b4f1e4a0535a0860a138d87744ddacb229312100242e36828f7e348514f
 DIST shorewall6-5.1.4.tar.bz2 224287 SHA256 bac38ea334dcc5ce7e505ee3a484ca2b739e119c030e815839455c41114b3ebb SHA512 1e7c3fbe91d5ca3f06a0e31bbe7659c29e3c4e2c6d87ec0eb449e09c321b7eb16458cfc73e054dd6f04deb9dc4e45da8279d611bd8424f36624e4027a7cc3c19 WHIRLPOOL 0eba307ed1a453f28f7dbd3ffaa6d25ed68f7cf2f836ed6bb6d8945b0af6bccc88310baa58864fd87475a63f589cad4882f832acfb6436dd73ba511b9edd3287
 DIST shorewall6-lite-5.0.15.3.tar.bz2 58442 SHA256 822e6fbf3f2f7bef8db2424f6c40ad03b492ce7305d95b123ad2b1d1329e396a SHA512 f8bf47f2d39857df9579b8bacc32ef87159b5502cd4fed1761fca21d14a902122c30d87ce2a8af9a309c32d826238c5f966416cccc6bb1fe93271f45902d867d WHIRLPOOL 40d37102e415c3b13560159cd994a9baeeefa96f641e5bf6133212a084ff5bc2a54abcbe34901f35b5d0faef671b908fa19a873f0a98d8e074f6731bfae46ec1
 DIST shorewall6-lite-5.0.15.6.tar.bz2 58776 SHA256 1d693d3815bd0c2e4a9e7acad7be38ff2b354681da847a5ec4b8d87ca860378f SHA512 83cab85eda851e071eb004688b10a70811bd6f896c831e97713c48b322ee419ed9fc8ac7570b4faf567be317ca1d6f5c89c1e0da0e025a94abe39aa0f000e9ad WHIRLPOOL 842e02fe907854682b54343750df60b0e4c60613eca675d69c071c4d726a05d5d940c8283e9b718413520b3ccc11a01913dabba49189c41a61aa756645a401ae
+DIST shorewall6-lite-5.1.4.1.tar.bz2 36362 SHA256 29a2f2be295b4f995b38e663b771660ccdc6321134bcfbd0f9378f9bb1237e3c SHA512 b616c5886b5bc274e88052359ca4c8aa6df60a9706958698eac7fc362f1c893de00ed2272535d61a88cb6a786bae9b7cba64a835833a9f81c991fb2ffed8244b WHIRLPOOL 519aee8ad997c14f4337824d40c38cbf7ba2d2ac7db0964c2557816e0d4c4dca24ed2ac69341473e899d0e9e84d367a9e6f42b2484221257bdd55b40c73ee201
 DIST shorewall6-lite-5.1.4.tar.bz2 35837 SHA256 732fe79096e164c641f3e3744e840ac4ac7ed5e6777a0beeb402d237f48a3b24 SHA512 987f925bd4559064878dfef11026d4a8938c9656be5c3587346ed8e6157bfb7890dd9a6a3fcbdd8eeb4a859c657aa3235279fa6e0de15740c8a4d22323038ce5 WHIRLPOOL fb0cab6f0b89c23a7f9db08cd50ee18b2f0cbeca305470ec5275b8298f7db62aa6dbccaaf52b3e07379049b7c1dbe856b6d8e0cd2780a2c055e3208b65e6d44d
diff --git a/net-firewall/shorewall/shorewall-5.1.4.1.ebuild b/net-firewall/shorewall/shorewall-5.1.4.1.ebuild
new file mode 100644
index 000000000000..ea2ef11ce095
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.4.1.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+# shorewall
+MY_PN_IPV4=Shorewall
+MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
+
+# shorewall6
+MY_PN_IPV6=Shorewall6
+MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
+
+# shorewall-lite
+MY_PN_LITE4=Shorewall-lite
+MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
+
+# shorewall6-lite
+MY_PN_LITE6=Shorewall6-lite
+MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
+
+# shorewall-init
+MY_PN_INIT=Shorewall-init
+MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
+
+# shorewall-core
+MY_PN_CORE=Shorewall-core
+MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
+
+# shorewall-docs-html
+MY_PN_DOCS=Shorewall-docs-html
+MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
+
+# Upstream URL schema:
+# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
+# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
+# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
+
+MY_URL_PREFIX=
+MY_URL_SUFFIX=
+if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
+	MY_URL_PREFIX='development/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
+"
+
+# - Shorewall6 requires Shorewall
+# - Installing Shorewall-init or just the documentation doesn't make any sense,
+#   that's why we force the user to select at least one "real" Shorewall product
+#
+# See http://shorewall.net/download.htm#Which
+REQUIRED_USE="
+	ipv6? ( ipv4 )
+	|| ( ipv4 lite4 lite6 )
+"
+
+# No build dependencies! Just plain shell scripts...
+DEPEND=""
+
+RDEPEND="
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+	ipv4? (
+		>=dev-lang/perl-5.16
+		virtual/perl-Digest-SHA
+	)
+	ipv6? (
+		>=dev-perl/Socket6-0.230.0
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	lite6? (
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	init? ( >=sys-apps/coreutils-8.20 )
+	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
+	!net-firewall/shorewall-core
+	!net-firewall/shorewall6
+	!net-firewall/shorewall-lite
+	!net-firewall/shorewall6-lite
+	!net-firewall/shorewall-init
+	!<sys-apps/systemd-214
+"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
+
+	if use ipv4 || use lite4; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
+
+		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
+		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
+	fi
+
+	if use ipv6 || use lite6; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
+
+		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
+		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
+	fi
+
+	check_extra_config
+}
+
+pkg_setup() {
+	if [[ -n "${DIGEST}" ]]; then
+		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
+		unset DIGEST
+	fi
+}
+
+src_prepare() {
+	# We are moving each unpacked source from MY_P_* to MY_PN_*.
+	# This allows us to use patches from upstream and keeps epatch_user working
+
+	einfo "Preparing shorewallrc ..."
+	cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# shorewall-core
+	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
+	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
+	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+	eend 0
+
+	# shorewall
+	if use ipv4; then
+		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-init
+	if use init; then
+		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
+		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
+		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
+		eend 0
+
+		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || die
+	fi
+
+	# shorewall-docs-html
+	if use doc; then
+		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
+	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
+
+	# shorewall
+	if use ipv4; then
+		einfo "Installing ${MY_P_IPV4} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
+		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
+
+		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
+			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
+			# so we don't need a logrotate configuration file for shorewall-init
+			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		# Show first steps for shorewall/shorewall6
+		local _PRODUCTS=""
+		if use ipv4; then
+			_PRODUCTS="shorewall"
+
+			if use ipv6; then
+				_PRODUCTS="${_PRODUCTS}/shorewall6"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
+			elog ""
+			elog "  /etc/shorewall/shorewall.conf"
+
+			if use ipv6; then
+				elog "  /etc/shorewall6/shorewall6.conf"
+			fi
+
+			elog ""
+			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall default"
+
+			if use ipv6; then
+				elog "  # rc-update add shorewall6 default"
+			fi
+		fi
+
+		# Show first steps for shorewall-lite/shorewall6-lite
+		_PRODUCTS=""
+		if use lite4; then
+			_PRODUCTS="shorewall-lite"
+		fi
+
+		if use lite6; then
+			if [[ -z "${_PRODUCTS}" ]]; then
+				_PRODUCTS="shorewall6-lite"
+			else
+				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			if use ipv4; then
+				elog ""
+			fi
+
+			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
+			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
+			elog ""
+			elog "To read more about ${_PRODUCTS}, please visit"
+			elog "  http://shorewall.net/CompiledPrograms.html"
+			elog ""
+			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
+			elog ""
+
+			if use lite4; then
+				elog "  # rc-update add shorewall-lite default"
+			fi
+
+			if use lite6; then
+				elog "  # rc-update add shorewall6-lite default"
+			fi
+		fi
+
+		if use init; then
+			elog ""
+			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall-init boot"
+			elog ""
+			elog "and review \$PRODUCTS in"
+			elog ""
+			elog "  /etc/conf.d/shorewall-init"
+		fi
+
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
+			# This is an upgrade
+
+			elog "You are upgrading from a previous major version. It is highly recommended that you read"
+			elog ""
+			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			if use ipv4; then
+				elog ""
+				elog "You can auto-migrate your configuration using"
+				elog ""
+				elog "  # shorewall update -A"
+
+				if use ipv6; then
+					elog "  # shorewall6 update -A"
+				fi
+
+				elog ""
+				elog "*after* you have merged the changed files using one of the configuration"
+				elog "files update tools of your choice (dispatch-conf, etc-update...)."
+
+				elog ""
+				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
+				elog "please read the shorewall[6] man page first."
+			fi
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if ! use init; then
+		elog ""
+		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
+		elog "before your shorewall-based firewall is ready to start."
+		elog ""
+		elog "To read more about shorewall-init, please visit"
+		elog "  http://www.shorewall.net/Shorewall-init.html"
+	fi
+
+	if ! has_version "net-firewall/conntrack-tools"; then
+		elog ""
+		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
+		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
+	fi
+
+	if ! has_version "dev-perl/Devel-NYTProf"; then
+		elog ""
+		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
+	fi
+}
diff --git a/net-fs/samba/samba-4.5.10.ebuild b/net-fs/samba/samba-4.5.10.ebuild
index 2b4fa50f332c..f98e768b9c2a 100644
--- a/net-fs/samba/samba-4.5.10.ebuild
+++ b/net-fs/samba/samba-4.5.10.ebuild
@@ -16,7 +16,7 @@ SRC_PATH="stable"
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 	https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.5.0_rc1.tar.xz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="alpha amd64 ppc64 x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index c0f2fe3a01a7..c5017485df3d 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,4 +1,3 @@
-DIST ejabberd-16.04.tar.gz 1715963 SHA256 3d964fe74e438253c64c8498eb7465d2440823614a23df8d33bdf40126d72cc3 SHA512 5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2 WHIRLPOOL d9018835aaa736040f63222c73b54ea65385532989390c007f4cb736b474da40d9fdceb6c377a251398fb6de87869a13dec0ac160fe9a0d081337efd35dc66b4
-DIST ejabberd-16.08.tar.gz 1739542 SHA256 b45598a6f2f1b398a19f23e3280b45eccc833d3339b1aeb6ec08ded7c19b1137 SHA512 661bf33e6d7f4c53d0c3679d1a9428fba11c22bad7d8bd535b49d7eeeff4de215a7a94f8300683e1dbaf2e68ea908f6e54cfe0ed2f1dc82326a46659e7c70f55 WHIRLPOOL 41f5ae825997818671d6db94ac62108a0b02f8eb6eed07ebaa04287ee2d7955dc4d15c3ce18cbf20240e4b2a14d48ccb8bf383b510851be12326131c4c829788
 DIST ejabberd-16.09.tar.gz 1687485 SHA256 7b44ab3af3310ca73624c47b65cf30a651d5a1398413e8af51c610d788fb8f14 SHA512 506365eff83f9ab97c9a632c4b8b2428aacbfc570c34ca65a78903d95c64755489ff7327be3efa2172c9d05d7891f83986b1ff3928a7ce806c0ab2aa5dbb647f WHIRLPOOL 6c56ad58b4e247cedf29cf247fdadddf727270311a0ba21eef88f84ee6b997ad8be75448e3bfdaa67d978ea167e2feb21bc9ce0839741a62fb60fa045e45edf2
 DIST ejabberd-17.01.tar.gz 1638418 SHA256 7efa8f25fe01bce876f9379ba7b4f49752a0fddc6a78e5ae82196fdc7f70c90b SHA512 d64125f81efbf841eded140d877c950439c11e65377e167994d25f85fa66437aad771d94548d063900bd3c472922e6bfa8f8bbe65413f18e7b641f0ed32db566 WHIRLPOOL 7b670b087cccc6b4fb804410730571175c253e094fab6fc8c9412eae4e14b844ad38596426b4334bd751a056f940dfd60c1c06d2560af5b36061eb54553886fb
+DIST ejabberd-17.04.tar.gz 1690441 SHA256 b8395bc65b09f135a60320b62338258acd6056cc241e9e245fde267fb18dd3c9 SHA512 03467434dba92bd1ff2f70d78aa8fcf86fc73cb52aaaa73e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7 WHIRLPOOL c345a6b31e5ea63d72779630d7db8868e997e876ef929dc0de3df0584ca3dcbec1d36e6bb1cacdcc3ee428f9f82b4dbc73d3f08446ace0daa8beccd2fe9a8bfe
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild b/net-im/ejabberd/ejabberd-16.04.ebuild
deleted file mode 100644
index f80f234023ac..000000000000
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-
-inherit eutils pam rebar ssl-cert systemd
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
-	riak roster-gw sqlite zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO: 	>=dev-erlang/meck-0.8.4
-# TODO: 	>=dev-erlang/moka-1.0.5b
-# TODO: )
-CDEPEND="
-	>=dev-erlang/cache_tab-1.0.2
-	>=dev-erlang/esip-1.0.4
-	>=dev-erlang/fast_tls-1.0.3
-	>=dev-erlang/fast_xml-1.1.3
-	>=dev-erlang/fast_yaml-1.0.3
-	>=dev-erlang/jiffy-0.14.7
-	>=dev-erlang/lager-3.0.2
-	>=dev-erlang/luerl-0.2
-	>=dev-erlang/p1_oauth2-0.6.1
-	>=dev-erlang/p1_utils-1.0.4
-	>=dev-erlang/p1_xmlrpc-1.15.1
-	>=dev-erlang/stringprep-1.0.3
-	>=dev-erlang/stun-1.0.3
-	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
-	<dev-lang/erlang-19
-	>=net-im/jabber-base-0.01
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
-	nls? ( >=dev-erlang/iconv-1.0.0 )
-	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/p1_pam-1.0.0 )
-	postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
-	redis? ( >=dev-erlang/eredis-1.0.8 )
-	riak? (
-		>=dev-erlang/hamcrest-0.1.0_p20150103
-		>=dev-erlang/riakc-2.1.1_p20151111
-	)
-	sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
-	zlib? ( >=dev-erlang/ezlib-1.0.1 )"
-DEPEND="${CDEPEND}
-	>=sys-apps/gawk-4.1"
-RDEPEND="${CDEPEND}
-	captcha? ( media-gfx/imagemagick[truetype,png] )"
-
-DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
-
-EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
-# Paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-
-# Adjust example configuration file to Gentoo.
-# - Use our sample certificates.
-# - Correct PAM service name.
-adjust_config() {
-	sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
-		-e "s|\"pamservicename\"|\"xmpp\"|" \
-		-i "${S}/ejabberd.yml.example" \
-		|| die 'failed to adjust example config'
-}
-
-# Set paths to ejabberd lib directory consistently to point always to directory
-# suffixed with version.
-correct_ejabberd_paths() {
-	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
-		-i "${S}/Makefile.in" \
-		|| die 'failed to set ejabberd path in Makefile.in'
-	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
-		-i "${S}/ejabberdctl.template" \
-		|| die 'failed to set ejabberd path in ejabberdctl.template'
-	sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|' \
-		-i "${S}/ejabberd.yml.example" \
-		|| die 'failed to correct path to captcha.sh in example config'
-}
-
-# Get epam-wrapper from 'files' directory and correct path to lib directory in
-# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
-# file exists there already.
-customize_epam_wrapper() {
-	local epam_wrapper_src="$1"
-	local epam_wrapper_dst="${S}/epam-wrapper"
-
-	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
-	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
-		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
-		|| die 'failed to install epam-wrapper'
-}
-
-# Check if there already exists a certificate.
-ejabberd_cert_exists() {
-	local cert
-
-	for cert in $(gawk -- \
-			'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m) {print m[1];}' \
-			"${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do
-		[[ -f ${cert} ]] && return 0
-	done
-
-	return 1
-}
-
-# Generate and install sample ejabberd certificate. It's installed into
-# EJABBERD_CERT path.
-ejabberd_cert_install() {
-	SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
-	install_cert "${EJABBERD_CERT%.*}"
-	chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
-	chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
-}
-
-# Get path to ejabberd lib directory.
-get_ejabberd_path() {
-	echo "$(get_erl_libs)/${P}"
-}
-
-# Make ejabberd.service for systemd from upstream provided template.
-make_ejabberd_service() {
-	sed -r \
-		-e 's!@ctlscriptpath@!/usr/sbin!' \
-		-e 's!(User|Group)=(.*)!\1=jabber!' \
-		"${PN}.service.template" >"${PN}.service" \
-		|| die 'failed to make ejabberd.service'
-}
-
-# Set paths to defined by net-im/jabber-base.
-set_jabberbase_paths() {
-	sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
-		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
-		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
-		-i "${S}/Makefile.in" \
-		|| die 'failed to set paths in Makefile.in'
-	sed -e "s|\(ETC_DIR=\){{sysconfdir}}.*|\1${JABBER_ETC}|" \
-		-e "s|\(LOGS_DIR=\){{localstatedir}}.*|\1${JABBER_LOG}|" \
-		-e "s|\(SPOOL_DIR=\){{localstatedir}}.*|\1${JABBER_SPOOL}|" \
-		-i "${S}/ejabberdctl.template" \
-		|| die 'failed to set paths ejabberdctl.template'
-}
-
-# Skip installing docs because it's only COPYING that's installed by Makefile.
-skip_docs() {
-	gawk -i inplace '
-/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
-	if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
-		print $0;
-	} else {
-		next;
-	}
-}
-1
-' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
-}
-
-src_prepare() {
-	default
-
-	rebar_remove_deps
-	correct_ejabberd_paths
-	set_jabberbase_paths
-	make_ejabberd_service
-	skip_docs
-	adjust_config
-	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--libdir="${EPREFIX}$(get_erl_libs)" \
-		--enable-user=jabber \
-		$(use_enable debug) \
-		$(use_enable full-xml) \
-		$(use_enable hipe) \
-		$(use_enable mssql) \
-		$(use_enable mysql) \
-		$(use_enable nls iconv) \
-		$(use_enable odbc) \
-		$(use_enable pam) \
-		$(use_enable postgres pgsql) \
-		$(use_enable redis) \
-		$(use_enable riak) \
-		$(use_enable roster-gw roster-gateway-workaround) \
-		$(use_enable sqlite) \
-		$(use_enable zlib)
-}
-
-src_compile() {
-	emake REBAR='rebar -v' src
-}
-
-src_install() {
-	default
-
-	if use pam; then
-		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
-
-		pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
-		into "$(get_ejabberd_path)/priv"
-		newbin epam-wrapper epam
-		# PAM helper module permissions
-		# https://www.process-one.net/docs/ejabberd/guide_en.html#pam
-		fowners root:jabber "${epam_path}"
-		fperms 4750 "${epam_path}"
-	fi
-
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	systemd_dounit "${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "For configuration instructions, please see"
-		elog "  http://www.process-one.net/en/ejabberd/docs/"
-		echo
-		if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then
-			ewarn "If you have used pubsub in ejabberd-2.* you may encounter issues after"
-			ewarn "migration to ${PV}. pubsub data may not be migrated automatically and"
-			ewarn "you may need to run migration script manually, see:"
-			ewarn
-			ewarn "  https://github.com/processone/ejabberd/issues/479#issuecomment-124497456"
-			ewarn
-			ewarn "In case you don't care about all stored moods, activities, geoinfo and you"
-			ewarn "know you don't store in pubsub anything important, you can just remove"
-			ewarn "pubsub tables:"
-			ewarn
-			ewarn "  rm ${EROOT%/}${JABBER_SPOOL}/pubsub_*"
-			ewarn
-			ewarn "See also: https://bugs.gentoo.org/show_bug.cgi?id=588244"
-			echo
-		fi
-	elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then
-		elog "Ejabberd now defaults to using a YAML format for its config file."
-		elog "The old ejabberd.cfg file can be converted using the following instructions:"
-		echo
-		elog "1. Make sure all processes related to the previous version of ejabberd aren't"
-		elog "   running. Usually this just means the ejabberd and epmd daemons and possibly"
-		elog "   the pam-related process (epam) if pam support is enabled."
-		elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can"
-		elog "   fail to start ejabberd properly for various reasons. Check ejabberd's main"
-		elog "   log file at /var/log/jabber/ejabberd.log to confirm it started successfully."
-		elog "3. Run"
-		elog "     \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`"
-		elog "   with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to"
-		elog "   /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config"
-		elog "   file."
-		echo
-	fi
-
-	if ! ejabberd_cert_exists; then
-		ejabberd_cert_install
-	fi
-}
diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild b/net-im/ejabberd/ejabberd-16.09.ebuild
index 5c38212a5f7e..99e4a3aabcc2 100644
--- a/net-im/ejabberd/ejabberd-16.09.ebuild
+++ b/net-im/ejabberd/ejabberd-16.09.ebuild
@@ -46,7 +46,8 @@ CDEPEND="
 	mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
 	nls? ( >=dev-erlang/iconv-1.0.2 )
 	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/p1_pam-1.0.0 )
+	pam? ( >=dev-erlang/epam-1.0.0
+		<dev-erlang/epam-1.0.1 )
 	postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
 	redis? ( >=dev-erlang/eredis-1.0.8 )
 	riak? (
@@ -106,6 +107,15 @@ customize_epam_wrapper() {
 		|| die 'failed to install epam-wrapper'
 }
 
+# Disable mod_irc in example configuration file.
+disable_mod_irc() {
+	local needs_iconv='needs dev-erlang/iconv (+nls USE flag)'
+	sed -r \
+		-e "s@^(\s*)(mod_irc\s*:.*$)@\1## \2 # ${needs_iconv}@" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to modify example config'
+}
+
 # Check if there already exists a certificate.
 ejabberd_cert_exists() {
 	local cert
@@ -137,6 +147,12 @@ get_ejabberd_path() {
 	echo "/usr/$(get_libdir)/${P}"
 }
 
+# Check whether mod_irc is enabled in ejabberd configuration on target system.
+is_mod_irc_enabled() {
+	egrep '^(\s*)(mod_irc\s*:.*$)' \
+		"${EROOT%/}${JABBER_ETC}/ejabberd.yml"
+}
+
 # Make ejabberd.service for systemd from upstream provided template.
 make_ejabberd_service() {
 	sed -r \
@@ -183,6 +199,7 @@ src_prepare() {
 	make_ejabberd_service
 	skip_docs
 	adjust_config
+	use nls || disable_mod_irc
 	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
 
 	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
@@ -293,4 +310,9 @@ pkg_postinst() {
 		chmod g+r "${EROOT%/}${epam_path}" \
 			|| die "failed to correct ${epam_path} permissions"
 	fi
+
+	if ! use nls && is_mod_irc_enabled; then
+		ewarn "nls support (dev-erlang/iconv) is required by mod_irc. Either rebuild ejabberd"
+		ewarn "with nls enabled or disable mod_irc in ${EROOT%/}${JABBER_ETC}/ejabberd.yml."
+	fi
 }
diff --git a/net-im/ejabberd/ejabberd-16.08.ebuild b/net-im/ejabberd/ejabberd-17.01-r1.ebuild
similarity index 83%
rename from net-im/ejabberd/ejabberd-16.08.ebuild
rename to net-im/ejabberd/ejabberd-17.01-r1.ebuild
index 6c3e31acaf74..7c2e9586ebdf 100644
--- a/net-im/ejabberd/ejabberd-16.08.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01-r1.ebuild
@@ -28,34 +28,35 @@ RESTRICT="test"
 # TODO: 	>=dev-erlang/moka-1.0.5b
 # TODO: )
 CDEPEND="
-	>=dev-erlang/cache_tab-1.0.3
-	>=dev-erlang/esip-1.0.7
-	>=dev-erlang/fast_tls-1.0.6
-	>=dev-erlang/fast_xml-1.1.14
-	>=dev-erlang/fast_yaml-1.0.5
-	>=dev-erlang/jiffy-0.14.7
+	>=dev-erlang/cache_tab-1.0.6
+	>=dev-erlang/esip-1.0.10
+	>=dev-erlang/fast_tls-1.0.10
+	>=dev-erlang/fast_xml-1.1.19
+	>=dev-erlang/fast_yaml-1.0.8
+	>=dev-erlang/jiffy-0.14.8
 	>=dev-erlang/lager-3.2.1
 	>=dev-erlang/luerl-0.2
 	>=dev-erlang/p1_oauth2-0.6.1
-	>=dev-erlang/p1_utils-1.0.5
-	>=dev-erlang/p1_xmlrpc-1.15.1
-	>=dev-erlang/stringprep-1.0.5
-	>=dev-erlang/stun-1.0.6
+	>=dev-erlang/p1_utils-1.0.6
+	>=dev-erlang/stringprep-1.0.7
+	>=dev-erlang/stun-1.0.9
+	>=dev-erlang/xmpp-1.1.6
 	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
 	>=net-im/jabber-base-0.01
 	ldap? ( =net-nds/openldap-2* )
-	mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
-	nls? ( >=dev-erlang/iconv-1.0.1 )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
+	nls? ( >=dev-erlang/iconv-1.0.3 )
 	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/p1_pam-1.0.0 )
-	postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
+	pam? ( >=dev-erlang/epam-1.0.0-r1
+		<dev-erlang/epam-1.0.1 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.2 )
 	redis? ( >=dev-erlang/eredis-1.0.8 )
 	riak? (
 		>=dev-erlang/hamcrest-0.1.0_p20150103
-		>=dev-erlang/riakc-2.1.1_p20151111
+		>=dev-erlang/riakc-2.4.1
 	)
 	sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
-	zlib? ( >=dev-erlang/ezlib-1.0.1 )"
+	zlib? ( >=dev-erlang/ezlib-1.0.2 )"
 DEPEND="${CDEPEND}
 	>=sys-apps/gawk-4.1"
 RDEPEND="${CDEPEND}
@@ -107,6 +108,15 @@ customize_epam_wrapper() {
 		|| die 'failed to install epam-wrapper'
 }
 
+# Disable mod_irc in example configuration file.
+disable_mod_irc() {
+	local needs_iconv='needs dev-erlang/iconv (+nls USE flag)'
+	sed -r \
+		-e "s@^(\s*)(mod_irc\s*:.*$)@\1## \2 # ${needs_iconv}@" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to modify example config'
+}
+
 # Check if there already exists a certificate.
 ejabberd_cert_exists() {
 	local cert
@@ -138,6 +148,12 @@ get_ejabberd_path() {
 	echo "/usr/$(get_libdir)/${P}"
 }
 
+# Check whether mod_irc is enabled in ejabberd configuration on target system.
+is_mod_irc_enabled() {
+	egrep '^(\s*)(mod_irc\s*:.*$)' \
+		"${EROOT%/}${JABBER_ETC}/ejabberd.yml"
+}
+
 # Make ejabberd.service for systemd from upstream provided template.
 make_ejabberd_service() {
 	sed -r \
@@ -175,6 +191,19 @@ skip_docs() {
 ' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
 }
 
+pkg_setup() {
+	if use pam; then
+		einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \
+			"authentication"
+		# See
+		# <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
+		# epam binary is installed by dev-erlang/epam package, therefore SUID
+		# is set by that package. Instead of jabber group it uses epam group,
+		# therefore we need to add jabber user to epam group.
+		usermod -a -G epam jabber || die
+	fi
+}
+
 src_prepare() {
 	default
 
@@ -184,8 +213,12 @@ src_prepare() {
 	make_ejabberd_service
 	skip_docs
 	adjust_config
+	use nls || disable_mod_irc
 	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
 
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path xmpp
+
 	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
 	# rather than its parent which is default. That way ejabberd directory
 	# takes precedence is module lookup.
@@ -228,10 +261,6 @@ src_install() {
 		pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
 		into "$(get_ejabberd_path)/priv"
 		newbin epam-wrapper epam
-		# PAM helper module permissions
-		# https://www.process-one.net/docs/ejabberd/guide_en.html#pam
-		fowners root:jabber "${epam_path}"
-		fperms 4750 "${epam_path}"
 	fi
 
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
@@ -287,11 +316,8 @@ pkg_postinst() {
 		ejabberd_cert_install
 	fi
 
-	if use pam; then
-		# sfperms drops read bit from files with suid. Reapply it.
-		# Fix bug #592218.
-		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
-		chmod g+r "${EROOT%/}${epam_path}" \
-			|| die "failed to correct ${epam_path} permissions"
+	if ! use nls && is_mod_irc_enabled; then
+		ewarn "nls support (dev-erlang/iconv) is required by mod_irc. Either rebuild ejabberd"
+		ewarn "with nls enabled or disable mod_irc in ${EROOT%/}${JABBER_ETC}/ejabberd.yml."
 	fi
 }
diff --git a/net-im/ejabberd/ejabberd-17.01.ebuild b/net-im/ejabberd/ejabberd-17.01.ebuild
index 1f355ef0e527..061059b61832 100644
--- a/net-im/ejabberd/ejabberd-17.01.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01.ebuild
@@ -47,7 +47,8 @@ CDEPEND="
 	mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
 	nls? ( >=dev-erlang/iconv-1.0.3 )
 	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/p1_pam-1.0.0 )
+	pam? ( >=dev-erlang/epam-1.0.0
+		<dev-erlang/epam-1.0.1 )
 	postgres? ( >=dev-erlang/p1_pgsql-1.1.2 )
 	redis? ( >=dev-erlang/eredis-1.0.8 )
 	riak? (
@@ -107,6 +108,15 @@ customize_epam_wrapper() {
 		|| die 'failed to install epam-wrapper'
 }
 
+# Disable mod_irc in example configuration file.
+disable_mod_irc() {
+	local needs_iconv='needs dev-erlang/iconv (+nls USE flag)'
+	sed -r \
+		-e "s@^(\s*)(mod_irc\s*:.*$)@\1## \2 # ${needs_iconv}@" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to modify example config'
+}
+
 # Check if there already exists a certificate.
 ejabberd_cert_exists() {
 	local cert
@@ -138,6 +148,12 @@ get_ejabberd_path() {
 	echo "/usr/$(get_libdir)/${P}"
 }
 
+# Check whether mod_irc is enabled in ejabberd configuration on target system.
+is_mod_irc_enabled() {
+	egrep '^(\s*)(mod_irc\s*:.*$)' \
+		"${EROOT%/}${JABBER_ETC}/ejabberd.yml"
+}
+
 # Make ejabberd.service for systemd from upstream provided template.
 make_ejabberd_service() {
 	sed -r \
@@ -184,6 +200,7 @@ src_prepare() {
 	make_ejabberd_service
 	skip_docs
 	adjust_config
+	use nls || disable_mod_irc
 	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
 
 	rebar_fix_include_path fast_xml
@@ -297,4 +314,9 @@ pkg_postinst() {
 		chmod g+r "${EROOT%/}${epam_path}" \
 			|| die "failed to correct ${epam_path} permissions"
 	fi
+
+	if ! use nls && is_mod_irc_enabled; then
+		ewarn "nls support (dev-erlang/iconv) is required by mod_irc. Either rebuild ejabberd"
+		ewarn "with nls enabled or disable mod_irc in ${EROOT%/}${JABBER_ETC}/ejabberd.yml."
+	fi
 }
diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild b/net-im/ejabberd/ejabberd-17.04.ebuild
similarity index 81%
rename from net-im/ejabberd/ejabberd-16.04-r1.ebuild
rename to net-im/ejabberd/ejabberd-17.04.ebuild
index 0c2d9fcb628c..1cec62f2eba2 100644
--- a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,42 +28,42 @@ RESTRICT="test"
 # TODO: 	>=dev-erlang/moka-1.0.5b
 # TODO: )
 CDEPEND="
-	>=dev-erlang/cache_tab-1.0.2
-	>=dev-erlang/esip-1.0.4
-	>=dev-erlang/fast_tls-1.0.3
-	>=dev-erlang/fast_xml-1.1.3
-	>=dev-erlang/fast_yaml-1.0.3
-	>=dev-erlang/jiffy-0.14.7
-	>=dev-erlang/lager-3.0.2
+	>=dev-erlang/cache_tab-1.0.7
+	>=dev-erlang/esip-1.0.11
+	>=dev-erlang/fast_tls-1.0.11
+	>=dev-erlang/fast_xml-1.1.21
+	>=dev-erlang/fast_yaml-1.0.9
+	>=dev-erlang/jiffy-0.14.8
+	>=dev-erlang/lager-3.2.1
 	>=dev-erlang/luerl-0.2
 	>=dev-erlang/p1_oauth2-0.6.1
-	>=dev-erlang/p1_utils-1.0.4
-	>=dev-erlang/p1_xmlrpc-1.15.1
-	>=dev-erlang/stringprep-1.0.3
-	>=dev-erlang/stun-1.0.3
+	>=dev-erlang/p1_utils-1.0.8
+	>=dev-erlang/stringprep-1.0.8
+	>=dev-erlang/stun-1.0.10
+	>=dev-erlang/xmpp-1.1.9
 	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
-	<dev-lang/erlang-19
 	>=net-im/jabber-base-0.01
 	ldap? ( =net-nds/openldap-2* )
-	mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
-	nls? ( >=dev-erlang/iconv-1.0.0 )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
+	nls? ( >=dev-erlang/iconv-1.0.4 )
 	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/p1_pam-1.0.0 )
-	postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
+	pam? ( >=dev-erlang/epam-1.0.2 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.2 )
 	redis? ( >=dev-erlang/eredis-1.0.8 )
 	riak? (
 		>=dev-erlang/hamcrest-0.1.0_p20150103
-		>=dev-erlang/riakc-2.1.1_p20151111
+		>=dev-erlang/riakc-2.4.1
 	)
 	sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
-	zlib? ( >=dev-erlang/ezlib-1.0.1 )"
+	zlib? ( >=dev-erlang/ezlib-1.0.2 )"
 DEPEND="${CDEPEND}
 	>=sys-apps/gawk-4.1"
 RDEPEND="${CDEPEND}
 	captcha? ( media-gfx/imagemagick[truetype,png] )"
 
 DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
+	"${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" )
 
 EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
 # Paths in net-im/jabber-base
@@ -108,6 +108,15 @@ customize_epam_wrapper() {
 		|| die 'failed to install epam-wrapper'
 }
 
+# Disable mod_irc in example configuration file.
+disable_mod_irc() {
+	local needs_iconv='needs dev-erlang/iconv (+nls USE flag)'
+	sed -r \
+		-e "s@^(\s*)(mod_irc\s*:.*$)@\1## \2 # ${needs_iconv}@" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to modify example config'
+}
+
 # Check if there already exists a certificate.
 ejabberd_cert_exists() {
 	local cert
@@ -139,6 +148,12 @@ get_ejabberd_path() {
 	echo "/usr/$(get_libdir)/${P}"
 }
 
+# Check whether mod_irc is enabled in ejabberd configuration on target system.
+is_mod_irc_enabled() {
+	egrep '^(\s*)(mod_irc\s*:.*$)' \
+		"${EROOT%/}${JABBER_ETC}/ejabberd.yml"
+}
+
 # Make ejabberd.service for systemd from upstream provided template.
 make_ejabberd_service() {
 	sed -r \
@@ -176,6 +191,19 @@ skip_docs() {
 ' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
 }
 
+pkg_setup() {
+	if use pam; then
+		einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \
+			"authentication"
+		# See
+		# <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
+		# epam binary is installed by dev-erlang/epam package, therefore SUID
+		# is set by that package. Instead of jabber group it uses epam group,
+		# therefore we need to add jabber user to epam group.
+		usermod -a -G epam jabber || die
+	fi
+}
+
 src_prepare() {
 	default
 
@@ -185,8 +213,13 @@ src_prepare() {
 	make_ejabberd_service
 	skip_docs
 	adjust_config
+	use nls || disable_mod_irc
 	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
 
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path p1_utils
+	rebar_fix_include_path xmpp
+
 	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
 	# rather than its parent which is default. That way ejabberd directory
 	# takes precedence is module lookup.
@@ -229,10 +262,6 @@ src_install() {
 		pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
 		into "$(get_ejabberd_path)/priv"
 		newbin epam-wrapper epam
-		# PAM helper module permissions
-		# https://www.process-one.net/docs/ejabberd/guide_en.html#pam
-		fowners root:jabber "${epam_path}"
-		fperms 4750 "${epam_path}"
 	fi
 
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
@@ -288,11 +317,8 @@ pkg_postinst() {
 		ejabberd_cert_install
 	fi
 
-	if use pam; then
-		# sfperms drops read bit from files with suid. Reapply it.
-		# Fix bug #592218.
-		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
-		chmod g+r "${EROOT%/}${epam_path}" \
-			|| die "failed to correct ${epam_path} permissions"
+	if ! use nls && is_mod_irc_enabled; then
+		ewarn "nls support (dev-erlang/iconv) is required by mod_irc. Either rebuild ejabberd"
+		ewarn "with nls enabled or disable mod_irc in ${EROOT%/}${JABBER_ETC}/ejabberd.yml."
 	fi
 }
diff --git a/net-im/ejabberd/files/ejabberd-16.04-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-16.04-ejabberdctl.patch
deleted file mode 100644
index de2acd5aa017..000000000000
--- a/net-im/ejabberd/files/ejabberd-16.04-ejabberdctl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Set SHELL since the generic jabber user used on Gentoo for jabber servers
-doesn't have a valid shell set by default and fix EXEC_CMD otherwise it fails
-with "This account is currently not available" again due to jabber not having
-a valid shell.
-
-Also, workaround the assumption that jabber's $HOME is a directory when instead
-it defaults to /dev/null on Gentoo.
-
---- a/ejabberdctl.template	2016-01-12 11:07:58.000000000 +0000
-+++ b/ejabberdctl.template	2016-02-15 21:36:27.508297627 +0000
-@@ -16,6 +16,7 @@
- EPMD={{bindir}}/epmd
- INSTALLUSER={{installuser}}
- ERL_LIBS={{libdir}}
-+SHELL=/bin/sh
- 
- # check the proper system user is used if defined
- if [ "$INSTALLUSER" != "" ] ; then
-@@ -23,11 +24,11 @@
-     for GID in `id -G`; do
-         if [ $GID -eq 0 ] ; then
-             INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6)
--            if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then
-+            if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then
-                 mkdir -p "$INSTALLUSER_HOME"
-                 chown "$INSTALLUSER" "$INSTALLUSER_HOME"
-             fi
--            EXEC_CMD="su $INSTALLUSER -c"
-+            EXEC_CMD="su $INSTALLUSER -p -c"
-         fi
-     done
-     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
-@@ -100,6 +101,7 @@
- DATETIME=`date "+%Y%m%d-%H%M%S"`
- ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
- ERL_INETRC=$ETC_DIR/inetrc
-+HOME=$SPOOL_DIR
- 
- # define mnesia options
- MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS"
-@@ -159,6 +161,8 @@
- export CONTRIB_MODULES_PATH
- export CONTRIB_MODULES_CONF_DIR
- export ERL_LIBS
-+export HOME
-+export SHELL
- 
- shell_escape()
- {
diff --git a/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch b/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch
new file mode 100644
index 000000000000..0a42f549b58c
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch
@@ -0,0 +1,53 @@
+From 4086249e78cde107df84e6ad022e9d9821cecc40 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Sun, 28 May 2017 14:22:08 +0100
+Subject: [PATCH] Don't configure or compile deps
+
+---
+ rebar.config.script | 23 -----------------------
+ 1 file changed, 23 deletions(-)
+
+diff --git a/rebar.config.script b/rebar.config.script
+index 19142b9e..04f8b310 100644
+--- a/rebar.config.script
++++ b/rebar.config.script
+@@ -242,27 +242,6 @@ CtParams = fun(CompileOpts) ->
+ 		    TestConfig]
+ 	   end,
+ 
+-GenDepConfigureLine =
+-fun(DepPath, Flags) ->
+-	["sh -c 'if test ! -f ",DepPath,"config.status -o ",
+-	 "config.status -nt ",DepPath,"config.status; ",
+-	 "then (cd ", DepPath, " && ",
+-	 "CFLAGS=\"", CFlags,"\" ",
+-	 "CPPFLAGS=\"", CPPFlags, "\" "
+-	 "LDFLAGS=\"", LDFlags, "\"",
+-	 " ./configure ", string:join(Flags, " "),
+-	 "); fi'"]
+-end,
+-
+-GenDepsConfigure =
+-fun(Hooks) ->
+-	lists:map(fun({Pkg, Flags}) ->
+-			  DepPath = ResolveDepPath("deps/" ++ Pkg ++ "/"),
+-			  {'compile',
+-			   lists:flatten(GenDepConfigureLine(DepPath, Flags))}
+-		  end, Hooks)
+-end,
+-
+ ProcessErlOpt = fun(Vals) ->
+ 			lists:map(
+ 			  fun({i, Path}) ->
+@@ -315,8 +294,6 @@ Rules = [
+ 	  AppendList([{coveralls, ".*", {git, "https://github.com/markusn/coveralls-erl.git", "master"}}]), []},
+ 	 {[post_hooks], [cover_enabled], os:getenv("TRAVIS") == "true",
+ 	  AppendList2(TravisPostHooks), [], false},
+-	 {[pre_hooks], [post_hook_configure], true,
+-	  AppendList2(GenDepsConfigure), [], []},
+ 	 {[ct_extra_params], [eunit_compile_opts], true,
+ 	  AppendStr2(CtParams), "", []},
+ 	 {[erl_opts], true,
+-- 
+2.12.2
+
diff --git a/net-im/ejabberd/files/ejabberd-16.08-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-17.04-ejabberdctl.patch
similarity index 100%
rename from net-im/ejabberd/files/ejabberd-16.08-ejabberdctl.patch
rename to net-im/ejabberd/files/ejabberd-17.04-ejabberdctl.patch
diff --git a/net-im/ejabberd/files/epam-wrapper b/net-im/ejabberd/files/epam-wrapper
index a22793c86c03..9fb0466cf226 100644
--- a/net-im/ejabberd/files/epam-wrapper
+++ b/net-im/ejabberd/files/epam-wrapper
@@ -2,19 +2,19 @@
 
 ERL_LIBS=/usr/lib/erlang/lib
 
-for bin in "$ERL_LIBS"/p1_pam-*/priv/bin/epam; do
+for bin in "$ERL_LIBS"/epam-*/priv/bin/epam; do
 	if [ -x "$bin" ]; then
 		if [ -z "$epam" ]; then
 			epam="$bin"
 		else
-			echo "Multiple p1_pam libraries - don't know what to do" >&2
+			echo "Multiple epam libraries - don't know what to do" >&2
 			exit 1
 		fi
 	fi
 done
 
 if [ -z "$epam" ]; then
-	echo "Couldn't find p1_pam package" >&2
+	echo "Couldn't find epam package" >&2
 	exit 1
 fi
 
diff --git a/net-im/empathy/empathy-3.12.12.ebuild b/net-im/empathy/empathy-3.12.12.ebuild
index fadc4b136942..90583dbc59f4 100644
--- a/net-im/empathy/empathy-3.12.12.ebuild
+++ b/net-im/empathy/empathy-3.12.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit gnome2 autotools python-any-r1 virtualx
 
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index ac896552ba33..275f303a42f0 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,3 +1,4 @@
 DIST libupnp-1.6.21.tar.bz2 1245353 SHA256 af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb WHIRLPOOL b4869189054ac00d57394e0919ad2f672af64f2c2b0ecc676c2b3fc4a3c22caa25ac38b57bbb5cf1ef12a5857b4cdfd450c6bd5955a5eacaf8bdf95a058c9dab
+DIST libupnp-1.6.22.tar.bz2 1242211 SHA256 0bdfacb7fa8d99b78343b550800ff193264f92c66ef67852f87f042fd1a1ebbc SHA512 abf7265155fb819e971e27dd25fd3f8143c04d6373b1b4a2769de9fadbbd3a012758acda866511a443f7e159b66068d9f7f99072c509a8fa06bcfe1275bdd9af WHIRLPOOL e3bfd207adff942d1a60337fb5ff00d2e4a4d52073724fb19415f14aa2def746706d863360779b00d842756ea6d809d5cf2f3cde910a3863398cbcfe49957bec
 DIST libupnp-1.8.0.tar.gz 1380524 SHA256 1ddfb4e12e947deb5637e0d5e09bbe7835dfc8fb8a57712346026afa029165b1 SHA512 e2ae54352d747191f3ffc15c50481da515665fb35ddf6a9e488b6e1962e47803937bf078d0c2c5d56f8339cfd226ffba7433975363dc312e484ed22f83eda061 WHIRLPOOL c3d4abf54d25e87a1d650a18c475097a47633e8bf7691248695a7682ecff8aca4419c8eb2db4d24d62ca5a7905321971adf924166c20876ee18dd32d846748a1
 DIST libupnp-1.8.1.tar.gz 1363979 SHA256 0569e6afd979baa4e533312cb682394cea5b2638b8b412623e28943103593ea0 SHA512 7dd90f0c0332e7171d96a37a50223e18d5325ac1dd8dbe04fadac4655ad7c4d8443c52f904aaa35d3f12d2abd9ee2690ba990d0a93b15cbebb4d3de35d25ffe4 WHIRLPOOL 184e8844fab6a7a04d902d77c9b28141cdb15e4026b1b45105aabcf7616c2f6bbffa81fe14a1e6ddcd3f6494d9505f8f2cf190bf00fa341ca7192668e46e732d
diff --git a/net-libs/libupnp/libupnp-1.6.22.ebuild b/net-libs/libupnp/libupnp-1.6.22.ebuild
new file mode 100644
index 000000000000..fa7c3b4299db
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.6.22.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+IUSE="debug doc ipv6 static-libs"
+
+DOCS="NEWS ChangeLog"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.19-docs-install.patch
+	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
+)
+
+src_prepare() {
+	default
+
+	# fix tests
+	chmod +x ixml/test/test_document.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	use x86-fbsd &&	append-flags -O1
+	# w/o docdir to avoid sandbox violations
+	econf \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable static-libs static) \
+		$(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
+}
+
+src_install () {
+	default
+	dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
+	use static-libs || prune_libtool_files
+}
diff --git a/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch b/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch
new file mode 100644
index 000000000000..6b58ac28f3d4
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch
@@ -0,0 +1,396 @@
+Submitted By:            Igor Živković <contact@igor-zivkovic.from.hr>
+Date:                    2013-10-08
+Initial Package Version: 3.10.10
+Upstream Status:         Unknown
+Origin:                  Gentoo
+Description:             Fixes building against FFmpeg version >= 2.0.0
+
+diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.cxx opal-3.10.10/plugins/video/common/dyna.cxx
+--- opal-3.10.10.orig/plugins/video/common/dyna.cxx	2013-02-20 03:18:05.000000000 +0100
++++ opal-3.10.10/plugins/video/common/dyna.cxx	2013-10-08 12:57:25.058873513 +0200
+@@ -210,7 +210,7 @@
+ #endif
+ 
+ 
+-FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
++FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
+ {
+   m_codec = codec;
+   if (m_codec==CODEC_ID_H264)
+@@ -348,12 +348,12 @@
+   return true;
+ }
+ 
+-AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
++AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id)
+ {
+   return Favcodec_find_encoder(id);
+ }
+ 
+-AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
++AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id)
+ {
+   WaitAndSignal m(processLock);
+ 
+diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.h opal-3.10.10/plugins/video/common/dyna.h
+--- opal-3.10.10.orig/plugins/video/common/dyna.h	2013-02-20 03:18:05.000000000 +0100
++++ opal-3.10.10/plugins/video/common/dyna.h	2013-10-08 12:57:25.058873513 +0200
+@@ -88,13 +88,13 @@
+ class FFMPEGLibrary 
+ {
+   public:
+-    FFMPEGLibrary(CodecID codec);
++    FFMPEGLibrary(AVCodecID codec);
+     ~FFMPEGLibrary();
+ 
+     bool Load();
+ 
+-    AVCodec *AvcodecFindEncoder(enum CodecID id);
+-    AVCodec *AvcodecFindDecoder(enum CodecID id);
++    AVCodec *AvcodecFindEncoder(enum AVCodecID id);
++    AVCodec *AvcodecFindDecoder(enum AVCodecID id);
+     AVCodecContext *AvcodecAllocContext(void);
+     AVFrame *AvcodecAllocFrame(void);
+     int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
+@@ -117,15 +117,15 @@
+     DynaLink m_libAvcodec;
+     DynaLink m_libAvutil;
+ 
+-    CodecID m_codec;
++    AVCodecID m_codec;
+     char m_codecString[32];
+ 
+     void (*Favcodec_init)(void);
+     void (*Fav_init_packet)(AVPacket *pkt);
+ 
+     void (*Favcodec_register_all)(void);
+-    AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
+-    AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
++    AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id);
++    AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id);
+     AVCodecContext *(*Favcodec_alloc_context)(void);
+     AVFrame *(*Favcodec_alloc_frame)(void);
+     int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
+diff -Naur opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h
+--- opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h	2013-02-20 03:18:04.000000000 +0100
++++ opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h	2013-10-08 12:57:25.060873488 +0200
+@@ -101,7 +101,7 @@
+  * 1. no value of a existing codec ID changes (that would break ABI),
+  * 2. it is as close as possible to similar codecs.
+  */
+-enum CodecID {
++enum AVCodecID {
+     CODEC_ID_NONE,
+ 
+     /* video codecs */
+@@ -1390,7 +1390,7 @@
+ 
+     char codec_name[32];
+     enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
+-    enum CodecID codec_id; /* see CODEC_ID_xxx */
++    enum AVCodecID codec_id; /* see CODEC_ID_xxx */
+ 
+     /**
+      * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
+@@ -2843,7 +2843,7 @@
+      */
+     const char *name;
+     enum AVMediaType type;
+-    enum CodecID id;
++    enum AVCodecID id;
+     int priv_data_size;
+     int (*init)(AVCodecContext *);
+     int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
+@@ -2898,7 +2898,7 @@
+      *
+      * See CODEC_ID_xxx
+      */
+-    enum CodecID id;
++    enum AVCodecID id;
+ 
+     /**
+      * Supported pixel format.
+@@ -3402,10 +3402,10 @@
+ /**
+  * Find a registered encoder with a matching codec ID.
+  *
+- * @param id CodecID of the requested encoder
++ * @param id AVCodecID of the requested encoder
+  * @return An encoder if one was found, NULL otherwise.
+  */
+-AVCodec *avcodec_find_encoder(enum CodecID id);
++AVCodec *avcodec_find_encoder(enum AVCodecID id);
+ 
+ /**
+  * Find a registered encoder with the specified name.
+@@ -3418,10 +3418,10 @@
+ /**
+  * Find a registered decoder with a matching codec ID.
+  *
+- * @param id CodecID of the requested decoder
++ * @param id AVCodecID of the requested decoder
+  * @return A decoder if one was found, NULL otherwise.
+  */
+-AVCodec *avcodec_find_decoder(enum CodecID id);
++AVCodec *avcodec_find_decoder(enum AVCodecID id);
+ 
+ /**
+  * Find a registered decoder with the specified name.
+@@ -3822,7 +3822,7 @@
+  * @param[in] codec_id the codec
+  * @return Number of bits per sample or zero if unknown for the given codec.
+  */
+-int av_get_bits_per_sample(enum CodecID codec_id);
++int av_get_bits_per_sample(enum AVCodecID codec_id);
+ 
+ #if FF_API_OLD_SAMPLE_FMT
+ /**
+diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx
+--- opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.cxx	2013-02-20 03:18:03.000000000 +0100
++++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx	2013-10-08 12:57:25.061873475 +0200
+@@ -48,6 +48,10 @@
+ #endif
+ 
+ #include "h263-1998.h"
++extern "C"
++{
++#include <libavutil/opt.h>
++}
+ #include <limits>
+ #include <iomanip>
+ #include <stdio.h>
+@@ -203,7 +207,7 @@
+   PTRACE(4, m_prefix, "Encoder closed");
+ }
+ 
+-bool H263_Base_EncoderContext::Init(CodecID codecId)
++bool H263_Base_EncoderContext::Init(AVCodecID codecId)
+ {
+   PTRACE(5, m_prefix, "Opening encoder");
+ 
+@@ -317,9 +321,9 @@
+     // Level 2+ 
+     // works with eyeBeam, signaled via  non-standard "D"
+     if (atoi(value) == 1)
+-      m_context->flags |= CODEC_FLAG_H263P_UMV; 
++      av_opt_set_int(m_context->priv_data, "umv", 1, 0);
+     else
+-      m_context->flags &= ~CODEC_FLAG_H263P_UMV; 
++      av_opt_set_int(m_context->priv_data, "umv", 0, 0);
+     return;
+   }
+ 
+@@ -328,9 +332,9 @@
+     // Annex F: Advanced Prediction Mode
+     // does not work with eyeBeam
+     if (atoi(value) == 1)
+-      m_context->flags |= CODEC_FLAG_OBMC; 
++      av_opt_set_int(m_context->priv_data, "obmc", 1, 0);
+     else
+-      m_context->flags &= ~CODEC_FLAG_OBMC; 
++      av_opt_set_int(m_context->priv_data, "obmc", 0, 0);
+     return;
+   }
+ #endif
+@@ -360,9 +364,9 @@
+     // Annex K: Slice Structure
+     // does not work with eyeBeam
+     if (atoi(value) != 0)
+-      m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; 
++      av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0);
+     else
+-      m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; 
++      av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
+     return;
+   }
+ 
+@@ -370,9 +374,9 @@
+     // Annex S: Alternative INTER VLC mode
+     // does not work with eyeBeam
+     if (atoi(value) == 1)
+-      m_context->flags |= CODEC_FLAG_H263P_AIV; 
++      av_opt_set_int(m_context->priv_data, "aiv", 1, 0);
+     else
+-      m_context->flags &= ~CODEC_FLAG_H263P_AIV; 
++      av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
+     return;
+   }
+ 
+@@ -450,15 +454,6 @@
+   PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
+   PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
+ 
+-  #define CODEC_TRACER_FLAG(tracer, flag) \
+-    PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled"));
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
+-
+   return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
+ }
+ 
+@@ -521,7 +516,7 @@
+ 
+     // Need to copy to local buffer to guarantee 16 byte alignment
+     memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
+-    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
++    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
+ 
+     /*
+     m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
+@@ -603,13 +598,13 @@
+   m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
+   m_context->opaque = this; // used to separate out packets from different encode threads
+ 
+-  m_context->flags &= ~CODEC_FLAG_H263P_UMV;
++  av_opt_set_int(m_context->priv_data, "umv", 0, 0);
+   m_context->flags &= ~CODEC_FLAG_4MV;
+ #if LIBAVCODEC_RTP_MODE
+   m_context->flags &= ~CODEC_FLAG_H263P_AIC;
+ #endif
+-  m_context->flags &= ~CODEC_FLAG_H263P_AIV;
+-  m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
++  av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
++  av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
+ 
+   return true;
+ }
+diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.h opal-3.10.10/plugins/video/H.263-1998/h263-1998.h
+--- opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.h	2013-02-20 03:18:03.000000000 +0100
++++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.h	2013-10-08 12:57:25.062873463 +0200
+@@ -115,7 +115,7 @@
+     virtual ~H263_Base_EncoderContext();
+ 
+     virtual bool Init() = 0;
+-    virtual bool Init(CodecID codecId);
++    virtual bool Init(AVCodecID codecId);
+ 
+     virtual bool SetOptions(const char * const * options);
+     virtual void SetOption(const char * option, const char * value);
+diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/Makefile.in opal-3.10.10/plugins/video/H.263-1998/Makefile.in
+--- opal-3.10.10.orig/plugins/video/H.263-1998/Makefile.in	2013-02-20 03:18:03.000000000 +0100
++++ opal-3.10.10/plugins/video/H.263-1998/Makefile.in	2013-10-08 12:57:25.062873463 +0200
+@@ -35,7 +35,7 @@
+              $(COMMONDIR)/dyna.cxx
+ 
+ CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+-LIBS   += @DL_LIBS@
++LIBS   += @DL_LIBS@ @LIBAVUTIL_LIBS@
+ 
+ HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
+ ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes)
+diff -Naur opal-3.10.10.orig/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx
+--- opal-3.10.10.orig/plugins/video/H.264/gpl/h264_helper.cxx	2013-02-20 03:18:02.000000000 +0100
++++ opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx	2013-10-08 12:57:25.062873463 +0200
+@@ -27,6 +27,7 @@
+ #include <fstream>
+ #include <stdlib.h> 
+ #include <sys/stat.h>
++#include <unistd.h>
+ 
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+diff -Naur opal-3.10.10.orig/plugins/video/H.264/h264-x264.cxx opal-3.10.10/plugins/video/H.264/h264-x264.cxx
+--- opal-3.10.10.orig/plugins/video/H.264/h264-x264.cxx	2013-02-20 03:18:02.000000000 +0100
++++ opal-3.10.10/plugins/video/H.264/h264-x264.cxx	2013-10-08 12:57:25.063873450 +0200
+@@ -40,6 +40,9 @@
+ #include "plugin-config.h"
+ #endif
+ 
++#define FF_IDCT_H264 11
++#define CODEC_FLAG2_SKIP_RD 0x00004000
++
+ #include <codec/opalplugin.hpp>
+ 
+ #include "../common/ffmpeg.h"
+@@ -1071,13 +1074,10 @@
+         return false;
+ 
+       m_context->workaround_bugs = FF_BUG_AUTODETECT;
+-      m_context->error_recognition = FF_ER_AGGRESSIVE;
+       m_context->idct_algo = FF_IDCT_H264;
+       m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
+       m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
+-      m_context->flags2 = CODEC_FLAG2_BRDO |
+-                          CODEC_FLAG2_MEMC_ONLY |
+-                          CODEC_FLAG2_DROP_FRAME_TIMECODE |
++      m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
+                           CODEC_FLAG2_SKIP_RD |
+                           CODEC_FLAG2_CHUNKS;
+ 
+diff -Naur opal-3.10.10.orig/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx
+--- opal-3.10.10.orig/plugins/video/H.264/shared/x264wrap.cxx	2013-02-20 03:18:02.000000000 +0100
++++ opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx	2013-10-08 12:57:25.064873438 +0200
+@@ -33,6 +33,7 @@
+ 
+ #include <codec/opalplugin.hpp>
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+diff -Naur opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in
+--- opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/Makefile.in	2013-02-20 03:18:07.000000000 +0100
++++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in	2013-10-08 12:57:25.064873438 +0200
+@@ -31,7 +31,7 @@
+ SRCS      := mpeg4.cxx $(COMMONDIR)/dyna.cxx
+ 
+ CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+-LIBS   += @DL_LIBS@
++LIBS   += @DL_LIBS@ @LIBAVUTIL_LIBS@
+ 
+ # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
+ # Also add libavutil, so ffmpeg headers can #include "log.h".
+diff -Naur opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+--- opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2013-02-20 03:18:07.000000000 +0100
++++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2013-10-08 12:57:25.065873425 +0200
+@@ -103,6 +103,7 @@
+ 
+ #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
+ #include "../common/ffmpeg.h"
++#include <libavutil/opt.h>
+ #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
+ }
+ 
+@@ -589,17 +590,17 @@
+     m_avpicture->quality = m_videoQMin;
+ 
+ #ifdef USE_ORIG
+-    m_avcontext->flags |= CODEC_FLAG_PART;   // data partitioning
++    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
+     m_avcontext->flags |= CODEC_FLAG_4MV;    // 4 motion vectors
+ #else
+     m_avcontext->max_b_frames=0; /*don't use b frames*/
+     m_avcontext->flags|=CODEC_FLAG_AC_PRED;
+-    m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
++    av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0);
+     /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
+     m_avcontext->flags|=CODEC_FLAG_4MV;
+     m_avcontext->flags|=CODEC_FLAG_GMC;
+     m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
+-    m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
++    av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0);
+ #endif
+     m_avcontext->opaque = this;              // for use in RTP callback
+ }
+@@ -804,7 +805,7 @@
+         // Should the next frame be an I-Frame?
+         if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
+         {
+-            m_avpicture->pict_type = FF_I_TYPE;
++            m_avpicture->pict_type = AV_PICTURE_TYPE_I;
+         }
+         else // No IFrame requested, let avcodec decide what to do
+         {
+@@ -1325,7 +1326,7 @@
+ 
+ void MPEG4DecoderContext::SetStaticDecodingParams() {
+     m_avcontext->flags |= CODEC_FLAG_4MV; 
+-    m_avcontext->flags |= CODEC_FLAG_PART;
++    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
+     m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
+ }
+ 
diff --git a/net-libs/opal/opal-3.10.11-r1.ebuild b/net-libs/opal/opal-3.10.11-r1.ebuild
new file mode 100644
index 000000000000..f109ffcc3ef8
--- /dev/null
+++ b/net-libs/opal/opal-3.10.11-r1.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="C++ class library normalising numerous telephony protocols"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
+	doc? ( mirror://sourceforge/opalvoip/${P}-htmldoc.tar.bz2 )"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
+ipv6 ivr java ldap libav lid +plugins sbc +sip +sipim +sound srtp ssl static-libs
+stats swig theora +video vpb vxml +wav x264 x264-static +xml"
+
+REQUIRED_USE="
+	x264-static? ( x264 )
+	h281? ( h224 )
+	sip? ( sipim )
+"
+
+RDEPEND="
+	>=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?]
+	>=media-libs/speex-1.2_beta
+	fax? ( net-libs/ptlib[asn] )
+	h323? ( net-libs/ptlib[asn] )
+	ivr? ( net-libs/ptlib[http,xml,vxml] )
+	java? ( >=virtual/jre-1.4:* )
+	plugins? (
+		media-sound/gsm
+		celt? ( media-libs/celt:0 )
+		ffmpeg? (
+			libav? ( media-video/libav:0=[encode] )
+			!libav? ( media-video/ffmpeg:0=[encode] ) )
+		ilbc? ( dev-libs/ilbc-rfc3951 )
+		sbc? ( media-libs/libsamplerate )
+		theora? ( media-libs/libtheora )
+		x264? (	virtual/ffmpeg
+			media-libs/x264 ) )
+	srtp? ( net-libs/libsrtp:0= )
+	vxml? ( net-libs/ptlib[http,vxml] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	java? ( swig? ( dev-lang/swig )
+		>=virtual/jdk-1.4 )
+"
+
+# NOTES:
+# ffmpeg[encode] is for h263 and mpeg4
+# ssl, xml, vxml, ipv6, ldap, sound, wav, and video are use flags
+#   herited from ptlib: feature is enabled if ptlib has enabled it
+#   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
+#   forcing ptlib to disable it for opal is not a solution too
+#   atm, accepting the "auto-feature" looks like a good solution
+#   (asn is used for fax and config _only_ for examples)
+# OPALDIR should not be used anymore but if a package still need it, create it
+
+pkg_setup() {
+	# workaround for bug 282838
+	append-cxxflags "-fno-visibility-inlines-hidden"
+	append-cxxflags "-fno-strict-aliasing"
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove visual studio related files from samples/
+	if use examples; then
+		rm -f samples/*/*.vcproj
+		rm -f samples/*/*.sln
+		rm -f samples/*/*.dsp
+		rm -f samples/*/*.dsw
+	fi
+
+	# LFS ffmpeg2+ fixes.
+	eapply "${FILESDIR}"/opal-3.10.10-ffmpeg2-1.patch
+
+	if ! use h323; then
+		# Without this patch, ekiga wont compile, even with
+		# USE=-h323.
+		eapply "${FILESDIR}/${PN}-3.10.9-disable-h323-workaround.patch"
+	fi
+
+	eapply "${FILESDIR}/${PN}-3.10.9-java-ruby-swig-fix.patch"
+
+	sed -i -e "s:\(.*HAS_H224.*\), \[OPAL_H323\]:\1:" configure.ac \
+		|| die "sed failed"
+
+	# sed fixes for ffmpeg-3.
+	sed -e 's/CODEC_ID/AV_&/' \
+		-e 's/PIX_FMT_/AV_&/' \
+		-i plugins/video/H.263-1998/h263-1998.cxx \
+		   plugins/video/common/dyna.cxx          \
+		   plugins/video/H.264/h264-x264.cxx      \
+		   plugins/video/MPEG4-ffmpeg/mpeg4.cxx || die "sed failed"
+
+	eaclocal
+	eautoconf
+
+	# in plugins
+	cd plugins/
+	eaclocal
+	eautoconf
+	cd ..
+
+	# disable celt if celt is not enabled (prevent auto magic dep)
+	# already in repository
+	if ! use celt; then
+		sed -i -e "s/HAVE_CELT=yes/HAVE_CELT=no/" plugins/configure \
+			|| die "sed failed"
+	fi
+
+	# fix automatic swig detection, upstream bug 2712521 (upstream reject it)
+	if ! use swig; then
+		sed -i -e "/^SWIG=/d" configure || die "patching configure failed"
+	fi
+
+	use ilbc || { rm -r plugins/audio/iLBC/ || die "removing iLBC failed"; }
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local forcedconf=""
+
+	# fix bug 277233, upstream bug 2820939
+	if use fax; then
+		forcedconf="${forcedconf} --enable-statistics"
+	fi
+
+	# --with-libavcodec-source-dir should _not_ be set, it's for trunk sources
+	# versioncheck: check for ptlib version
+	# shared: should always be enabled for a lib
+	# localspeex, localspeexdsp, localgsm, localilbc: never use bundled libs
+	# samples: only build some samples, useless
+	# libavcodec-stackalign-hack: prevent hack (default disable by upstream)
+	# default-to-full-capabilties: default enable by upstream
+	# aec: atm, only used when bundled speex, so it's painless for us
+	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+	# 	http://zfoneproject.com/ wich is not in portage
+	# msrp: highly experimental
+	# spandsp: doesn't work with newest spandsp, upstream bug 2796047
+	# g711plc: force enable
+	# rfc4103: not really used, upstream bug 2795831
+	# t38, spandsp: merged in fax
+	# h450, h460, h501: merged in h323 (they are additional features of h323)
+	econf \
+		--enable-versioncheck \
+		--enable-shared \
+		--disable-zrtp \
+		--disable-localspeex \
+		--disable-localspeexdsp \
+		--disable-localgsm \
+		--disable-localilbc \
+		--disable-samples \
+		--disable-libavcodec-stackalign-hack \
+		--enable-default-to-full-capabilties \
+		--enable-aec \
+		--disable-msrp \
+		--disable-spandsp \
+		--enable-g711plc \
+		--enable-rfc4103 \
+		--disable-capi \
+		--disable-ixj \
+		$(use_enable debug) \
+		$(use_enable fax) \
+		$(use_enable fax t38) \
+		$(use_enable h224) \
+		$(use_enable h281) \
+		$(use_enable h323) \
+		$(use_enable h323 h450) \
+		$(use_enable h323 h460) \
+		$(use_enable h323 h501) \
+		$(use_enable iax) \
+		$(use_enable ivr) \
+		$(use_enable java) \
+		$(use_enable lid) \
+		$(use_enable plugins) \
+		$(use_enable sbc) \
+		$(use_enable sip) \
+		$(use_enable sipim) \
+		$(use_enable stats statistics) \
+		$(use_enable video) $(use_enable video rfc4175) \
+		$(use_enable vpb) \
+		$(use_enable x264 h264) \
+		$(use_enable x264-static x264-link-static) \
+		${forcedconf}
+}
+
+src_compile() {
+	local makeopts=""
+
+	use debug && makeopts="debug"
+
+	emake ${makeopts}
+}
+
+src_install() {
+	default
+
+	# Get rid of static libraries if not requested
+	# There seems to be no easy way to disable this in the build system
+	if ! use static-libs; then
+		rm -v "${D}"/usr/lib*/*.a || die
+	fi
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/* docs/* || die "dohtml failed"
+	fi
+
+	if use examples; then
+		local exampledir="/usr/share/doc/${PF}/examples"
+		local basedir="samples"
+		local sampledirs="`ls ${basedir} --hide=configure* \
+			--hide=opal_samples.mak.in`"
+
+		# first, install files
+		insinto ${exampledir}/
+		doins ${basedir}/{configure*,opal_samples*} \
+			|| die "doins failed"
+
+		# now, all examples
+		for x in ${sampledirs}; do
+			insinto ${exampledir}/${x}/
+			doins ${basedir}/${x}/* || die "doins failed"
+		done
+
+		# some examples need version.h
+		insinto "/usr/share/doc/${PF}/"
+		doins version.h || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	if use examples; then
+		ewarn "All examples have been installed, some of them will not work on your system"
+		ewarn "it will depend of the enabled USE flags in ptlib and opal"
+	fi
+
+	if ! use plugins || ! use sound || ! use video; then
+		ewarn "You have disabled sound, video or plugins USE flags."
+		ewarn "Most audio/video features or plugins have been disabled silently"
+		ewarn "even if enabled via USE flags."
+		ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
+	fi
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
index 0822ac55bab4..3c3cfceeadd8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 
diff --git a/net-mail/notmuch/notmuch-0.24.1.ebuild b/net-mail/notmuch/notmuch-0.24.1.ebuild
index de47cbb850d8..3ab5365e4a9b 100644
--- a/net-mail/notmuch/notmuch-0.24.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.24.1.ebuild
@@ -194,6 +194,11 @@ pkg_preinst() {
 
 pkg_postinst() {
 	use emacs && elisp-site-regen
+
+	if has_version '<dev-libs/xapian-1.4'; then
+		elog "Regular expression searches supported for from: and subject:"
+		elog "require >=dev-libs/xapian-1.4."
+	fi
 }
 
 pkg_postrm() {
diff --git a/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild b/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild
index 76ae1ca12a4c..3ed0f4dd9776 100644
--- a/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild
+++ b/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_4 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/net-misc/networkmanager-libreswan/Manifest b/net-misc/networkmanager-libreswan/Manifest
new file mode 100644
index 000000000000..bf40abc7c8cc
--- /dev/null
+++ b/net-misc/networkmanager-libreswan/Manifest
@@ -0,0 +1 @@
+DIST NetworkManager-libreswan-1.2.6.tar.xz 348312 SHA256 604fc207598dc9bac2c37e3d242e41bd80d6a74e2a9358e66debc9b667672c96 SHA512 385b7e7cfc0720be1eae0a3c7e080efd17eb6f243d069ba881b97c9638fc3bb951b3c8f1c9b44422fe81a2dc9fc85b675f977284111aeaa6304ad31750f62798 WHIRLPOOL 533e98c552027dff94962e69d29f1009e29cc6841099171612e94ced1d4cbba20c751bed06357bba140d7878642f083c0b22323f12bd8bdfdc5765cc15655b36
diff --git a/sys-firmware/radeon-ucode/metadata.xml b/net-misc/networkmanager-libreswan/metadata.xml
similarity index 56%
rename from sys-firmware/radeon-ucode/metadata.xml
rename to net-misc/networkmanager-libreswan/metadata.xml
index e943b72b8a48..de09ffd8b089 100644
--- a/sys-firmware/radeon-ucode/metadata.xml
+++ b/net-misc/networkmanager-libreswan/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild b/net-misc/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild
new file mode 100644
index 000000000000..39ef3b9d7dbe
--- /dev/null
+++ b/net-misc/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-libreswan"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager libreswan plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/VPN"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libnl-3.2.8:3
+	>=net-misc/networkmanager-1.2.0:=
+	net-vpn/libreswan
+	gtk? (
+		app-crypt/libsecret
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+	!net-misc/networkmanager-openswan
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--with-dist-version=Gentoo
+		$(use_with gtk gnome)
+	)
+	gnome2_src_configure "${myconf[@]}"
+}
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 5603207a6719..8d695c7325d3 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -16,6 +16,8 @@
 			tracking</flag>
 		<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for
 			getting ip</flag>
+		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag>
+		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
 		<flag name="json">Enable JSON validation via <pkg>dev-libs/jansson</pkg>
 			in libnm.</flag>
 		<flag name="modemmanager">Enable support for mobile broadband devices
diff --git a/net-misc/networkmanager/networkmanager-1.4.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.4.4-r1.ebuild
index 5702fb30785e..7950a852982f 100644
--- a/net-misc/networkmanager/networkmanager-1.4.4-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.4.4-r1.ebuild
@@ -47,7 +47,7 @@ COMMON_DEPEND="
 	audit? ( sys-process/audit )
 	bluetooth? ( >=net-wireless/bluez-5 )
 	connection-sharing? (
-		net-dns/dnsmasq[dhcp]
+		net-dns/dnsmasq[dbus,dhcp]
 		net-firewall/iptables )
 	consolekit? ( >=sys-auth/consolekit-1.0.0 )
 	dhclient? ( >=net-misc/dhcp-4[client] )
diff --git a/net-misc/networkmanager/networkmanager-1.8.0.ebuild b/net-misc/networkmanager/networkmanager-1.8.0.ebuild
index 32c1d37225a7..7b0e7cf91405 100644
--- a/net-misc/networkmanager/networkmanager-1.8.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.8.0.ebuild
@@ -16,15 +16,14 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
 
-IUSE="audit bluetooth connection-sharing consolekit +dhclient gnutls +introspection \
-json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux \
-systemd teamd test vala +wext +wifi"
+IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
 
 REQUIRED_USE="
 	modemmanager? ( ppp )
 	vala? ( introspection )
 	wext? ( wifi )
 	^^ ( nss gnutls )
+	?? ( consolekit elogind systemd )
 "
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -37,20 +36,22 @@ COMMON_DEPEND="
 	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
 	>=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
-	>=sys-auth/polkit-0.106
+	policykit? ( >=sys-auth/polkit-0.106 )
 	net-libs/libndp
-	>=net-libs/libsoup-2.40:2.4=
+	net-misc/curl
 	net-misc/iputils
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
 	audit? ( sys-process/audit )
 	bluetooth? ( >=net-wireless/bluez-5 )
 	connection-sharing? (
-		net-dns/dnsmasq[dhcp]
+		net-dns/dnsmasq[dbus,dhcp]
 		net-firewall/iptables )
 	consolekit? ( >=sys-auth/consolekit-1.0.0 )
 	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( sys-auth/elogind )
 	gnutls? (
 		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
 		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
@@ -64,7 +65,10 @@ COMMON_DEPEND="
 	resolvconf? ( net-dns/openresolv )
 	selinux? ( sys-libs/libselinux )
 	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? ( >=net-misc/libteam-1.9 )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
 "
 RDEPEND="${COMMON_DEPEND}
 	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
@@ -90,17 +94,13 @@ DEPEND="${COMMON_DEPEND}
 "
 
 python_check_deps() {
-	local rv=0
 	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-		(( rv |= $? ))
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
 	fi
 	if use test; then
 		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
 		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-		(( rv |= $? ))
 	fi
-	return ${rv}
 }
 
 sysfs_deprecated_check() {
@@ -149,43 +149,20 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	local myconf=()
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		mkdir man || die
-		find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
-	fi
-
-	# ifnet plugin always disabled until someone volunteers to actively
-	# maintain and fix it
-	# Also disable dhcpcd support as it's also completely unmaintained
-	# and facing bugs like #563938 and many others
-	#
-	# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
-	# still not ready for removing that lib
-	myconf=(
+	local myconf=(
 		--disable-more-warnings
 		--disable-static
 		--localstatedir=/var
 		--disable-lto
 		--disable-config-plugin-ibft
+		# ifnet plugin always disabled until someone volunteers to actively
+		# maintain and fix it
 		--disable-ifnet
 		--disable-qt
 		--without-netconfig
 		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
+		# still not ready for removing that lib
 		--with-libnm-glib
 		--with-nmcli=yes
 		--with-udev-dir="$(get_udevdir)"
@@ -193,15 +170,16 @@ multilib_src_configure() {
 		--with-iptables=/sbin/iptables
 		$(multilib_native_enable concheck)
 		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no))
-		--with-suspend-resume=$(multilib_native_usex systemd systemd consolekit)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
 		$(multilib_native_use_with audit libaudit)
 		$(multilib_native_use_enable bluetooth bluez5-dun)
+		$(use_with dhclient)
+		$(use_with dhcpcd)
 		$(multilib_native_use_enable introspection)
 		$(multilib_native_use_enable json json-validation)
 		$(multilib_native_use_enable ppp)
-		$(use_with dhclient)
-		--without-dhcpcd
+		--without-libpsl
 		$(multilib_native_use_with modemmanager modem-manager-1)
 		$(multilib_native_use_with ncurses nmtui)
 		$(multilib_native_use_with ofono)
@@ -214,18 +192,33 @@ multilib_src_configure() {
 		--without-valgrind
 		$(multilib_native_use_with wext)
 		$(multilib_native_use_enable wifi)
-		"${myconf[@]}"
 	)
 
-	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
+	if multilib_is_native_abi && use policykit; then
+		myconf+=( --enable-polkit=yes )
+	else
+		myconf+=( --enable-polkit=disabled )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
 
-	# work-around gtk-doc out-of-source brokedness
 	if multilib_is_native_abi; then
-		local d
-		for d in api libnm libnm-util libnm-glib; do
-			ln -s "${S}"/docs/${d}/html docs/${d}/html || die
-		done
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
 	fi
+
+	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
 }
 
 multilib_src_compile() {
@@ -306,25 +299,6 @@ pkg_postinst() {
 		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
 	fi
 
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  574d0cfa7e911b1f7792077003060240* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
 	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
 	# but still show a warning to remember people to have cleaner config file
 	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
diff --git a/net-vpn/openvpn/openvpn-2.4.2.ebuild b/net-vpn/openvpn/openvpn-2.4.2-r1.ebuild
similarity index 93%
rename from net-vpn/openvpn/openvpn-2.4.2.ebuild
rename to net-vpn/openvpn/openvpn-2.4.2-r1.ebuild
index 463f0f3a69d4..830141cf3bb6 100644
--- a/net-vpn/openvpn/openvpn-2.4.2.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.2-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
-IUSE+=" pkcs11 +plugins polarssl selinux +ssl static systemd test userland_BSD"
+IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
 	mbedtls? ( ssl !libressl )
@@ -66,6 +66,8 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -Xcompiler -static
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+	TMPFILES_DIR="/usr/lib/tmpfiles.d" \
 	econf \
 		$(usex mbedtls '--with-crypto-library=mbedtls' '') \
 		$(use_enable inotify async-push) \
@@ -110,10 +112,6 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins -r sample contrib
 	fi
-
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-	use systemd && systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service
-	use systemd && systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service
 }
 
 pkg_postinst() {
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index be066f67cb9e..8a34713832c5 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS=""
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
-IUSE+=" pkcs11 +plugins polarssl selinux +ssl static systemd test userland_BSD"
+IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
 	lzo? ( !lz4 )
@@ -64,6 +64,8 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -Xcompiler -static
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+	TMPFILES_DIR="/usr/lib/tmpfiles.d" \
 	econf \
 		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
 		$(usex mbedtls 'with-crypto-library' 'mbedtls' '' '') \
@@ -109,10 +111,6 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins -r sample contrib
 	fi
-
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-	systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service
-	systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service
 }
 
 pkg_postinst() {
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 1dfa3c405b19..efe76088ee39 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,16 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (27 May 2017)
+# app-pda/libimobiledevice, app-pda/libplist and co not tested
+sys-power/upower ios
+sys-power/upower-pm-utils ios
+gnome-base/gvfs ios
+
+# Mart Raudsepp <leio@gentoo.org> (27 May 2017)
+# dev-libs/libgdata and net-libs/gnome-online-accounts not tested
+gnome-base/gvfs google
+
 # Jason Zaman <perfinion@gentoo.org> (09 May 2017)
 # x11-libs/libXpresent is not keyworded on mips
 xfce-base/xfwm4 xpresent
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 9d734940efab..09ac8ca4b2cc 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -4,6 +4,18 @@
 # Unmask the flag which corresponds to ARCH.
 -mips
 
+# Mart Raudsepp <leio@gentoo.org> (27 May 2017)
+# media-libs/libmtp not tested
+mtp
+
+# Mart Raudsepp <leio@gentoo.org> (27 May 2017)
+# net-libs/gnome-online-accounts not tested
+gnome-online-accounts
+
+# Mart Raudsepp <leio@gentoo.org> (27 May 2017)
+# Keywords lost on net-fs/samba over time, use.mask until re-keyworded
+samba
+
 # Mart Raudsepp <leio@gentoo.org> (07 Feb 2017)
 # dev-libs/libappindicator not tested
 ayatana
diff --git a/profiles/license_groups b/profiles/license_groups
index cc13b7bc2f71..1e2051660079 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freemarker freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep noweb Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 PIZZA-WARE pngcrush pngnq Princeton psutils qmail-nelson rc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
+MISC-FREE ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freemarker freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep noweb Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 PIZZA-WARE pngcrush pngnq Princeton psutils qmail-nelson rc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
diff --git a/profiles/package.mask b/profiles/package.mask
index 4cc6e25a44f0..37ab4fc2899d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,19 @@
 
 #--- END OF EXAMPLES ---
 
+# Amadeusz Żołnowski <aidecoe@gentoo.org> (28 May 2017)
+# Masked for removal. Upstream has disappeared. Homepage is not
+# accessible anymore. There are open, long-standing bugs: #553888,
+# #532308, #548920, not worth fixing while there's active alternative.
+# Use app-admin/needrestart instead.
+app-admin/checkrestart
+
+# Pacho Ramos <pacho@gentoo.org> (28 May 2017)
+# Not compatible with python 3.5 neither 3.6, bug #388549
+# Removal in a month.
+media-libs/lv2core
+media-libs/lv2-ui
+
 # Michał Górny <mgorny@gentoo.org> (25 May 2017)
 # First GTK+3 version with known regressions:
 # https://mail.xfce.org/pipermail/xfce-announce/2017-May/000517.html
@@ -41,10 +54,6 @@
 # on boot. Bug #617578
 =sys-fs/lvm2-2.02.171
 
-# Mike Gilbert <floppym@gentoo.org> (23 May 2017)
-# Needs more testing.
-~net-misc/networkmanager-1.8.0
-
 # Michał Górny <mgorny@gentoo.org> (22 May 2017)
 # for Maciej S. Szmigiero <mail@maciej.szmigiero.name>
 # Any version above 5.100.138 breaks b43 driver in various ways.
@@ -316,12 +325,6 @@ app-emulation/wine-any
 # Masked, broken due to emoji support which requre npm package installed (bug #612218)
 =app-i18n/ibus-1.5.15
 
-# Matt Turner <mattst88@gentoo.org> (29 Mar 2017)
-# Use sys-kernel/linux-firmware instead, which these packages are subsets of
-# Bug #614218
-sys-firmware/radeon-ucode
-sys-firmware/amdgpu-ucode
-
 # Lars Wendler <polynomial-c@gentoo.org> (24 Mar 2017)
 # Masked until Mozilla and Chrome agreed how to handle
 # Symantec trust issues properly (bug #613714)
diff --git a/profiles/updates/2Q-2017 b/profiles/updates/2Q-2017
index f87928b51b7c..810856e0ee24 100644
--- a/profiles/updates/2Q-2017
+++ b/profiles/updates/2Q-2017
@@ -1,2 +1,3 @@
 move kde-misc/kio_gopher kde-misc/kio-gopher
 move dev-python/pyconstruct dev-python/construct
+move dev-erlang/p1_pam dev-erlang/epam
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d1c0152b7a74..22b74916c36c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -727,7 +727,8 @@ app-eselect/eselect-php:fpm - Enable the FastCGI Process Manager SAPI
 app-forensics/afflib:fuse - Enable extra fuse thingies
 app-forensics/afflib:qemu - Enable qemu stuff
 app-forensics/afflib:s3 - Enable support for Amazon S3
-app-forensics/aide:prelink - Enable support for sys-devel/prelink
+app-forensics/aide:e2fs - Enable support for checking file attributes on ext2/ext3/ext4 filesystems
+app-forensics/aide:prelink - Bypass prelinking when calculating checksums
 app-forensics/chkrootkit:cron - Install cron script for weekly rootkit scans
 app-forensics/libewf:bfio - Enables libbfio for chaining file in file handling
 app-forensics/libewf:ewf - Enables the v1 API
@@ -933,6 +934,7 @@ app-misc/mc:xdg - Toggles mc's config dir location. Enable for $XDG_CONFIG_HOME/
 app-misc/mosquitto:bridge - Enable bridge support in the MQTT broker.
 app-misc/mosquitto:persistence - Store messages and subscriptions to a file.
 app-misc/mosquitto:srv - Include SRV lookup support.
+app-misc/mosquitto:websockets - Support the WebSocket protocol.
 app-misc/muttprint:doc - Builds documentation
 app-misc/neofetch:X - Enable support for detecting DEs, WMs, screen resolutions, and showing images from an X terminal
 app-misc/note:general - Add support for ascii flatfile backend
@@ -1525,6 +1527,7 @@ dev-haskell/biosff:fclip - Build the fclip executable.
 dev-haskell/biosff:flower - Build the flower executable.
 dev-haskell/biosff:frecover - Build the frecover executable.
 dev-haskell/blaze-builder-enumerator:newbuilder - use bytestring-builder instead of blaze-builder-0.3
+dev-haskell/bytedump:executable - build executable file
 dev-haskell/bytes:test-doctests - Enable the doctest suite when using the enable-tests option for cabal.
 dev-haskell/c2hs:regression - run regression tests
 dev-haskell/cabal-install:network-uri - Get Network.URI from the network-uri package.
@@ -1589,6 +1592,7 @@ dev-haskell/hdbc-sqlite3:buildtests - Build the executable to run unit tests
 dev-haskell/hdbc-sqlite3:splitbase - Choose the new smaller, split-up package.
 dev-haskell/highlighting-kate:executable - Build the Highlight executable.
 dev-haskell/highlighting-kate:pcre-light - Use the pcre-light library instead of regex-pcre-builtin.
+dev-haskell/hit:executable - Build the executable
 dev-haskell/hlint:gpl - Use GPL libraries, specifically hscolour.
 dev-haskell/hps:build-exec - Build the `hps-fractals' executable
 dev-haskell/hs3:network-uri - Get Network.URI from the network-uri package.
@@ -3346,6 +3350,7 @@ gnome-extra/libgda:sourceview - Enable support for x11-libs/gtksourceview
 gnome-extra/libgsf:gtk - Enable use of gdk in thumbnailer
 gnome-extra/nemo:packagekit - Use packagekit to search for programs to open unknown file types
 gnome-extra/nemo:tracker - Add support for app-misc/tracker search
+gnome-extra/nm-applet:gcr - Enable advanced certificate chooser, requires app-crypt/gcr
 gnome-extra/nm-applet:modemmanager - Enable support for mobile broadband devices using net-misc/modemmanager
 gnome-extra/nm-applet:teamd - Enable teamd configuration editor
 gnome-extra/sushi:office - Support viewing file formats such as generated by app-office/libreoffice
@@ -3393,7 +3398,7 @@ kde-apps/kde-apps-meta:pim - Pull in KDE PIM suite
 kde-apps/kde-apps-meta:sdk - Pull in developer-specific meta-packages
 kde-apps/kdeadmin-meta:cron - Installs KDE application for virtual/cron configuration
 kde-apps/kdebase-kioslaves:sftp - Enable SFTP protocol support using net-libs/libssh
-kde-apps/kdebase-runtime-meta:kwallet - Install kde-apps/kwalletd on a minimal setup for migration purposes
+kde-apps/kdebase-runtime-meta:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet
 kde-apps/kdegraphics-mobipocket:thumbnail - Enables thumbnail generation
 kde-apps/kdemultimedia-meta:cdrom - Include packages for optical discs
 kde-apps/kdenetwork-meta:ppp - Enable support for net-dialup/ppp.
@@ -3506,7 +3511,7 @@ kde-frameworks/sonnet:hunspell - Enable the app-text/hunspell spell-checking bac
 kde-misc/kdeconnect:app - Enable experimental kcapp frontend
 kde-misc/kdeconnect:wayland - Enable kwin_wayland support for mousepad plugin using kde-frameworks/kwayland
 kde-misc/kimtoy:scim - Enable Smart Common Input Method support
-kde-misc/kio-gdrive:dolphin - Enable integration with kde-apps/dolphin
+kde-misc/kio-gdrive:kaccounts - Use kde-apps/kaccounts-integration backend (default) instead of dev-libs/qtkeychain
 kde-misc/tellico:discid - Add support for reading disc IDs from audio CDs
 kde-plasma/kde-cli-tools:kdesu - Build graphical frontend for kde-frameworks/kdesu
 kde-plasma/kde-gtk-config:gtk3 - Add support for gtk+3-based applications.
@@ -6362,6 +6367,8 @@ net-misc/ncp:diet - Compile against dev-libs/dietlibc
 net-misc/networkmanager:connection-sharing - Use net-dns/dnsmasq and net-firewall/iptables for connection sharing
 net-misc/networkmanager:consolekit - Use sys-auth/consolekit for session tracking
 net-misc/networkmanager:dhclient - Use dhclient from net-misc/dhcp for getting ip
+net-misc/networkmanager:dhcpcd - Use net-misc/dhcpcd for getting ip
+net-misc/networkmanager:elogind - Use sys-auth/elogind for session tracking
 net-misc/networkmanager:json - Enable JSON validation via dev-libs/jansson in libnm.
 net-misc/networkmanager:modemmanager - Enable support for mobile broadband devices using net-misc/modemmanager
 net-misc/networkmanager:nss - Use dev-libs/nss for cryptography
@@ -7840,7 +7847,6 @@ sys-fabric/ofed:qperf - Add rdma tests
 sys-fabric/ofed:rds - Tools to manage rds sockets
 sys-fabric/ofed:srp - Suport for userspace part for srp initiator
 sys-fabric/opensm:tools - Install ssld extra tool
-sys-firmware/amdgpu-ucode:legacy - Install firmware for older chipsets which are optionally supported by AMDGPU
 sys-firmware/edk2-ovmf:binary - Use pre-built binaries
 sys-firmware/intel-microcode:initramfs - install a small initramfs for use with CONFIG_MICROCODE_EARLY
 sys-firmware/intel-microcode:monolithic - install the large text microcode.dat (used by older kernels via microcode_ctl)
diff --git a/sci-geosciences/seawater/Manifest b/sci-geosciences/seawater/Manifest
index 3c82227d9e31..e8e6ef1b035f 100644
--- a/sci-geosciences/seawater/Manifest
+++ b/sci-geosciences/seawater/Manifest
@@ -1,4 +1,2 @@
 DIST seawater-2.0.1.tar.gz 2680741 SHA256 e343ef9dba9cc5806b4040af5a63132e2d04bab6406216d5041f81f76d4b25cf SHA512 9d59d5c41f46311240934e18b8727514babc4e714553ba595017a17b95edf040c10ac7161f607c7e262c751e238a909d55a639a94fab4d4ce004a4c297af1e79 WHIRLPOOL 7bdff25f7f2152aa8c4c4184a05397b01a718b5198f821aabb1389acd54860038e5655c6f18e9a63ff699e61c4e66911e33e4085e03021f77452cb185e674ec6
-DIST seawater-3.3.2.tar.gz 33073 SHA256 41363a6e280db6f047c40eb87fe9f576ce17e991514dfaeb82444ab5e25950c8 SHA512 221c7e9716247b2a79b1182a4acac7e01c68298262f31d5ff53267c8f4e9d4302f2f46bab5361300742c4eae2a44eff3521b34ef380cfaeb2aaa9f0bdd28df6c WHIRLPOOL ced79e7bdfdc037ee73ee17608735b695de1ef2b99f1d5166e7453b3f272ee73533f3a9e2ccba62d2d98119061ae9a0bd5e11acafd88f469b007fc7619d9c052
-DIST seawater-3.3.3.tar.gz 22839 SHA256 8a4f2597141621b7d68ad5145054f4d2a8343eab83fe6453634ddcf49cb39afc SHA512 73f377786c0396f6e052d654d34877aaf28c08ba732321fe11a89a77e809acebada6585d5ffd3481855ead2de9ec6641b48bf771b3d5e6a0cf82bf7383567e49 WHIRLPOOL 26618ec60f55dbf0cbb39cbf1980a93b867e63f367333b080a67b7bb5b5965bfffce021704061908273f0a634535b189eb22f9827a742d1c0ed9942cefccbf0f
 DIST seawater-3.3.4.tar.gz 22899 SHA256 1ec2c21b9fac3133d5c18ab654e3ff7c7167d9f437fcc16ee8d355e609533411 SHA512 1e448c0473809ae5022eda6b695d67db85a22767d068d7a025bdb1ad49a09f0f336e5f43b6a2fd869d39082895e45e7fa4ae2af98c1f2d613d28393f88ef27af WHIRLPOOL 62a759200bb73dc9ec048e61a165718a4e4ce68129f62b182d082eb4b9b120a6cc46f0a1e3365f6711b2f5c98c7803f7d3d13223c55948818635877793819e6c
diff --git a/sci-geosciences/seawater/seawater-3.3.2.ebuild b/sci-geosciences/seawater/seawater-3.3.2.ebuild
deleted file mode 100644
index f4817e7c1a0a..000000000000
--- a/sci-geosciences/seawater/seawater-3.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-inherit distutils-r1
-
-DESCRIPTION="Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water"
-HOMEPAGE="https://pypi.python.org/pypi/seawater/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # seems there are files missing
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/oct2py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/sci-geosciences/seawater/seawater-3.3.3.ebuild b/sci-geosciences/seawater/seawater-3.3.3.ebuild
deleted file mode 100644
index 530c7f6a21af..000000000000
--- a/sci-geosciences/seawater/seawater-3.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-inherit distutils-r1
-
-DESCRIPTION="Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water"
-HOMEPAGE="https://pypi.python.org/pypi/seawater/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # seems there are files missing
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/oct2py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/sci-geosciences/seawater/seawater-3.3.4.ebuild b/sci-geosciences/seawater/seawater-3.3.4.ebuild
index 530c7f6a21af..e457b08ce07e 100644
--- a/sci-geosciences/seawater/seawater-3.3.4.ebuild
+++ b/sci-geosciences/seawater/seawater-3.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water"
diff --git a/sci-libs/libsc/libsc-1.0.ebuild b/sci-libs/libsc/libsc-1.0-r1.ebuild
similarity index 94%
rename from sci-libs/libsc/libsc-1.0.ebuild
rename to sci-libs/libsc/libsc-1.0-r1.ebuild
index f20b97e11959..7ed31cf1638a 100644
--- a/sci-libs/libsc/libsc-1.0.ebuild
+++ b/sci-libs/libsc/libsc-1.0-r1.ebuild
@@ -61,6 +61,9 @@ src_install() {
 		rm -r "${ED}"/usr/bin || die "rm failed"
 	fi
 
+	# Remove ac files, bug #619806
+	rm -r "${ED}"/usr/share/aclocal || die "rm failed"
+
 	# Fix wrong installation paths:
 	dodir /usr/share/libsc
 	mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed"
diff --git a/sci-libs/libsc/libsc-1.1.ebuild b/sci-libs/libsc/libsc-1.1-r1.ebuild
similarity index 94%
rename from sci-libs/libsc/libsc-1.1.ebuild
rename to sci-libs/libsc/libsc-1.1-r1.ebuild
index 58390d3dedd2..523a346e5697 100644
--- a/sci-libs/libsc/libsc-1.1.ebuild
+++ b/sci-libs/libsc/libsc-1.1-r1.ebuild
@@ -63,6 +63,9 @@ src_install() {
 		rm -r "${ED}"/usr/bin || die "rm failed"
 	fi
 
+	# Remove ac files, bug #619806
+	rm -r "${ED}"/usr/share/aclocal || die "rm failed"
+
 	# Fix wrong installation paths:
 	dodir /usr/share/libsc
 	mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed"
diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild
index b60904437906..178503f4ab99 100644
--- a/sci-libs/libsc/libsc-9999.ebuild
+++ b/sci-libs/libsc/libsc-9999.ebuild
@@ -81,6 +81,9 @@ src_install() {
 		rm -r "${ED}"/usr/bin || die "rm failed"
 	fi
 
+	# Remove ac files, bug #619806
+	rm -r "${ED}"/usr/share/aclocal || die "rm failed"
+
 	# Fix wrong installation paths:
 	dodir /usr/share/libsc
 	mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed"
diff --git a/sci-physics/cernlib/cernlib-2006-r6.ebuild b/sci-physics/cernlib/cernlib-2006-r6.ebuild
index 6ce9e60ad69c..abdee8792276 100644
--- a/sci-physics/cernlib/cernlib-2006-r6.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -48,6 +48,7 @@ src_prepare() {
 		-e "s:\$DEPS -llapack -lm:$($(tc-getPKG_CONFIG) --libs lapack):" \
 		-e 's:`depend $d $a blas`::' \
 		-e 's:X11R6:X11:g' \
+		-e 's: /[^ ]*`dpkg-arch.*`::' \
 		debian/add-ons/bin/cernlib.in || die "sed failed"
 
 	cp debian/add-ons/Makefile .
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 32f8dc6f2381..93b447b073f6 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,4 +1,2 @@
 DIST etckeeper-1.18.1.tar.gz 56366 SHA256 80adee6e17bfc41359ffb85a401d9a510ae25956950adbfdd07a0bda36d99e9b SHA512 5b5019d3f8c22ee0486c9102d7dbdc7e86921d432df49c15733e5ed23651c2be87b52e295208be691ef1e44a515d960fcf4f812eaca17f2806e2f5055222ca35 WHIRLPOOL 890b38f761f49a5a4713fa850bc18e09688ed8fb04d9b41f3727f868448fb1ba1ecf92750df777fc6011a3f88abeb8756105fbdc60ebf6fd3e693360764fb27c
-DIST etckeeper-1.18.4.tar.gz 67499 SHA256 a8f28c24d2c296db861fd5f1e95e6c9aa924eed19a331487cf42687f49123600 SHA512 fa1d8eda9037be7933fd5be6ea4b5dfb77d6858ffab4ae4dad838d5c6ec066cb254c700732bfa0becd388b952b2b216bd7027cf3a67f806048e6cb3aa9c276c3 WHIRLPOOL df03d41ffbc86c94a2c1a62d50751e117ae7fe52d8551c752e2b53cae34685a3dd0f088d08ed8ac1545aeac0ec16bc3900b8e0d97c95c0da4cfb52ace7b59607
-DIST etckeeper-1.18.5.tar.gz 68041 SHA256 a4ddb313037c6861efbc24a55ed8e66cd98591e190aedf2657c8a1071f821889 SHA512 6a0ff1dd2dcc665da8a68bf48ea5bb12c9ae1f1a8737f3bcec47f9d055602e469b69a4ceed9a2042b89492a98c17f2065596f5e65fc228734de1aad7db3a12c1 WHIRLPOOL 6fea65228add2ff3dfe29438d2dd4cde9562e8c0a69ed7ce2c07ac929d7109af3f96dc3d85bfdaceead716394bb80fd0b7206b5cfc3e408e922e215c03985b8e
 DIST etckeeper-1.18.6.tar.gz 73487 SHA256 7db1a2b48c011b5e04ec95af559de8d1d243bdcdf6cd591b3b0b46d1f21e9602 SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c WHIRLPOOL 41805cff70804abe574831ec1bb2bc4e2e5079ff97c777f2597f8af4f6e972009312b5f1760a0c17e0db0f150266b94cdc1f49afb8e15401d8c57ad540112324
diff --git a/sys-apps/etckeeper/etckeeper-1.18.4.ebuild b/sys-apps/etckeeper/etckeeper-1.18.4.ebuild
deleted file mode 100644
index e1770e85ffe0..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils prefix python-r1
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="bazaar cron"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
-	dev-vcs/mercurial
-	dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr )"
-RDEPEND="${DEPEND}
-	app-portage/portage-utils
-	cron? ( virtual/cron )
-	bazaar? ( ${PYTHON_DEPS} )
-	!bazaar? ( || ( ${VCS_DEPEND} ) )"
-
-src_prepare(){
-	epatch "${FILESDIR}"/${PN}-1.18.3-gentoo.patch
-}
-
-src_compile() {
-	:
-}
-
-src_install(){
-	emake DESTDIR="${ED}" install
-
-	bzr_install() {
-		${PYTHON} ./${PN}-bzr/__init__.py install --root="${ED}" ||
-			die "bzr support installation failed!"
-	}
-	use bazaar && python_foreach_impl bzr_install
-
-	if use prefix; then
-		doenvd "${FILESDIR}"/99${PN}
-		eprefixify "${ED%/}"/etc/env.d/99${PN}
-	fi
-
-	dodoc doc/README.mdwn
-	docinto examples
-	newdoc "${FILESDIR}"/bashrc-r1 bashrc
-
-	if use cron ; then
-		exeinto /etc/cron.daily
-		newexe debian/cron.daily etckeeper
-	fi
-}
-
-pkg_postinst(){
-	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
-	elog "	dev-vcs/bzr"
-	elog "This ebuild just ensures at least one is installed!"
-	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
-	elog
-	elog "You may want to adjust your /etc/portage/bashrc"
-	elog "see the example file in /usr/share/doc/${PF}/examples"
-	elog
-	elog "To initialise your etc-dir as a repository run:"
-	elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/etckeeper/etckeeper-1.18.5.ebuild b/sys-apps/etckeeper/etckeeper-1.18.5.ebuild
deleted file mode 100644
index e1770e85ffe0..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils prefix python-r1
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="bazaar cron"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
-	dev-vcs/mercurial
-	dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr )"
-RDEPEND="${DEPEND}
-	app-portage/portage-utils
-	cron? ( virtual/cron )
-	bazaar? ( ${PYTHON_DEPS} )
-	!bazaar? ( || ( ${VCS_DEPEND} ) )"
-
-src_prepare(){
-	epatch "${FILESDIR}"/${PN}-1.18.3-gentoo.patch
-}
-
-src_compile() {
-	:
-}
-
-src_install(){
-	emake DESTDIR="${ED}" install
-
-	bzr_install() {
-		${PYTHON} ./${PN}-bzr/__init__.py install --root="${ED}" ||
-			die "bzr support installation failed!"
-	}
-	use bazaar && python_foreach_impl bzr_install
-
-	if use prefix; then
-		doenvd "${FILESDIR}"/99${PN}
-		eprefixify "${ED%/}"/etc/env.d/99${PN}
-	fi
-
-	dodoc doc/README.mdwn
-	docinto examples
-	newdoc "${FILESDIR}"/bashrc-r1 bashrc
-
-	if use cron ; then
-		exeinto /etc/cron.daily
-		newexe debian/cron.daily etckeeper
-	fi
-}
-
-pkg_postinst(){
-	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
-	elog "	dev-vcs/bzr"
-	elog "This ebuild just ensures at least one is installed!"
-	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
-	elog
-	elog "You may want to adjust your /etc/portage/bashrc"
-	elog "see the example file in /usr/share/doc/${PF}/examples"
-	elog
-	elog "To initialise your etc-dir as a repository run:"
-	elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/file/file-5.30.ebuild b/sys-apps/file/file-5.30.ebuild
index 2202614c625f..06394a519126 100644
--- a/sys-apps/file/file-5.30.ebuild
+++ b/sys-apps/file/file-5.30.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz
 		ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index a94773804a61..82832fdfbfd9 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1 +1,2 @@
 DIST pcsc-lite-1.8.20.tar.bz2 745049 SHA256 ec7d0114016c788c1c09859c84860f6cec6c4595436d23245105154b9c046bb2 SHA512 63fea660d71605ebced5600a59ab5b6a735c4ba3697faf7658d91b8e281a7fb2a2bca6831c8f8c8c87b87a54f7fd03ae818a4c496dcbac0afce523e3b6c606b8 WHIRLPOOL 1c758274a884cf5625d31ed4d56938ee147ba276613c701aee1465b70842a9a73daa92b889835decaaca55707da6be798e3b183aef16a64817d969734d19250a
+DIST pcsc-lite-1.8.21.tar.bz2 750879 SHA256 fe3365eb7d4ce0fe891e2b6d6248351c287435ca502103f1f1431b1710e513ad SHA512 bd3740f4444d2201efaa34a312d2a5f6b5808b0b7ff1d5696dce26df67ef198a63a96670d0acac97a6e693b33079afeeeaa6692746875b0ff72d69a2b0835990 WHIRLPOOL 7bc1040262974c94f9c15f48db5370f1ebd6d29f42267cbf73bcbe750974490dcc012f20a56213a17e26f1cb1dbbe2e9f8fbf0fb9c1db80841aa5863ffe4766c
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.21.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.21.ebuild
new file mode 100644
index 000000000000..2dbff6f0639e
--- /dev/null
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.21.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit python-single-r1 systemd udev user multilib-minimal
+
+DESCRIPTION="PC/SC Architecture smartcard middleware library"
+HOMEPAGE="http://pcsclite.alioth.debian.org/"
+
+STUPID_NUM="4216"
+MY_P="${PN}-${PV/_/-}"
+SRC_URI="http://alioth.debian.org/download.php/file/${STUPID_NUM}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+# GPL-2 is there for the init script; everything else comes from
+# upstream.
+LICENSE="BSD ISC MIT GPL-3+ GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# This is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="python libusb policykit selinux +udev"
+
+REQUIRED_USE="^^ ( udev libusb ) \
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# No dependencies need the MULTILIB_DEPS because the libraries are actually
+# standalone, the deps are only needed for the daemon itself.
+CDEPEND="libusb? ( virtual/libusb:1 )
+	udev? ( virtual/udev )
+	policykit? ( >=sys-auth/polkit-0.111 )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	!<app-crypt/ccid-1.4.1-r1
+	!<sys-apps/baselayout-2
+	!<sys-apps/openrc-0.11.8
+	selinux? ( sec-policy/selinux-pcscd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
+)
+
+DOCS=( AUTHORS DRIVERS HELP README SECURITY ChangeLog )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	enewgroup openct # make sure it exists
+	enewgroup pcscd
+	enewuser pcscd -1 -1 /run/pcscd pcscd,openct
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-maintainer-mode \
+		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
+		--enable-ipcdir=/run/pcscd \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(multilib_native_use_enable udev libudev) \
+		$(multilib_native_use_enable libusb) \
+		$(multilib_native_use_enable policykit polkit)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
+
+	if use udev; then
+		insinto "$(get_udevdir)"/rules.d
+		doins "${FILESDIR}"/99-pcscd-hotplug.rules
+	fi
+
+	for f in "${ED}/usr/bin/pcsc-spy"; do
+		if use python; then
+			python_fix_shebang "${f}"
+		else
+			rm "${f}"
+		fi
+	done
+}
+
+pkg_postinst() {
+	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
+	elog "the pcscd group, to avoid running as root."
+	elog ""
+	elog "This also means you need the newest drivers available so that the"
+	elog "devices get the proper owner."
+	elog ""
+	elog "Furthermore, a conf.d file is no longer installed by default, as"
+	elog "the default configuration does not require one. If you need to"
+	elog "pass further options to pcscd, create a file and set the"
+	elog "EXTRA_OPTS variable."
+	elog ""
+	if use udev; then
+		elog "Hotplug support is provided by udev rules; you only need to tell"
+		elog "the init system to hotplug it, by setting this variable in"
+		elog "/etc/rc.conf:"
+		elog ""
+		elog "    rc_hotplug=\"pcscd\""
+	fi
+}
diff --git a/sys-auth/elogind/elogind-229.3.ebuild b/sys-auth/elogind/elogind-229.3.ebuild
index 74c4496adf2c..a5912caf290c 100644
--- a/sys-auth/elogind/elogind-229.3.ebuild
+++ b/sys-auth/elogind/elogind-229.3.ebuild
@@ -14,19 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="acl debug pam policykit selinux"
 
-COMMON_DEPEND="
+RDEPEND="
 	sys-apps/util-linux
 	sys-libs/libcap
 	virtual/libudev:=
 	acl? ( sys-apps/acl )
 	pam? ( virtual/pam )
 	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/dbus
 	!sys-apps/systemd
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
@@ -35,7 +32,10 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/libtool
 	virtual/pkgconfig
 "
-PDEPEND="policykit? ( sys-auth/polkit )"
+PDEPEND="
+	sys-apps/dbus
+	policykit? ( sys-auth/polkit )
+"
 
 PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" )
 
diff --git a/sys-auth/ykpers/Manifest b/sys-auth/ykpers/Manifest
index 11fca3f30e3e..0f4ab0926762 100644
--- a/sys-auth/ykpers/Manifest
+++ b/sys-auth/ykpers/Manifest
@@ -1 +1 @@
-DIST v1.18.0.tar.gz 124932 SHA256 7cf5fa315132e4473caca509d3a0768ed490938d1068e8aa46be200fc751eff5 SHA512 d636fcabf94a3fb48841572b7b0f03a12a3b3243b11ed7377654d01c33c7282dc321ee13b13c1ee3f2a49fc5015e326a96ef5bc1594b8592d07c1e5aa0521d20 WHIRLPOOL 187ca974593d71043e673acd242b8af18a4c92e9b93d18f4048f4ac8d61637b871f3c9db0f0868291ad66a0d0062ca6039dc0cc6bc4d2ac929617d08c4afb648
+DIST ykpers-1.18.0.tar.gz 124932 SHA256 7cf5fa315132e4473caca509d3a0768ed490938d1068e8aa46be200fc751eff5 SHA512 d636fcabf94a3fb48841572b7b0f03a12a3b3243b11ed7377654d01c33c7282dc321ee13b13c1ee3f2a49fc5015e326a96ef5bc1594b8592d07c1e5aa0521d20 WHIRLPOOL 187ca974593d71043e673acd242b8af18a4c92e9b93d18f4048f4ac8d61637b871f3c9db0f0868291ad66a0d0062ca6039dc0cc6bc4d2ac929617d08c4afb648
diff --git a/sys-auth/ykpers/ykpers-1.18.0.ebuild b/sys-auth/ykpers/ykpers-1.18.0.ebuild
index 1dfbfd0d9793..0ce22ce63b07 100644
--- a/sys-auth/ykpers/ykpers-1.18.0.ebuild
+++ b/sys-auth/ykpers/ykpers-1.18.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools udev
 
 DESCRIPTION="Library and tool for personalization of Yubico's YubiKey"
-SRC_URI="https://github.com/Yubico/yubikey-personalization/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/Yubico/yubikey-personalization/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="https://github.com/Yubico/yubikey-personalization"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 1ca80a741930..d04ab6aa97dd 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1 +1,2 @@
 DIST kubernetes-1.6.2.tar.gz 21975834 SHA256 2af4bcc196a90b78baf65d5bcdf6cbb613d71d3952a98813e15bb6a41f3b922c SHA512 a2a248610407d391c9cadd0c54d97dda7ba459532f2e971708dbdca94d34559aab97c80069ba10b79d64188211c17c4014fa7410bc4e64a9bb55eae5b9a96a36 WHIRLPOOL d0d30f2a876a6dc986321aff5f472707cb9bc2dc3a2c63a37afd1dce19069a3b53185580df21050b8cdf68691f99288c03f3bbac665d2f20d23310ca7eb0067c
+DIST kubernetes-1.6.4.tar.gz 21984028 SHA256 8042628d49fd8d2382ad487a08b89d68b72d3dbaf24c1cc7c452ae7c72e9c0b9 SHA512 86eb104ff3d822f362b1afce46063e8533c1c6d7ab981d2038d04636281d135b5edacce94a8200e3a57ec14f8906df90fb3dce82a44539b664015542c159e2a0 WHIRLPOOL d3fa467f2cc644985fd45f06e5a9a32b36a6136b6099c4fa9f9e9cd2e9eecb1d58f74cdf64ee5a4c73071ff3f8361e89b80b794e6cfe005a2c0d6b8def9d557d
diff --git a/sys-cluster/kubectl/kubectl-1.6.4.ebuild b/sys-cluster/kubectl/kubectl-1.6.4.ebuild
new file mode 100644
index 000000000000..637d85f31c80
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.6.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes/..."
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN%/*}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN%/*}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN%/*} WHAT=cmd/${PN}
+}
+
+src_install() {
+	pushd src/${EGO_PN%/*} || die
+	dobin _output/bin/${PN}
+	popd || die
+}
diff --git a/sys-firmware/amdgpu-ucode/Manifest b/sys-firmware/amdgpu-ucode/Manifest
deleted file mode 100644
index be99738d05fe..000000000000
--- a/sys-firmware/amdgpu-ucode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST linux-firmware-20170113.tar.xz 40606424 SHA256 dbc63d53ff12bff9ca0bc35ce91436356c2878dce41dc64d0f2b0c25b39e447b SHA512 28b9f4452f7b29d0a641585d792a19fe6eabe3aa9d383934f995c62a6f62db0cb877db16aaac4b2e2b7966f98e0f7b5737e206d0d8cd8a61aa64b2fb5a554749 WHIRLPOOL f63477f35d66c685039a6c85449eaf4416ee0fd32a3a8f5b69a0aa77c1f67759f7a8da05bb49d7cf82a9ac5a52ab44fe75ae6767347c73bb3538e70c3fb79e80
diff --git a/sys-firmware/amdgpu-ucode/amdgpu-ucode-20161121.ebuild b/sys-firmware/amdgpu-ucode/amdgpu-ucode-20161121.ebuild
deleted file mode 100644
index 447976d4f771..000000000000
--- a/sys-firmware/amdgpu-ucode/amdgpu-ucode-20161121.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info
-
-AMDGPU_UCODE_LINUX_FIRMWARE="linux-firmware-20170113"
-
-DESCRIPTION="Microcode for C.Islands/V.Islands/A.Islands Radeon GPUs and APUs"
-HOMEPAGE="https://people.freedesktop.org/~agd5f/radeon_ucode/"
-SRC_URI="mirror://gentoo/${AMDGPU_UCODE_LINUX_FIRMWARE}.tar.xz"
-
-LICENSE="radeon-ucode"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="legacy"
-
-RDEPEND="legacy? ( !sys-firmware/radeon-ucode )
-	!>sys-kernel/linux-firmware-20150812[-savedconfig]"
-
-S=${WORKDIR}/${AMDGPU_UCODE_LINUX_FIRMWARE}/amdgpu
-
-AMDGPU_LEGACY_CIK="bonaire hainan hawaii kabini kaveri mullins oland pitcairn tahiti verde"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-firmware-* "${AMDGPU_UCODE_LINUX_FIRMWARE}" || die
-}
-
-src_install() {
-	local chip files legacyfiles
-	if use legacy; then
-		pushd ../radeon || die
-		for chip in ${AMDGPU_LEGACY_CIK}; do
-			legacyfiles+=( ${chip}*.bin )
-		done
-		insinto /lib/firmware/radeon
-		doins ${legacyfiles[@]}
-		popd
-	fi
-	files=( *.bin )
-	insinto /lib/firmware/amdgpu
-	doins ${files[@]}
-	FILES=( ${files[@]/#/amdgpu/} ${legacyfiles[@]/#/radeon/} )
-}
-
-pkg_postinst() {
-	if linux_config_exists && linux_chkconfig_builtin DRM_AMDGPU; then
-		if ! linux_chkconfig_present FIRMWARE_IN_KERNEL || \
-			! [[ "$(linux_chkconfig_string EXTRA_FIRMWARE)" == *_rlc.bin* ]]; then
-			ewarn "Your kernel has amdgpu DRM built-in but not the microcode."
-			ewarn "For kernel modesetting to work, please set in kernel config"
-			ewarn "CONFIG_FIRMWARE_IN_KERNEL=y"
-			ewarn "CONFIG_EXTRA_FIRMWARE_DIR=\"/lib/firmware\""
-			ewarn "CONFIG_EXTRA_FIRMWARE=\"${FILES[@]}\""
-			ewarn "You may skip microcode files for which no hardware is installed."
-			ewarn "More information at https://wiki.gentoo.org/wiki/AMDGPU#Firmware"
-		fi
-	fi
-}
diff --git a/sys-firmware/radeon-ucode/Manifest b/sys-firmware/radeon-ucode/Manifest
deleted file mode 100644
index be99738d05fe..000000000000
--- a/sys-firmware/radeon-ucode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST linux-firmware-20170113.tar.xz 40606424 SHA256 dbc63d53ff12bff9ca0bc35ce91436356c2878dce41dc64d0f2b0c25b39e447b SHA512 28b9f4452f7b29d0a641585d792a19fe6eabe3aa9d383934f995c62a6f62db0cb877db16aaac4b2e2b7966f98e0f7b5737e206d0d8cd8a61aa64b2fb5a554749 WHIRLPOOL f63477f35d66c685039a6c85449eaf4416ee0fd32a3a8f5b69a0aa77c1f67759f7a8da05bb49d7cf82a9ac5a52ab44fe75ae6767347c73bb3538e70c3fb79e80
diff --git a/sys-firmware/radeon-ucode/radeon-ucode-20161005.ebuild b/sys-firmware/radeon-ucode/radeon-ucode-20161005.ebuild
deleted file mode 100644
index 1aae5e9a74f6..000000000000
--- a/sys-firmware/radeon-ucode/radeon-ucode-20161005.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info
-
-RADEON_UCODE_LINUX_FIRMWARE="linux-firmware-20170113"
-
-DESCRIPTION="IRQ microcode for r6xx/r7xx/Evergreen/N.Islands/S.Islands Radeon GPUs and APUs"
-HOMEPAGE="https://people.freedesktop.org/~agd5f/radeon_ucode/"
-SRC_URI="mirror://gentoo/${RADEON_UCODE_LINUX_FIRMWARE}.tar.xz"
-
-LICENSE="radeon-ucode"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
-
-S=${WORKDIR}/${RADEON_UCODE_LINUX_FIRMWARE}
-
-src_unpack() {
-	unpack ${A}
-	mv linux-firmware-* ${RADEON_UCODE_LINUX_FIRMWARE} || die
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins -r radeon
-	FILES=( radeon/*.bin )
-}
-
-pkg_postinst() {
-	if linux_config_exists && linux_chkconfig_builtin DRM_RADEON; then
-		if ! linux_chkconfig_present FIRMWARE_IN_KERNEL || \
-			! [[ "$(linux_chkconfig_string EXTRA_FIRMWARE)" == *_rlc.bin* ]]; then
-			ewarn "Your kernel has radeon DRM built-in but not the IRQ microcode."
-			ewarn "For kernel modesetting to work, please set in kernel config"
-			ewarn "CONFIG_FIRMWARE_IN_KERNEL=y"
-			ewarn "CONFIG_EXTRA_FIRMWARE_DIR=\"/lib/firmware\""
-			ewarn "CONFIG_EXTRA_FIRMWARE=\"${FILES[@]}\""
-			ewarn "You may skip microcode files for which no hardware is installed."
-			ewarn "More information at https://wiki.gentoo.org/wiki/Radeon#Firmware"
-		fi
-	fi
-}
diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild
index 1f52af3e6b45..cc9eea2b0e7b 100644
--- a/sys-fs/cryfs/cryfs-0.9.7.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild
@@ -24,7 +24,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}"
 fi
 
@@ -40,6 +40,9 @@ src_prepare() {
 	# remove tests that require internet access to comply with Gentoo policy
 	sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die
 
+	# remove non-applicable warning
+	sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die
+
 	cmake-utils_src_prepare
 }
 
diff --git a/sys-fs/cryfs/cryfs-9999.ebuild b/sys-fs/cryfs/cryfs-9999.ebuild
index 1f52af3e6b45..cc9eea2b0e7b 100644
--- a/sys-fs/cryfs/cryfs-9999.ebuild
+++ b/sys-fs/cryfs/cryfs-9999.ebuild
@@ -24,7 +24,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}"
 fi
 
@@ -40,6 +40,9 @@ src_prepare() {
 	# remove tests that require internet access to comply with Gentoo policy
 	sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die
 
+	# remove non-applicable warning
+	sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die
+
 	cmake-utils_src_prepare
 }
 
diff --git a/sys-libs/ldb/ldb-1.1.29-r1.ebuild b/sys-libs/ldb/ldb-1.1.29-r1.ebuild
index 4ec30fbe7d14..f22033ed99db 100644
--- a/sys-libs/ldb/ldb-1.1.29-r1.ebuild
+++ b/sys-libs/ldb/ldb-1.1.29-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc +ldap +python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/talloc/talloc-2.1.9.ebuild b/sys-libs/talloc/talloc-2.1.9.ebuild
index 7d5ccb96f89e..67401dbb931f 100644
--- a/sys-libs/talloc/talloc-2.1.9.ebuild
+++ b/sys-libs/talloc/talloc-2.1.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.3.13.ebuild b/sys-libs/tdb/tdb-1.3.13.ebuild
index 1d43d9674bfe..8852f60c8929 100644
--- a/sys-libs/tdb/tdb-1.3.13.ebuild
+++ b/sys-libs/tdb/tdb-1.3.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tevent/tevent-0.9.31-r1.ebuild b/sys-libs/tevent/tevent-0.9.31-r1.ebuild
index 16cb31136828..767c716aafbb 100644
--- a/sys-libs/tevent/tevent-0.9.31-r1.ebuild
+++ b/sys-libs/tevent/tevent-0.9.31-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="python"
 
 RDEPEND=">=sys-libs/talloc-2.1.8[${MULTILIB_USEDEP}]
diff --git a/virtual/emacs/emacs-25.ebuild b/virtual/emacs/emacs-25.ebuild
index 390e7df2efd0..7c37f55f9739 100644
--- a/virtual/emacs/emacs-25.ebuild
+++ b/virtual/emacs/emacs-25.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for GNU Emacs"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| ( app-editors/emacs:25
 		>=app-editors/emacs-vcs-25.1 )"
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 675325fd1698..b3d6047d3d73 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,4 +1,5 @@
 DIST owncloud-10.0.0.tar.bz2 32764455 SHA256 488fc136a8000b42c447e224e69f16f5c31a231eea3038614fdea5e0c2218457 SHA512 84544fc12bfc620d3094b50584b0b8e08d23cf6fbb01cb6e0b79df64561d93d4f5a8149c6241e7f4c0eb66fa8d0fb8bf6ccf37f701887c74563fb3f014aefa1d WHIRLPOOL b91059422f381fa970c5a6c7e29518292bcb6878c07d34c3e43bd73b425ffe3b795230acb0ed75e2afbefbb46e749abb9361e5fa5e31c09bce944092af0428c4
+DIST owncloud-10.0.1.tar.bz2 29486784 SHA256 ae69444e0eabd085682fd8abc8f4addfcaa5213b5d40819f83dd8aa5f8dad896 SHA512 1d9a8cc845d41ff61540f5762b1bf079fcb63baf410769d0ea5d55c830010538dd927ac9f37a4a12c71996275db6ba5baf7e548c6f8d636e5c76b72b7334a565 WHIRLPOOL 5b579c092f577be5983ab3bc3c3b05e2d72ea314f872438802a5b1a9947f7e06b475ceb1ca2fff8503db351fda1dfa07e6960cf4b3f94f692c07ab148e382348
 DIST owncloud-8.2.11.tar.bz2 27974620 SHA256 13031d8d813c45aaca430bdcbf502c4929bfb5dddbd7742fc99a993fc1bdc1ef SHA512 d43deef37e112ec3b85da4e9c744c96bfead264bd53fffd2854e277be4a500ed53964bf66d490490a4a93548de3216df93b5de1d58757a5824cbcf76663f2584 WHIRLPOOL c17505569d7376f07b29bd05335740da5060a05d873bd81521a8dcaa4564e8f939756c2b5a711aebbdbaf2132a3ea912a18eaa1b91b42f7c3e42732888549803
 DIST owncloud-9.0.9.tar.bz2 28515639 SHA256 e9ba25de52f7455487604a4e4f775de0dca14c045a82aef7bc002764b9e0ea1a SHA512 3fabcdb5bfefd2d18d4ad1d20fbadaa2c8dff908a9fd51d6cf6a163a620b4f56a50bc0aeb6bd5fd4665895e21bd59950c4c08ba138651a06f03743c441453bfa WHIRLPOOL f9009bcbdb60cd584724c08efb64bfa1ccf140339ce8b24e1b74f4e53357e768ac0fda0ff1ec4edeaa4fe3685ba1debb170a61c5145d855d1ae771f877e8b4c0
 DIST owncloud-9.1.5.tar.bz2 29130344 SHA256 07f3fa0c4acee11df2fd7492d85238e702a4aa0bf2c17290803d85e72b2bf3d4 SHA512 e2c4f0d08574baddbd9f6a9c0ced007fa03ac36f10726e341c7533de6f3747f5c81c00e006c69e0e6b212172e737e95fc4605856dae9bad805e28dc27dc4d645 WHIRLPOOL 98316d4ad36e7ea0da419744c3b864f3f181ff40a241b60ab10d51d29c009b8532454c5dd52d27fd30a8644baea9e69fbff74f3fd3bc69b5b9beda96ab42773d
diff --git a/www-apps/owncloud/owncloud-10.0.1.ebuild b/www-apps/owncloud/owncloud-10.0.1.ebuild
new file mode 100644
index 000000000000..2c070014fe55
--- /dev/null
+++ b/www-apps/owncloud/owncloud-10.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="http://owncloud.org"
+SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional applications (calendar, ...) are no longer provided by default."
+	elog "You can install them after login via the applications management page"
+	elog "(check the recommended tab). No application data is lost."
+	webapp_pkg_postinst
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index ff3ed4de8f3c..30fbb9a98972 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -178,96 +178,96 @@ DIST firefox-52.1.0esr-xh.xpi 441172 SHA256 f24de110815f6d50f70b71b4f59f5c2268d8
 DIST firefox-52.1.0esr-zh-CN.xpi 461694 SHA256 ed4afe83bed6c76b8051a3b4972d2d0469e11e59ea41e38232a94decd8f8e399 SHA512 909cf0f2a51a0272ca7b8e6c2843e16fdbb232f3e0e7dce162eb7aae8977f208314a9e8511fd80db4c3f091f97eda5845b6fa29f02993df3b56ebed2a4a5415d WHIRLPOOL 5c06011f8f97eb8dfc6210a4ddb8a4a407cd134268e8d721971e0e2aec72c18c931527eb2ead9f9722effced2310d60b1a6616f2dda5681dbd119b544e792152
 DIST firefox-52.1.0esr-zh-TW.xpi 472533 SHA256 f2aa1acca0afb7de7ae5cb939267cbc71c9fcf5bbd2239f89e8901cbe83fd999 SHA512 a1e19a7a5c8860a4f68f241a1c536fc8de1f8452c0bc43a8bee1c5dcebd9d58b06fddb84f7f07f2ad99ef232cee494ddf041c86f9988a4baab1bb70f3963e1a3 WHIRLPOOL 28fe23a9b9aa3880540187dd586328fa902ad96ce5630a9eba16c4aaa208002ef5cf9e461d58e52a64464ab3d9bd94f38a08c90c2c2769d052e19cf0cdf2eaea
 DIST firefox-52.1.0esr.source.tar.xz 212348684 SHA256 da2ba9630b8b56c6f5d36d9f3da2d984ef7986dc8b4d804f6947fcea6c24637d SHA512 ba833904654eda347f83df77e04c8e81572772e8555f187b796ecc30e498b93fb729b6f60935731d9584169adc9d61329155364fddf635cbd11abebe4a600247 WHIRLPOOL d043a3c0617ea56ade7ed92a3ebc87cce25f1b7d423b45a1156bb29cb0b1034dc15472b54c6a30017a25a47136de88dedead5f8df39c9a2bfbe3080284055201
-DIST firefox-53.0-ach.xpi 432350 SHA256 6b50af6b457608c625b5a99c0f467e9e13827e84387223682c251847ef12ec03 SHA512 9bf6bc6942f93fd553dcc7b7e83203eba0aaf5188c644bcc4125b933ceba9bf75d414e150c39ddd0a4ddb2186e25981c683bc27fe208bcb5cfd68a41ae2b9680 WHIRLPOOL 986bb705c2f4d7e3e63ab471bc7935598646889cd27d2608a8ca5d4ffec2cec33d9077251e51b35655ae0665cddd857791d7ab863e4bccf7e328df5d27432c36
-DIST firefox-53.0-af.xpi 441829 SHA256 2e030e8d993a72fc2b922bd71749564706d5bbc4f5edd1d5cb0a2e2d341dd397 SHA512 20bff71e9cf8918c7e807372de338f179b09f0a369a82856cb8de38dee00f5473e8021d36f9bda74cfa4c2c86e60f6553c24136ac71a7dd952d6b4e63c56aaa7 WHIRLPOOL 07aee387ccf0f4338d69faf079a07fe1c9fcc065906c2e5295ace97bfce7235f076785929369786e583ef5113f44760e78d9f1cb1b06c585eae80d9ba0ddbc09
-DIST firefox-53.0-an.xpi 450799 SHA256 3b049eabcf49f57742f574c792b0f15a2f0fe7af8d7700074555741eba4b40bd SHA512 9ef4a180ff7b7ac8b5ad6259719753f88f67eaa45273707997426112317eff3b58758892c66428c5357ef431e8a78ac93aa15dcca1d2a8b99bccd69c186981de WHIRLPOOL 1f77b5c03739906b15ea3e7fc7b43e50380416ba447a7b6ee1da969d2e0f7b881680aaf5f233b0ca06d829150f6ca1a51917ff7a1906c8da723078b08032c553
-DIST firefox-53.0-ar.xpi 479118 SHA256 0df14612d4a6fe4e6da247b8529b45ab856d3a6d6bf284dac9654af2b4c91909 SHA512 ec6744427a47e64425c7d2632be23f4996aa4424285168a3dc1e2943b64cfcad0606b071d94155144cc0c33d33d893239835b81cee648283642a28ab87dd7cd5 WHIRLPOOL b8f1437bd92a50a7cbfdd1d2f29cfde1f59c20a593c6d5c22b73ef92814fbe4d4d3d9feba6fcac3226d024cf28ca991c1f2dbf9f8caa1a54bafa2fa8d0a43810
-DIST firefox-53.0-as.xpi 491255 SHA256 67a780398046cfb66c7b10d8aa3e42a7b8eef5d8eedb2f7d890ab1a748049708 SHA512 4930e221a8e2d9d98c56b966c94c2506cb9b6b786ac3a04d074c83c46b1680e0d893a101a8ef3ae7d23194d33ce666d55649b68c23e4692e73fe00a8bac60b08 WHIRLPOOL 213d135f0188d062ce3fddae96b05047437d8c4f944c7549fa5fa35d4472b5059010837ddcd29e09d2151e616967db6baf4c57da7ed82e12a1482438e619c75f
-DIST firefox-53.0-ast.xpi 445436 SHA256 0b0cab248642b295d3ec4fdb5206c4b4ab3ec1d8aa9cec573f230bd6fa75a816 SHA512 835ec77b5638e56e2030325b0c706486475a13999d2b05043045b436ad6f0616ef5d7850e4a6048b073793657ffcc103a1bdf3f91ea04089ddd54a77111b97a6 WHIRLPOOL a98d272e9a8e74d36cebfaa2ebdd87b61209c18cb3d13ceee98a47b54102c7d22e55ea109beddd7bea7b597c8ae6500642d414b0ac507d6065fcecd9afed3e65
-DIST firefox-53.0-az.xpi 459503 SHA256 59ead0e267f43af93c7caa1148947224dc4206d42a37f80156ff47adae994261 SHA512 7a097c369846e67454385616208d92099947ba4b432d67c6385e6e0ddcb22f630c4c9a9d042902220bbaf119a9aed0c8b1c9955030b9a566d22e0e62ed3a65fc WHIRLPOOL 5e42d6bfc8d34d9051a5c3f02f11e94916be66ed655c826a0f6de3d00a8030f6d4185e648bd9bde00f48b7eb3c7adc3c3a71602f0088b114f2040f209d906b7a
-DIST firefox-53.0-bg.xpi 492607 SHA256 5ca6477997bd96165af804a2a8bcd6c01c8bfb5c9f98354e1602f49a922cf65b SHA512 e8b64bf927ea3f5842cd9616685feb6c58602dbd6b731766e4900a01444ff9e61d0013a69897f30a2c4ca29d330b4decadca50ad9d7f72a7d4425160c4d8c025 WHIRLPOOL 29afaeb3ac9138335c58120db77f88841910d1b457e90886b19541f55974de6c23933c20d27c5f4e95abd8944dd25a2402da599aaee47ac60bdde3eef43348ca
-DIST firefox-53.0-bn-BD.xpi 516501 SHA256 9f52c102c056489b2187f9d781a645f2c1d205b812a3ca6afdad56130c211c7f SHA512 7f27d971abfc31cfff9a2acb5ab5bcaea95141e40121c03ec5d16898c699a7937e37dad6375b899da43e45438d82b3dd7d9fffcc2e5661383f8a2617cf43b40d WHIRLPOOL 4b8f82f69b68e26544c7ca7bb2ab95be4434d8ef12c5eeb280a57e3f614200848c250356eb8a83f497ddecf541253fa4291791d2f793542014fbc6ca339cbd8c
-DIST firefox-53.0-bn-IN.xpi 513552 SHA256 f913e5d79388285ae6a7e7f59b81855135336c50c37e3dd90cbd101057017600 SHA512 4e6c1822e3999c5b5213162a4582f533c1fa6d1960b08fc869d1eb864a4c4ea7079dcb89e76b2aaf036a5bf72b84ed97c0f2c1cd6af0d1a8fc6107f6ea481dca WHIRLPOOL 824b15e79c5b181c0783583129af694448fecabe17b3d8719facc7cccdff44d62066df771bfc64c355f4ded8b553a462151108b45ca28e4e92bcdf76ee5366e0
-DIST firefox-53.0-br.xpi 440067 SHA256 0bb79e4c792cd3bba0804064f91963389daba26a486cbf3fe84045ee6701ec07 SHA512 54e537cff098548b693e9bc22ffb6e859e74dbdb2e0b8f50a5703e9f9d1da9faaca20b05f2c21cbefcdb5a55ed7a7ff2f9b4c55b36e896bf6d51a94a5e9f1970 WHIRLPOOL 2a7858cdce6fb074d1f06daa03bd616ac3869e639bf9de4fe16295dc610797bae11c4e670ef51da927a05f6aba5af729afd661b4722ed87112eeeed3ee9eeb56
-DIST firefox-53.0-bs.xpi 446633 SHA256 e4c803a77b70c0077c3f0fb467a601b5ff143a37ac8303dd97005b7aa3007864 SHA512 1d09ca879560432877e9f055a7e7c3d25a47c98f83dcdb30404d89a23cfa7383ffdac1c3ff306f40ffb3bba6731ab41e160b535e4aaac8c0543b85a1cead1b89 WHIRLPOOL 169ece94fb0cef47e2e2d6fc3ac4f76163a5022e8cc8a896de386ad0602fdae1a219bd365e24861d4df39b772367c529aa9a265ce772b46e50d50ac68d298438
-DIST firefox-53.0-ca.xpi 448941 SHA256 18483d647252cb2d6c9be0a2ec460de22cdecaa492b02d4a1ef3e5f9ded2aa59 SHA512 ddfc2c14b8cb7ecb8d0e67b7342c3160e39005414874996a98e027bea89a5fd33ab38757310fac1ae31e2004cacc743e909026a37e9dbe9a3b553685eb874ea6 WHIRLPOOL 53cb59ddea4db3446cfa95d94865cced34e576f44ffdde783e200f3e058e1c328d19278ee9abd848daf755d18348ccd4fe9ae64da636b6879081462029b6f97f
-DIST firefox-53.0-cak.xpi 463841 SHA256 c7e6c39c58040c23e8baee6be87be9f0281a09198e2ac497b04b12e5eeeb9615 SHA512 15bd378516636f987b615594522d066246131d4394d373e69557444d73ec62528b2f40232dd56aad8b7760f8a530c6a86eee838dc5a3c00a03f3c268d451a28e WHIRLPOOL 60695db91312fc3f50f44e25b1513bea5fa9cb930e46d6faf1cc4685313e517292493d5f3d0aff1430bc8d183732a74407b2be053254bbbe4cc6999ea9c5a6f5
-DIST firefox-53.0-cs.xpi 449411 SHA256 5335967e578088e691d59a6f0540380075dab79e611c53fd67e2938da432f25a SHA512 a4fa11a47719366ff67608736afcfb6340797399a5b3904c5edd637a1f349e731c9eaa9a2a1bef1853d204d4e89a47e1c112c4b1651cd0b0a1b1b675deda2d88 WHIRLPOOL 5691c2e6fdc88818fe671616c1205ae554f0c3e4ec0bda0daa1fdc648aea5bb87d3c1e97004614900fbf4cfb0344cf317781027299cba24faf088dc7866e5187
-DIST firefox-53.0-cy.xpi 441503 SHA256 0822da739fc2ce0bf267dcafc8af2841432e62793e4c66ca79d0d937c4e5780e SHA512 7b31bf02e30bc40b2f9514272af135f00f302505cb253fdbb1ce06e26abd4d158423dfff0059394a7fb6e477fbad05ceebcf81fd1d079b1fd39e75b01d9b8f1e WHIRLPOOL 8302de84de87f7ef753acb8847e765d4152a6708322bfecaec06aa5922cbe0ea1336d3a78a02f9947b0bd5258ddecf3061e12363e2b5072d8b779f8f1b2953c4
-DIST firefox-53.0-da.xpi 428973 SHA256 823dfd42463c4b31a6a5b1cfdcb79bfda8e80ade999cd9d481d09e48b97190c6 SHA512 190e62327d98681214d6b72ca4b907fb3364551fe469f1acaf0bd873be8736266f8267655b4879264009ba6415767b5a458f2a67e62762588841f0e7362e9f75 WHIRLPOOL 92f5dde49faeb752616d33c4c89edaa1a23e21e790213718fb53c9131e990b682b8db74bc6d96c01c0656a45406cf9b229e281a15a5d3d642774baee3cfd520b
-DIST firefox-53.0-de.xpi 447784 SHA256 81a6ac063827b7c3eb99a26b491e26c5e6898edf51e2d836d60e14a69a2d150d SHA512 bdefc977a061009540469b134705f7a9e9bbf33be69ce1fe41b635331a613e226ea0fe0f93080e9504a1470257fc6a5088afbd3bbf5b6ea7c2f11cac162619f8 WHIRLPOOL 8d1a75e384009a05ae20d2aa4f2cefdade502600450c85d497853fbc475296a948d24c43f69a6818d1f391fb49eca1ac15a7b30784fb83e402f78058aad58dd8
-DIST firefox-53.0-dsb.xpi 464374 SHA256 72e03e9bcefc173af4df02bfc99f22df99e7b3829cbc1d07de1b3d98e8092b35 SHA512 94fc6a8e05477944c548364a5b6ec867db4ed7c3f6f8f4e0a0529e64c5d71b2396f635e52a250aa3ec2501ad98d091381425a223b9d66b6c22be5db46308562f WHIRLPOOL 8faac02ed9e96234da3ca77f889b401bd944e61e7cd29d00994d0a75fa7a371535d34bf0a39acd121767c0f3f332429ff25972af7135f61b210a2ba34138f592
-DIST firefox-53.0-el.xpi 523412 SHA256 e8815fb6cae7632d70ae00cd28293a96f9d875f4f2e4e6c1491751037f293437 SHA512 a320af4e26bf0ad12531db82f6a2b3c21793650ea8dea04fb86b700a420c4d60c9f11193d143eb5bd28831d6134e948b2288b14726598453ae110cb7a7863752 WHIRLPOOL 76051830746d61c86814e1db94bba4f6f5979edaecba53345aece593392fcbd2dfd1e3e4abf3b3a37d4fd527cbfb0474a9983373451d8a66805e3e5562fcc71c
-DIST firefox-53.0-en-GB.xpi 424829 SHA256 258bec58ec28b75eb3db7c9b9cc68af21497eb49603994ace4aaa105840c84fd SHA512 5cdca4ac7ece2cfcb0537d7afbf81aea7aabe7e8ecf225e14181d4a8c94063a9414d97f71d9773800f2f16e2b29bba624cdde87b30fdc22d5d241ee107e0a185 WHIRLPOOL fc953fe5be18b6ae709084a5bd85cd734a48e1eaa2541aabb3c9b5e8b09ecebbe070136d263dc3f36ac4274fb933b2953a4e1e0445173945d96ba4c5d36847e2
-DIST firefox-53.0-en-ZA.xpi 417992 SHA256 0fe0b4fc2bb38f15bfff36e44bbb2c62715daaa6b242f3914581512684fddeb7 SHA512 c69d405ec2d02b2bcc450acacffe3afc0068b909e09053488af73539fe9f631c5b331054b2482cf2d453f76b6f9fed907963599a2c22161284dac132560fdd71 WHIRLPOOL c1e291dbd3e090dd709e5b75cb7f1ed713d8de9a3f80d448eaa8ae4c06e47f440f5d9140f239046e01fdf5d315924052b9f3a461cb66cca1b51ddeefb7d4d62d
-DIST firefox-53.0-eo.xpi 442322 SHA256 541501fc0829fcf8147ee269224928b52e6cf4e8f1b362a4177d63f906db902e SHA512 b486f4c51f654a55dd1a74783e7e9320abf4bec477f2325e7a7f2eea1af5611ec4da82532154c74c90813c39fb3943aa6244d63ff30b9fb3cf536f13703ce929 WHIRLPOOL 151fecb34536713ec8e93878e203a199e1b6087498f7bfba8f725e722a566103c405bce5c46959162b777be93675198abba687c6fa5f4658a785cb7e0b769bcc
-DIST firefox-53.0-es-AR.xpi 450766 SHA256 61ff3ce7467b5222e110107c4119e9f752645ad0b31c6b614487bb5c533a0311 SHA512 08ab728d9521ffdea342b3e2f3c143802ccd62b02bf9695e2e665747cb15900fe37b0b3115f647266096270947e3195cea03129474ae6784de1db19f6a732760 WHIRLPOOL e8caabed33ede40d3f5a8a02038e58e8054612a63f77775ebaed055abd073459e9528f14084bce98efbd06aa9cb82908ada619958060fdf19fd16643a78f5bb6
-DIST firefox-53.0-es-CL.xpi 450475 SHA256 a806fc6176247cda5a54ef853c9637775f9a1c2e29a87dd1b55742a71f852b33 SHA512 c23148188dc7f17605aa639d502e68b7a9019dcbdf53ad017c9184573092be3734cee6048dbf78eb378a3ff4764e7fe2f035b269e065f722af7a8673deb049da WHIRLPOOL b2dc7ace7373cde09de957b9a0b78e183037d91cd50b32ea2ce62586f0036611b0e101619f9d58902b9f73362618a431417c3adf11c8b569726d958acbaa55e7
-DIST firefox-53.0-es-ES.xpi 347587 SHA256 8604ba37430f71b800a67361ce53b2325d7d71cefd0167170db35c4f2e02ce59 SHA512 a5f842293e924666f55d2604da9ca48addd7f709097552cd266e8de8dfa4645f0c1c650ab762efd80b30e90edbd0c8e130f0b3c6b7c7941b003d1f896f0d83b9 WHIRLPOOL a18faffea77eb54e00e3e5a7c2dfca284f8895797a5d76146cb2d9cddb1968d040090d509b426a0ec9c8e4cc66b20ccecb7b6860a1d49e1cc1e369368e70ad1a
-DIST firefox-53.0-es-MX.xpi 453324 SHA256 2173f50a3dea92c658a7e60ae76fbab81335e2bd843a835bd31db2e6162d75f1 SHA512 7377024585c1b250ae361d0e13ba6eafd34a8238630638e2d36b67e8f91c92c32bc09eabbcaa9f7daee4b735a51ce5d6879cf2ea5934437726585703ab2ce7c0 WHIRLPOOL 0c1a0adab7270e5cb7a9f1af030b22149a917c8351e1b35d8fba4a8b9e635811155239cc16df7f7580267096127c11c4e9948d895a12d47e02350a403f6b7626
-DIST firefox-53.0-et.xpi 428863 SHA256 1ded0ac4ec18c88b8c9425a9f00f02112514c0474c442d445fd210dae019bc77 SHA512 138b4c83f4b5e2ff937a6341a5f89986ec24e0da1146d85d18e3d99ba0a2d0ea1688d4f242bafaf2a9c8ce8c7be3d4a5c351443343c705e423672978eab5d679 WHIRLPOOL b6c4d7643f59790c8ffc8e63766bc001f864b1fae2c8d055e83b47414d4639b0860297d41411454871dfff7a51993a9252e367faf26bb85d80648a375124346f
-DIST firefox-53.0-eu.xpi 443202 SHA256 624fc7dfe57168f616153f03f34348786f82efe5dcb0a510d4e42c93560bede7 SHA512 7521ed929102bd3ebb123751f2d02b25000d5c423b5e408acd46f353c973c992aa0fed1c2dd5ed24985cb025e0e3fab8aa46bd27871f5629a565031117ce8e6d WHIRLPOOL a3ea6585cc2687cf819c9143f7581aa385f9e8a3ebade09ef90a62180edb531ef40e49e67ff282762c0a8778b4963f078df516ec040522b63a9d72758ef5b59a
-DIST firefox-53.0-fa.xpi 496781 SHA256 a745c9cdf381f18097755226fd7fff59840c6498fd8601d8850f7b22d36ddddb SHA512 f3fad58f94ad5d3b79fed59d28bde33d47e8f268d03d95a71906fe4c226a43e9eebfbb8e376de4411451b3c36a718a492944ba22da26ad077cb0d870b03ae31b WHIRLPOOL b31c44e9c0928e716d6304043605ab05373a93bd6bf65040f77d0b1b73c4c5c6a8ddba4521238a538e35b44aa1a1f341f862d156544ab097954f5856cb04d843
-DIST firefox-53.0-ff.xpi 446668 SHA256 f68a9e23a8e2a02ff493ebd0bd9698b17ff5a5a3850bc8f21bf6fe2d6c6f22cf SHA512 5c8d28383c5642e96874bb9228e5c8cce513b2c65b24bd1be85c0d18712299123ec5043985c37d027825af1c4ba4cb323c7519f62a34fae55fed770f690412b0 WHIRLPOOL 5cfac561186198e7d3ed2f90e80df32e40e2561b727ba32f1dcf1163ee326937575a9989202483e61a5bfe012105c490f7c362fd86d1b144cd4a935cd0ebd101
-DIST firefox-53.0-fi.xpi 434620 SHA256 b99cc77e76dcbf9a25fa68c622648aa9e2db64b610c83012d8695f13e55d23a9 SHA512 0f06840eb80fede107f7a7011e6c6849dd6c98c23a4bcc668a454f94e062d6d734fdbf7227d54e775aa8daf99be34a3cfc15e196d46a72f39655798f3fa7450a WHIRLPOOL a86e46446bbf7876c741d492f3c71252dd9b637ef599d9da711dc21b3d5f13540c1a2f852fcdf0de8d16c0876d69ed6e4d4e630232414a5ffeadf904ff564660
-DIST firefox-53.0-fr.xpi 457534 SHA256 85436c3886b9b89e601ddf39329af76275a0010fb6acc723574a239154cd3f07 SHA512 4adcaa4a7056d7a3728e01de4c31092aaf5c8afae340f68b4bbafb12e14c789488f38627388e9744d57b6aa58340a2607e3fc0ec70fd5c346e2d8f1dad13336d WHIRLPOOL 00147bcd49b8dd8dd872dfae30036e8cc3d3d5d5aa7ec58899b4ec3ecf4eba58cd61408654f332c999a96727788a15828ce8dda6eb8f87465bbd17751bf5439d
-DIST firefox-53.0-fy-NL.xpi 449819 SHA256 1896b79fd6ac6bfa4beca5f56d88292375231836d1d031a4146b126f464403ea SHA512 2d2a6f03f992715f049877339eaba4f0a24e36f83f2b1405800443bff276e4e0f5dbe3b210b98ecfafc8a442d2adc22460dd09afabc88abea96993dc042ff223 WHIRLPOOL a104046a97c5148ab11902a7a580d0a00e726b0997cf4c067de551882926753174a85e1bde06584ccd9cb7b873a8162d15284a9ad218364ce2c907e3de391a4a
-DIST firefox-53.0-ga-IE.xpi 463129 SHA256 c276e493fd8a6a77bb9f6a0542763ded93ceff0f74dfdc7329f2c86105d30e6c SHA512 c5b5b5135778f58d2e5137fc76dc39e596f45397dac8cdd69f184fefe7cdcbd019e224b26dd8c4e80f434cebd2c85dfffe75ded98ad4a8fec5e080cffad401bb WHIRLPOOL 5bccb95a1986ba8117bbd3866d5168e4fb841648ec8882e9a5f287ac8e79aaff57d07979fadf6dbe2099a06b0181e0e3a51209296c51602d7f253c3cfef59322
-DIST firefox-53.0-gd.xpi 452061 SHA256 4da4ab8fc415524ea83e99f63edc5546c0027e8b3dca1615905e69521c358a38 SHA512 f5502922185d4980ec14aa9e90bd76305babae7b2ff2c8e0567faa5a7b109dd537b5e7d9a5c9fdd094c8791a410deab473f6710b543c86d7c09896f8ae76937b WHIRLPOOL d157fcda5e913fbf39be498ba2f143981fdd21bcfc94c108da570228df3342afdb15fab13ba687c237e5f78987cb7b5cd53a6dc0b238614176a44d40f44022ec
-DIST firefox-53.0-gl.xpi 449150 SHA256 3a6bbcc4ac4e7b6a16031a64a8b8518fa18c7932d90bbbedfa79beecc32ece96 SHA512 ca16dec272476b56098b4a0ee78bb182265a024adb467d7ffca0e9760ad0910991ea72990479adc3cd35b26d63ae2db5eb8122f579bc53d649251ac156b9aafd WHIRLPOOL 4e392d9b2c72e4d222dd9f7e549a22aed5026ba1caedea20016df8589d404678f3b12c9c834c18de647ee43791f2e033836c1b37acd40b977e9e6596a5a498c7
-DIST firefox-53.0-gn.xpi 461571 SHA256 b750ecda7bef4e14213d8e04281e080748cf48ec6e26e81457de9451aabd1454 SHA512 7faf0437834af7a8a70944879c4d288f4adfc35d59ca23c7cdac3401344566ec76511866a9fecdbb05375ef627227a6aeda55feff5edbf76324f99606c034bbe WHIRLPOOL 0d90a0476cbe4f683d4d54a7701411b9ca7529c87fb463f8ccde42f210f2ff77759065d4404473b8e6a862d26a4b1ff87ff83eaaebc1d5aaec6f6170dfadf98a
-DIST firefox-53.0-gu-IN.xpi 493667 SHA256 922ab30d6f1cb0747d1cd18ec526014e6f1761d5667f5d16eed834ac214149f4 SHA512 6fcf42607d22435d3e443720cdb6695f86f778c9fdd86f3cc8923d66a8afb070437f2262a0c075d2d2c75a8788a5134445ff8f436b12bc7f884c2f7691d7802a WHIRLPOOL b0b15b1bee3468d24bd87fbef24e8301716e3277a6ec4d978dffc83ea443b57496bcc3c8f8b3b18c2e1171ca885ae28ca990bcfeef9d0fd2dd1a39c5d589803c
-DIST firefox-53.0-he.xpi 460047 SHA256 11d021e790ab97612caa09afd29586fff8d680f8c4267920180f4a2b888e34a2 SHA512 a92299af7bc6d07112240405c912ff92599580612779b5c61e641a9b067b99e71cfceba7b9e91a26cb1e03df9ca2107b4d50fed730290e582afd17dca7cf1743 WHIRLPOOL c8c7fbdce100657e9392170cac90949087296ee9fd36835f53ed87e3781062f4bb673b1dfeb774ae60228aa1ffd9122b4c3dd682a5ed78099dece54200c5e765
-DIST firefox-53.0-hi-IN.xpi 511787 SHA256 af30c610f0e1300a2deeb47438e303b1714fd554f7859693d0a55109915d66d9 SHA512 6cd1029135e10a2afa7aaf6ec5980aee20a81dd312ba899a8c70e28cf9932fdd8a1a7edebeabf2a06c6b204eb879d30686b2e57609839fbd727468156a49c10a WHIRLPOOL a1637f2089bdb5a9d090381c29f22710137b3d635e3a386b7bf977e58b574d835c40444d0d49fdd63cd8d1702e647367bd99878d6e5f4df20775d5a9780e37e5
-DIST firefox-53.0-hr.xpi 453109 SHA256 f4f7ffc50536c254a274e593eefb63fa5d26601968efc4f53d71179c6c95180c SHA512 7b6459ac95a5fd2fcaa288aa22e8cb7cc13d1a4984e82c0fe5e73dbbf63c758c9d228d387f3cb9a55c36299bc088117be068815f7e93729c3b725ab772054c76 WHIRLPOOL 6ce5ea9373f6d01f5c102af847cc553ac74e7ed8ba86e4a748173e0af44d82cf36c090fe130c37d0535f0a5c2cc5d89fa7d206a99df68b5839663f4da4bcb009
-DIST firefox-53.0-hsb.xpi 462170 SHA256 ba0e3f0d2d40c45d2b481dfd2680a2fc312e6eb981058c85e696690f90f52d4d SHA512 63e562f21a89701befafe68e96400eb4828799179ddc791cee2b08dcb9e028de389290b5e127df6ba5af73872bff24e8bf4f7d7d96b28ae61abcc5a41d056bd7 WHIRLPOOL c219ffeaaa206fd00eb064ad1b1d3d8abd799d42a78e7be70aa4f3a70d96582c43cbb3ccd1a3c146f3a62b40e18c8a23c509c5f03448700543fb9dbb5d4e2600
-DIST firefox-53.0-hu.xpi 456925 SHA256 486d533bddbc6dd76a435fbe4efcb092218ec13ccc62aaaf2577b118d008bff8 SHA512 577d05dd5031137ea496da6055dde16b6594450e79611c6db8621c58ff64b0a58eaa02e72b982c9155c78e7187084a9feea37893d03c80a999857b54aa779a18 WHIRLPOOL 9fdbd350f227d6ac33478717e85a681d09084818172a45d8d47b2764664d05e6856100c11599dea10d694b59fd69cab4c2ea49d027903b45daa6844070ceead9
-DIST firefox-53.0-hy-AM.xpi 500717 SHA256 d0b02e04e824c1110f3bc1c16854e0d65632fbc1683ff149def5cb3878e35dca SHA512 177dc4fc2a011bb3b061d2ed8cdf92b013c771241ae152e85bc55039cca3c123bad4925291b853630be8cf8e5778ebe70a9276c3fd16a5dde74791457fe93a4f WHIRLPOOL 4ef145e0058b6aadd69a74268068aaa02241080d9f4d3636cd7326ca75ba4bdfa8e5a2c834f19757f3422f4af038c48009a765ea922e36de50447a62e2185b51
-DIST firefox-53.0-id.xpi 430280 SHA256 e4533c814f961d10f807c9e575989e1116bba1369731fc8f46c00fd5cc9d966a SHA512 d983e6c3daa202a7af15cf01064b77e1f21381cffa615312f38c580f7848c6d99af67a6883ca82f5eb9a85b5a90500654e551d7ee4d0e8da80023123be6d96ef WHIRLPOOL d023cfbf1b259ac33c301c4340834b3ae865c45dda16f4f5d5cdc2c0f65b699649d5d07626e95e1dc8478a17f2edd17e46c245c246f18366f83e2817305dc525
-DIST firefox-53.0-is.xpi 447329 SHA256 da4be8811abad593f3f8bf06f922ccdc0873a59ed6f63fbfc5d541272e211b89 SHA512 fe5f2a8faae8d2d649e50ad5038a10e0818f8561e4677a993995f7da1675426b9abf5cd2bc307e43b5622decdbbd27158a316b5add0e4501a3451aed0f2a94da WHIRLPOOL acca03197c049cf1533debae8e58d2e7f757c12ad4001ad82a5077b28ca533e17cea446feb3a5431fdc3a21be44a7a3c2b8b756752229c21f590bbb9444cc400
-DIST firefox-53.0-it.xpi 341968 SHA256 7dbbe76bfea715179c118ed0d3547596454d45e9ee0b001d876893db807b68b8 SHA512 2c37e8d68bb8fc8450e9e2f542d648b8f3770a9893f6d6e30e4ec484fc6c755c3ad759e4ca1e5458f7d1b11132e1ebf2448741aa86223d0c2bc844dd3279a767 WHIRLPOOL c9aa41373658199453123e9ea25efc6267c9f3dd88fea143edbe02ec80c210a12666030908a8b5185adc58ba60b9c614d026776f986e5eb44eae4349a046ce8e
-DIST firefox-53.0-ja.xpi 493027 SHA256 d0ce0ca453f180cdf7edabf18e3268f3117c70018fd2d06f870b60eee8d5c2cf SHA512 b4c61dc4d0884d896d62c5bff30101ae5373ec74b88389a8c12ad839480264e808865cbf9a731941689c9641f4f876ff42cfabf450042bd04b4c2202ebf1b9fe WHIRLPOOL 841efc1043c1d5b39b5a088ac62c78abf902d925c7a0cbc91fe83ff37803b8738c620beb483c02f826c23d7553048896fff5440c41d4db3f1734d6ab8165ba9b
-DIST firefox-53.0-ka.xpi 480044 SHA256 da85164011821c7ed22bee32fa10d186f50643207c944d0eee8e2b05640605b0 SHA512 a19582f073841af256bdfa3dd2e39b22b83a87c114cfcb083ef32084743b1c799e6a6279d16383a2e7df986235bbc8ebe17ea408b2af8be165a722fb7cfdbcbd WHIRLPOOL c51191ca05d666768948e5163dd2a590339774edfa5c0cfb8bdba0c15f8e23a468e686bfad360df623c8bccf96755c087d38e0312303a659fd0a67c124f85e25
-DIST firefox-53.0-kab.xpi 449396 SHA256 b5f8704fa4ef9542b38cc04bbef4b8d8b66efb04c3932fad8268b87cc83aa6a2 SHA512 2a42225273e4d2986a005b59be861830b9cf74fa56d79c2e2a44a07c905f3177307ac92f7602f497e19a44bff1a4adfd35b8378c1a362fed3a3bc7b713d1dcea WHIRLPOOL f5f1674a8109bbc212ec4c502fa75278e9b472ba2b1c1d7c370531ed2bf4badabe52a8305284d6be088c4e8b3f0e08ae514becb2a5923f52d10b4414eeca00f2
-DIST firefox-53.0-kk.xpi 499340 SHA256 29bbb10188bac81daf7d73c82da3d4c653fd4b8ae384527b18bbda3fed07eca3 SHA512 6461a1b8d8554c62265f89bfd4127254bdfb74b5e5fa29221840e06a894c38a4e0e95b52511160010e370ebdf4065c2161de7ca997a2c7abcb0f699bbad609eb WHIRLPOOL e977b3ecd4689372b1d517477c8d7b953c9f1a830986643062d1289ecd3116fbf84580ce386da0db39f7be9d99ed2a4a39834da1c0de8f351025b2a3ed34d31c
-DIST firefox-53.0-km.xpi 524728 SHA256 36101d95663960644b096602ee3db596b0f1e59ead95e9a5bf64be3accad8bdb SHA512 dfeb2454e76eb1fdee4ab6a62ca3db1f90d5ef8dcb29c7279ae6986d5a4f517a4552eff9827f06a4682bb285c9c8ebf37f0d4989721b76af79ca52108e4f436a WHIRLPOOL 96ac3989cd5e2c7454f19fbb2b4aedfc43a2249c33337288e0044d112db30904933ef4a8b10e9ac9cb49dd225ef7681c08f03bc766b85631fdce8ca36effde10
-DIST firefox-53.0-kn.xpi 524035 SHA256 59c340fdedbf240a5e46e07144a11ce01cb0bd83d4cd7fa0c611e2f2bcbd465e SHA512 c746125babd1c2284ae09f0adcb9327fd624f49c5c1e75b3c853968db724ad49a2452b0363febba15b0d9d25ec78994ef495405057fe3ee74468e48b7037aeb5 WHIRLPOOL e8e9b8f02ca79a2e3f8590a232ea311abd43c93cfbe358126f374e504959b477a7ea6168302f5ba03ebaca09a155370924dc67fd1c666dcce3c6dfad4dc1cccd
-DIST firefox-53.0-ko.xpi 468651 SHA256 9e67ce2142de5d82e959dff3e812efff88ec34f1b691d07fa0312a50173de95d SHA512 874d06f5756b65a6fe5b57b3f16cb2812ff7b30f1c2c69112d5e93dfa04d6da4000090e54f4d3469fd3c00ca8a7738bd0bab97665e367b46984f6cfd8ab6609e WHIRLPOOL c66ca6bc0cea8f6b3b89addc1fc61a878f1abb4e990a3d52b2a752ac7af52985f8287d284e998c4b5aa4d1677116a03ac0e378475205f84755e3f4efe319921a
-DIST firefox-53.0-lij.xpi 435428 SHA256 c739536b93b9f8a6b97f958531d19907752d77619d84232e03bf9b14bb543995 SHA512 0a4bf2fea3c7922ddd7cd0e1a343b47ad3ca894e2048320aa0f3538f24c7ed4f5a638b51025212fc7204d440e84d693a472e1e87addbd87810626f3399742916 WHIRLPOOL c6837cd8c6dc0eea381c2ad9e690b7899e6edaacda4109730e137fda5b5cf85406f01215168261117a038de4bffb26376dd7a9cf919404c5c7f95d83a75eea35
-DIST firefox-53.0-lt.xpi 457033 SHA256 8a42c0b05b37d3554ae70478a84a16b8e78ee3aa6eb26a1b6fd4cbaba0e9c1bb SHA512 3c26ebe30e5912f73d1427961896bb1cc3e79ba9362bf40d6a7587bd85ceae5b1b42c1506c9b07d1303b5d3c69dcb37de53fb266c867b2b906d0cc7b0f165a5f WHIRLPOOL 6b079520156dcbae9c5cc12e4a35e8350cf4e9c4c1bc2a1fc9e835ab4b33407bcf318382cba308c0438edd75aafe7e48b80fdef0eb8b837631eb14dade5aeb83
-DIST firefox-53.0-lv.xpi 453376 SHA256 e2067c4beced017ce7559bf0bb610d5cc3e2fc0e2d654223e93224fe09f26c49 SHA512 3a50082d07e3deeff5dd6841e927d340c7e58d367e7557f1d4057a7b2c9f87fc9f67a8740e7748fb9884d064deedcac91e490d171afae7b984b80d370c3c7bbf WHIRLPOOL 42fe9e654cb608e1b79f2f698b9f86aedb35aaf7dcf394d427989add62f33dbf5705ddb0dcb54f3a52a85e01436091717dcfe7e0a083bd08ca2ceaa71711f57c
-DIST firefox-53.0-mai.xpi 504301 SHA256 de5a34ad598a77c50be8f51529ec384f163ab388d6c14919a1928bf00dc4a8ea SHA512 cbb13e164ac0c4735eb0d5add068abb837284365695c9d33b74990cb79e7696f12519daf1b5e1a941b8b0594409e3f1882d01919288a4c53e6a0342f0d60738a WHIRLPOOL 9d6cfd40c593b21be34bdfc5e128dc07c4bf0e5177b4086163512901bb309f3984d58f8cb3e377bf9202ec9a74c4277048320f29bb71b08e7e8d096cd149b6ee
-DIST firefox-53.0-mk.xpi 499954 SHA256 bd05f2c417b776651c5aa58f610d532a7b1402c9ab30fdde3126e3bd7b38ccc9 SHA512 814e0481d20b1f3dff33a2b07b9225c3090c68e57819709aeef4ad285589f1f6a8d2bdf1908021fa261a9a91cab6b620b9780767949e375822c2061d73259f74 WHIRLPOOL 17f1383f8f9f8cd97a9e95002a6fc930a409b7bdb7197b55e4f94fd2b813632cd4c6b311e8c8c407b18f1b9a380a2cd3621ce022d51d65fa8d9c84bc0c1800c4
-DIST firefox-53.0-ml.xpi 520665 SHA256 89e1127cfd43e994b39505b901e5dc696acbe744cd55f30ebfbd832530ae4d59 SHA512 75da689d2cfcf826563b6c92997a5e7d0346c6955700275309eb81de15604160f3afad42486f2fcb7e78756b76535cebf965edebaabd7f4f807635456de99d04 WHIRLPOOL 005073e25ceacd90877aec217485a904080c793a58629ef1411632a34234442ff7d23b09e70b21c1ca44293fdc32dd5f0f65392499743c80bec06750f3ba4abf
-DIST firefox-53.0-mr.xpi 507881 SHA256 94d69be50f1c958102715dcc93ed12f2e9e8b8dd9431c9f675949b9208a0ae45 SHA512 1f03abbca384cdd8edaaab9307a7963b819c08f37223a4226fe80eb745babbaeff84c5a165475bb1cc1ca679dedae1909fee02bf16b7f4638b2a8365b9cb9873 WHIRLPOOL 78a3877ebfd9c8d838d240c102b940ea2125dc559a231412953931806aa2729e2b06f85ecbc84206631a124a9e9bae2dd6bbf14187447cc8842dc6a4f3cae6be
-DIST firefox-53.0-ms.xpi 440726 SHA256 d0a9ebeb04a68cbf250cfc02aca420e1398d09709dcc2ec2030b90ccaaeee314 SHA512 fc9315425ad9d1c5dbc48b604c5d648cba15352290dc6564cda75dbbeaa7e70381f85e540a0eb71e26494666c1b57722375d5bf0ce6e1aececcf336437656b5c WHIRLPOOL d8515e9341fce7a2b4ad5aa9f05f1080d8c576af06703f793e90431445ad8fa61d0928fd4d08cbfbcee9045f58a08f05c9d3d1dc304bdaf887844a4e897ee129
-DIST firefox-53.0-nb-NO.xpi 439031 SHA256 d87de6098aa2e6a6589a4892009e321702cdf3ab78f1d098b8c8cc4002b8b250 SHA512 14ecb62e647bc2c83bde2e12c1b2bcb6e717cd384ce4565dc426408747a738ea77aa8efec9e733eada25f3ae6182116ffaa242cbad3b6e846865c1dbb971a90e WHIRLPOOL 0603e39a49855b6c0c0f2e4170e1fe8d59da83eddef0136aefb3eaa48ed88f2212b892d56f87c60a29f68c774381b1398ebf23ee0c7f4498702bc23b97f7e6a8
-DIST firefox-53.0-nl.xpi 436859 SHA256 d81a6ffa69b3735e9d2d7009a5272917566960842ef6bfd3d1ddfa79ef486954 SHA512 579617d9493e8052fd041a620463758046e393a62a4e4b1d93a81566fbdff97a2a117ca6869753e530ccde8a7faf8adc2ec7fafd19a84017438f921c420d9b7b WHIRLPOOL a7b3253d21ac9197045896ee1a814e1c856dd1e8e96aaea7ebacf1e0a1de7408cb2804c1feaeeb1bce26dec7b29fe5b22af2080e3a4d9b1b0d050716f6648528
-DIST firefox-53.0-nn-NO.xpi 433328 SHA256 4e514e8d606b0af61e383830fb4cd01026c54670886c4292222280be15628afe SHA512 bbc931688e635a6f0de7d14ed5e5fe85e8e5ce3bf663f3004ef304582a90348a2a186c4d47824267078d249bb750c475df9bfd43149e3d6a4152805cdf94c4db WHIRLPOOL 767905e22fb37d102c1e53f75615093bf96dba761b5d3467d406271f43588a361a90c6447cace2f8e6a658616c0e19e70100601ce61301bdb5a31d0846d44611
-DIST firefox-53.0-or.xpi 501207 SHA256 1dd68ac544f06277082413f6673ec34e4e2472991b6ee3c0ee2e6eb2136da45f SHA512 02bef8380829befef00b7f908d20c93155fd721a5378034a40191e6502abc9639a1e75c82bc81ab09057b05f0b283e37ac73daaa7c9a5737e9a544aff2706334 WHIRLPOOL fb6b04c75cf3234131d9f35d664964df5f6ebaad388119551a2982b4025eb7ad0d639852426a975c8b5b7d7904b2334c53de100d39f6fd93bf6ff55442c472ac
-DIST firefox-53.0-pa-IN.xpi 480863 SHA256 02fd50b2c13337bbda22d54d9284418ddbb015107194a0ceef1983686de8f76c SHA512 256efb7255a74bc36486cc38cbab76497d5a9e98955779cc9e4621b32d6b101d259f661f38dfa1b3accee8e1c70e04444ff84fff6cd085d8caa6333cf3e819c3 WHIRLPOOL a8fdf44ed6325a800700d4f81527d87c07cfdab0361d562cd4504c600482c160d69256ef89e11aab04ee74fbefcf5286ac17f82ba3bae49caf71918787c02893
 DIST firefox-53.0-patches-02.tar.xz 9000 SHA256 bda023900cb3bf7d437a64145ab0061451da922cded4d324887115acc750b65a SHA512 683969301b115da6afa16fb35b4c6372cbb0fadde5667c3c1393956713432a8e0acb994e0c4ff9b24d2ba9844fc9ff88dd85ce9a534bbf425815a1c7793c1d07 WHIRLPOOL 668ef530d808017b00eb8f46412bd5f13f4e56f09213cff9ad82419b069018d82ae7d056b4180cb82d01c2a5065e8bbb621b8a412b92f9aefd069b853bce3a87
-DIST firefox-53.0-pl.xpi 354948 SHA256 a883b9cee7408f109fc1c4f7067081b83d483c341c972d1ba458635e64e68402 SHA512 d6abb6e7660518790658cd07f3e5b6db5ba564f56e2807c0c8e5a72fc7f008d99026e25440cd02765178a1b75cb03425d749340080c29ecd95590a22196ffba5 WHIRLPOOL faa34a964cc2c799a726e483bc63042cbe70f7502f009d96ef5d79dcabd45036d24ea085f33506ee7c655bc53464a15b8e47b53f1deacfdeaf2acb8db1a52731
-DIST firefox-53.0-pt-BR.xpi 442706 SHA256 0fa8dc3ed0ebd891e877782b04b9b256b9074612095feed6002b21d6beb27f21 SHA512 6578ef12bc04877912a194652b1ee7ca774193d61b939d2081f1609aca7482965da473634c0cfd2a8aac5172c7c3238dc8ce096fb28b6cab74c7eebab6ce6dcb WHIRLPOOL 0b202180cd3d717dfa4caa5c453dadde7f4354083a066f02383c07b78f1c9fc41c5f71f4f7dd099f1de38183409777600744ee2abf5a888974a6c8c969ba6da9
-DIST firefox-53.0-pt-PT.xpi 441597 SHA256 e330926df408aa8641f75736a9badef3e7e4e6e2aba7b2ea94b614aafdb563ae SHA512 5b7a43548afaf86c7967f950f479186870ba165f77b4a284f4427aafda3ad5fde978ca632f392e83fd0228759d4c0caf72fd50ea50acdc3b0b4b531d7dc76b75 WHIRLPOOL 9375e3eb8c6eed8114738bd24640f2645169e963c60de3cb03ea580602a31d7d1789bfcc0a61c10d3a1b3c632bec047ed6c7797108a06393ed9311dfe77d3b0a
-DIST firefox-53.0-rm.xpi 439746 SHA256 02b3d8b7c7a955ebc031515048fa973901551e503b469404c9424188f7d7ffb1 SHA512 79e350a71afe5fa1a3d3d7b3a39060cdee3e6a4ebb553de57fd3eed233b1979dc7049d9e5f47575ebae8d3899c397629831d36353113872360d1629e4884518a WHIRLPOOL 4575effc75771dd9cc341ee67b904ce37a92a317c03558306216b872a485ec9c6dffee77c25840a49b9630bb687ae0742ec2492b137b13f2bb5927aae9bd85b9
-DIST firefox-53.0-ro.xpi 454821 SHA256 e4369e1952a7960a95b2c081c8103006b1d0cf6bf03caa42a457b5ef3300ab50 SHA512 ca223f79f445593667a3370b78095c1cef96f2eb9e24fcc63549b0abf784ae1fd26f38b75e01f00c1ab99d4d5a5fd3799d94603d40af89b2d25f373e10d58c44 WHIRLPOOL bc878e1f2ed8c57c245edefdf3bbfd9a35e3d36a8964594a3fc3bab08350ec821a14470cc193de06d7628906e21751fa2c3a6d3e3fb25f5a9b756b7f1bd3bfc0
-DIST firefox-53.0-ru.xpi 506893 SHA256 a2d465ba99ba544cefd517c3c2725453501e04d993fe0c6554c04d5e1a2e52c6 SHA512 33d282a87b173ed0313952b10f246345c31dea0d1b32c4f815d8d3ef89500f155dee7952898f066bab2db166d0b8b88d21ee7dfc5e708de294c3f9edc473904a WHIRLPOOL f91ffff0c7b7aefc323bc6a65dd18951aec4f161eeb9e85997e8fb4a0233861a53e2776937883f9f27b0e7f6e099233000397b9d493735e364d7b34e8e694d8d
-DIST firefox-53.0-si.xpi 496182 SHA256 3f59729bae26437926a1db83d3cb711f5e5a7dc0b77bcb8ded6741cbaa400e35 SHA512 9aa54b6a5b53cf18a4bdaa9f354d3ffb3fa9e32c647358e094ed47fd4df8a41f2c2dc884f5526c8f2744f1d1a04ec051a801fd9a7c5fd22f3e0cbe518635f188 WHIRLPOOL b66936f0c2b6d7728b253b49fd47e27f102339a9980268deac4c5901db91611de7dfba74d33636815566aefa21cd1e9b28cfdcdba42643bc22336b6ad08839a8
-DIST firefox-53.0-sk.xpi 460857 SHA256 9b59cc6c64d376c99f599ba39094ac2c9d0cbd7460e8a22b27d6a0840337e3a4 SHA512 6b14c4145ee47984159b458944f9a0bc2ea149cb788c507a5221510168cf2f3ae92fcfdfc85c335e1efbfe9d055e1858c614f7951d1bad0a9bc82e04bf83e347 WHIRLPOOL 94c15723d3281159f30b93abd9c957eb0e2251d2d049eec877f3b08a40c26ec919b75b28ebacc7f4c4efc845734f76a051ba0b584f38a6266509e588937d8928
-DIST firefox-53.0-sl.xpi 438368 SHA256 04454bfb17d444bb5bee5075e67c63bbaa021293bfdb73ef6c34b41ddd16ddc6 SHA512 8a3bd23bc4c93297dacf2efcce3f7437a2527bc1d034ba6d610412798006cb0e73070f16029839655c1eaaa9903bdc2942382d1e7ddbfd91d62a226b5759214b WHIRLPOOL ae9e79848511b58b5b09034021a9f948c7c210fcfbfc7d39ab91f0563cf07924e62c84ac689dc10ce2db299da9e339e19ecf64dedd3720f8924a215e8a1dc044
-DIST firefox-53.0-son.xpi 439833 SHA256 e3eb6d18f50936eb502aa115f93b23769e7490b34fea9d7a95263a2700a52d99 SHA512 9fdfa98d8095129c15dfbbbb7e6169f6112d0beeab63303277dca0b1845abab7b46024335bb71b06ea6a9e388ec47949f1518ee0850d9802b3d6bd332c736e45 WHIRLPOOL 92cb560c67104863e0e1051b4f47700984fcd1f0b98ddc9d07d3dc2e3927c582744bf89c10f3a0b274794c0804d44b5a169dbed1259b9212f09e48c9691d7990
-DIST firefox-53.0-sq.xpi 453422 SHA256 8e2472bdb82639b71fd57fa8f9beec91fb5d3542b086f24ff53155d12c66abe7 SHA512 81221b683ce505d5947a118a73b7a3003a51a2a400f50399acecce6059e68b7a3b77274c2691cc57f2457b3019755411f2359eeb7f4d4c2f7deccd757460bde9 WHIRLPOOL 9a01457531b95123b8fd61852e42d2bb4ef2f35916554d359c1d9171cd998728c14622cd37d82404ea4cc06db82a0875be0fe044512fa99517295abb135c86ed
-DIST firefox-53.0-sr.xpi 467995 SHA256 c89f53af42e87fdb87cc5f3651fe4bd33c98ed2306102ed91961e2901793771e SHA512 6d435a059e068477273fef97d580f8b9a657f19717277fc63a8002e8b501d3a53bdd22149ba3dad5193e997909c1bd55d9c7914404cefb961255672666605ea8 WHIRLPOOL dd1f32e134ab7426a7c9aff0e3b723b1e30ec93ebd80db4403a63007abe959fb6ce716bb17cc475952dfad255a320bdc37151094d8d11bf77a4bc606cdbfb6b2
-DIST firefox-53.0-sv-SE.xpi 445794 SHA256 8ea1cbf75b2a2dd31fbaabda7af29a911a70d0565c82058f38d677e43bf07e73 SHA512 53c8acf519417349b80d75f39d6d9d73a6ae5d080bdbf5c9dc67559aa2013134d47a083d03f7b4b1163f040d464607ebc014ec864a5c14f6ac8014216981e8ef WHIRLPOOL dc01d135bcf2ced1fca3986981dfe3962826e31ef16e37314e12c33f51023af2976ae8d7137cc3f47d86439b39f0ecb340c62470b115dbb5d4592ab4583d4fc3
-DIST firefox-53.0-ta.xpi 500477 SHA256 6f9c38e64e388bc9d20e29ca63d3ff9b67b3d6a896bc0d647a50ec90295f3413 SHA512 de52e22237f917fb7b07347de866ac5b95bf34777dc8f7110e7e40a9e119aade06ee5194d60cce65af8ed1c05e3c6fbd33716b777e02dbf58a1ff4775f02ddd1 WHIRLPOOL 2b41c4291e1d2b57f0c18b327f4f995bf3dcddd8ed655a91f730e010e094c00e5df5d73c2b4b909807ea1cddabae4d38ce29637a04ecb2f193957f0393bae834
-DIST firefox-53.0-te.xpi 520473 SHA256 b7b8b3b74d150c3d676a2f527f77c3c80c2f4ecdf255e280ed2db3a748e6abe3 SHA512 a67c626fab1f70c1c6bd2f73c250445f4eae656972af0568433e3fe0ee9b443fed06ff9709d3da2e95d8146434566c4c0c013f62c02c899e0d8d92c6618dea7f WHIRLPOOL 4a9f51c3543ab9433e3feb69917084dfac98469b051af867857120ad0c2daab4f814eab5d132256deb0670fcba8737da8a76a4644f1ade702969d2f266533cd9
-DIST firefox-53.0-th.xpi 494085 SHA256 baf97ade535c20e08c5a804a2a08441b07e6237b35970e9471490a8c74fb32d0 SHA512 522db22ad11d92fa8289f28c5459265c7e5da6d339405b0e2db3c3b24603b94e63a6ad759a27e086fe06620b83bb902512d9e888110e158e510031b4a62eea3f WHIRLPOOL dcdaf471efdb5570d0cf0e1b7c6ee1fa6600db32817fe7d23a0725f47827e4b86a1a0857198d82d270c67d347c55840fc808b8676613d8166cee915220e8e949
-DIST firefox-53.0-tr.xpi 445852 SHA256 e25bdd9f0e2fccffd28cfeb4df596a41f762c20933593dfe3ff5b044af703e81 SHA512 51d413cd15eb55a0be23d529d598ed82bdc91136cb1ccb7808e4c59f36f3d39cb98b86131d134d87d8c79babb6098f1a3e831b06163e244966e976e1613333c4 WHIRLPOOL 2caf56def95bbefe1c88a0f5a12375d015ffae97c137f2d7e79c11910ecca23371f5ee671dee0596729de60722f0ad9d9842638721ca30bc0bb1ad9cb6b57b9f
-DIST firefox-53.0-uk.xpi 497430 SHA256 b0259c08112f7a846d9fef89f1fc44130e7ce1760efaf4a0ec6e657c08351fac SHA512 9b042c061504b256ada1326a4d252a0ec666068fe45054c1393006cff141827544515797f14228b3820ed7289421d2b63162d485904a33f8ba4c4688682e9471 WHIRLPOOL c6cb3e9ad6ecdec1ec2e21b3a87a5876e2460b2643c5252ec5692086915e1b12641ce44b7892e34318a7be6c97a186f853dd9c9b86ff420c0d67de72f401914e
-DIST firefox-53.0-uz.xpi 453390 SHA256 4b99ed2093fa73aa086bae96f4b04b34a8ea5f73aeb25ec21a1c316d97085224 SHA512 d25d1b37fc1efa0c363ec033fade8e8baaf834ddaf80da9e6a665cc959b87fb40b94689ced589c0d4783d14676d3d4a0fc3d4808efa6e5925ed5049e3622934b WHIRLPOOL e8047a04049963228fb4a5670b7f2626de850c52a1810aa9406b459c970dea19ff2ae4c042d364d2d9a4cd0db7df33b7b852b580d49509b4ce248c7c5a1f5133
-DIST firefox-53.0-vi.xpi 455840 SHA256 0cdb6fd7573de2f4315d6c1d6011b6d74abb33f1e562a42b5807f4be3218a71e SHA512 97fb79b822f32f3730968f03f765d758d6ded0aecedf2039dbbb0dd9d66bc0190b71da0e5caef9184e1286091fab2f40820ba0da850da30b1f0881ca41658944 WHIRLPOOL a43f33e8b2c2b0dd5106117b690f7d3de7156694bb78b4d689085a86f8970a6fe02706e8bf58acaf017c436a5986c721327e7c1ecb99a10d2811269b9e5b8745
-DIST firefox-53.0-xh.xpi 446170 SHA256 8999ad2228f4a96829e65a0c17f77bd2f9c21cba50f40238c381054dc358660d SHA512 33d556a870e2bee9bf21aec9b3bccd50c78a76ddfcad67b5fe124484bf0a575124d335e4bd80c6cbd980973008631a9b11d979805285eac6732f0b83aeb1a08e WHIRLPOOL 7d6bc3f1bf0a9908b2c382e007c299afd13d2ec0475a8daa16426a7ed0707cecb8b7fefd094df9a12bd5cda4e1160d0f6183082cfbd0eb0214aa4bd2bad12f55
-DIST firefox-53.0-zh-CN.xpi 463955 SHA256 3a0efa39397231033295ba594f4fff36ec3e829727a3c4e1fd7cafa6cf6a67da SHA512 db37c7522e245a652fb30426e84d441af02ef2d4ed528fb83fa61ec00bf8bb41844eb9ddcbfb947bef2878488ac8c799e69f89e86914a06a99964972623849f7 WHIRLPOOL 69f872903efc2277d723ce5372cb0c2e20b296dc775a241a8a069cbcff61de5916e72606c9c0b72b6c3409045ab4cf6136cc8233f44658b133990c742032db30
-DIST firefox-53.0-zh-TW.xpi 474980 SHA256 9e1f57da99b79fbce6d70f6d04e7295663c5e84fa151e9026c3519ab8d3bbd61 SHA512 bd6dbe88a8644ed4dad9d0bb714a551f48ed6e80efbf6b35adb802c2e6d9f81966115e071f8a579013a5f9a04871d22621e6711fc704e47574fe1512b2995a7d WHIRLPOOL 14152ce2c15cc352c79b633bcbe7fce56ec358e096687f6c203f319635c717d3d0a8c87db24a62e3611c5c7a85ab41e02f7b26eecf57a179a43c908db097afb1
-DIST firefox-53.0.source.tar.xz 213676692 SHA256 4ed1b23ea7c08f81a08817ddf3b4f06849e01420ee074008b6f390366e95b7d0 SHA512 36ec810bab58e3d99478455a38427a5efbc74d6dd7d4bb93b700fd7429b9b89250efd0abe4609091483991802090c6373c8434dfc9ba64c79a778e51fd2a2886 WHIRLPOOL ecf78656eb07a256a8316b6945827f71a01025102ae6a99ca6b2cfdea2a8a5111bb355059839fdbf66900c3e398b30383eb6c6d5114ce8186a0569ad6c3daed2
+DIST firefox-53.0.3-ach.xpi 432351 SHA256 e6a116ee56fda449cdd67585161147cb77dd739667131576d95c0aee94e5ad3a SHA512 30c934cc8fb541432c7200e08da1b6160a70056edb7a4063937bbefa6000e0d10f1936bcb749ca448767b9353401527141fb428368a845e11553366dda7b879f WHIRLPOOL 83de03fc4f95d46bf9bcd3cf6eee91af0232d1512a7f62c28acd339e841ec677a55a07f6a8c83adb1f3ed610a2bedd171fa9a68d72bc3956ba9c33d268a9ce6a
+DIST firefox-53.0.3-af.xpi 441830 SHA256 1d0084d8373617e25738a7b3462935369a039d56f82f64527ff0415c3db9e3e7 SHA512 d29683ede82d7062268637b68f21ba580c4129449bf805adad689b65a4a930c8c1396ebaa90857ef20803ebe3a5ba55a2f40a12afa177ff88c1afc3a52934a2b WHIRLPOOL 5daaca6aebcf71f4d8150e1ce3f8833f52e81309506998f3d4e968ed94c302df66f144fbed97b8d914c0372d5181cb97d1f8b20884084e6dab01ef6108444b33
+DIST firefox-53.0.3-an.xpi 450801 SHA256 b0740572e813b2ba281c190c50e8617dbce274ae16607cdb2f06f42a6c1e49af SHA512 43b5c62d8db60bbf10baa071225860c82d71505e9948e7e9c15f607b984de38561b86e66f58a226c4b0af0f2fbc536f6e86576b7742f5ab13852ebffff063768 WHIRLPOOL beb3952e53080bd85e60b9e9ec76670900600d9c0d7556092dcc84838da6fa6d823124c1bb850fb2597c713574b988d132137fd43f5da8565323e397cba973d9
+DIST firefox-53.0.3-ar.xpi 479118 SHA256 561d8baac858b8b54d34fec81781645a1faf4b75923095380ce3eede566ee4bb SHA512 fc76ad4db699a6afdbc915d9fb3666ed9c62f50d86ffdfb76df2971612a4266e43b96780b53dbbc478539369b3e621aefdf9e96579b37b98ba88d0c0c2ee2054 WHIRLPOOL f1db4658f72a368fb1ffdae9526133d9badaa72d321a44af646b0e16df5cfb2717d2745af56cb7742a608bfbee3b649308a9ac8515134b1ff182c8a17ebe6474
+DIST firefox-53.0.3-as.xpi 491256 SHA256 fc4f5bfc64ab7bcc0776317ed1a52d5f0c6d612f945bf8ae436a797f745a286b SHA512 2b77962c207cb397eeb0c7ae2c4365f713b769981eb3675a62ba1898cd73e12d5e536dad030fd590161c404907a147ce5b377f8ba32ab09e688dc9a5789b3e0b WHIRLPOOL 58ec48510ce78e0efa73b94b3dc19d14cad21ed6a28304dec6066efb7ebd57669e360926dcc2d7e07b6c673a44c9b817d75dbf97acc532ce23ad28a41842b88d
+DIST firefox-53.0.3-ast.xpi 445436 SHA256 cc31c6282534e067e6b09491bd8ce86e84b4c46d5c217a1931f029d9e746ff30 SHA512 68a277d07ab2f6de88e254b8168a63a597106a4f034b46aef15fdc5081a0f367e65c41f055181aff5b3e0769fad8bae7309ba3855e47410d3115af8148ba93d9 WHIRLPOOL 251eb0f5a9e3afcef741853c513268730f424be38a2f298b4cf33b58c22a7d271eb1eb45f75cc99cfc32f9329ee9f9f77ba94b230031cd79d4ae7c44307fbb8d
+DIST firefox-53.0.3-az.xpi 459504 SHA256 9f55b5cb611c95672e90188ba63a1dfcdeec3c7998688821feb0ac7ef435320a SHA512 fd11c1eb2e3088a1611d367aea12ae4ce78bbe1788f332e97e8adfd77b01b36364a245ff7db089e3a5c7133e2d0f1d68a1a9bed33976026098ff8a9b693cf007 WHIRLPOOL b3a32fa894fe5d2fcf81187baa5fed4fb979b14b0a308997ff8cd440ee2a8ebf2c319692ec002d7911bfb77fb6daa4096c8306fd221074cca931e33c3ae8277e
+DIST firefox-53.0.3-bg.xpi 492609 SHA256 6ae5117b4636b74e6aea42271d109a1f295e3c5f2a1c13d935cccfd8e793df25 SHA512 5b4095f8ed2b68f5c07c183f8f388ea8528bbc07f434cb60935f72730c95bf702e2c76dfa4dd334d694da3be485bde463dd92704a2b00a4ea910b41439aa9b3f WHIRLPOOL db742e76ba0c7a75dd93a9842e23689a5ac2505b32a5f652c52963bfed2a16fb7a79ee01c8a12fcbce604e9e438ad3b7dbd67115e8aa0dc4b8a118d397d4f420
+DIST firefox-53.0.3-bn-BD.xpi 516502 SHA256 bbe8e57e339423e88aef9fab8fd186ab3ccdf5bb3ba3828aec4b53db24feace7 SHA512 9e13af42ed2c23197ea64ec4390e7413860f52641733adec9decc60ca1b31e8d8c62f498834401d5f4a298e87c075fa695034f9c09d9cf696fded0379d4dde65 WHIRLPOOL a3359a619b0494355385a9322b8c01b20770808b6f7ec17b9f2ddf6f09c1974f04e2cfc33cc53368d69a5f11dc9bc11361f6c31c4ac32b795d0567756d3fde53
+DIST firefox-53.0.3-bn-IN.xpi 513553 SHA256 1bd46b57948be279d93b82f253d749e79919654374998ca814258bb8ecdf36bc SHA512 252038e950a22983db34d9647e5e75d9e7619ec95401f3ee2cd4b2efbe51db26e608c194012d61704f8c2397ff31fbb9f92d2900001d484dfd022d581dc1897f WHIRLPOOL f67930bcf166828cacc153dd45d88e9ec2c1fc8a8b4c3ca2da3c367b3c40b9a6bf5f6eb3145380cc806fe46103251b40c5c2a223a34c5086070f74768f99a9ef
+DIST firefox-53.0.3-br.xpi 440068 SHA256 231a3bc39f30ca1990deccf7da656958755d2639a97e89396eabd19ffb91d444 SHA512 986a23be9c58916558f4b11d8cfe62e32244080d7c14eddf7d07b44d06f7bbd45192d781b81ee7d65efb3a4a8846926a18ee91f05972a5ea719cca41584e1c86 WHIRLPOOL 8eb16ad11903f2e4ea6068b28ea47b2aa0daf45a5aae378da374885dcb1325f5c3dcc6546598f87ded0ee2ddad5ef33d3759e39d3e7ccf0c3db92527c462fb82
+DIST firefox-53.0.3-bs.xpi 446634 SHA256 cf14dd3a7cbae9d247ba8ae43bd8449a758266d768315ac27ecaf790a7775a24 SHA512 c892078cde5784a407d9ab78468ad5f1e15fe2b4872c07cba44b5d23ba44a7335f2d79f0c4be512093806f857f8f2a1b22a9b2d9c699a280a327775c4becebdc WHIRLPOOL 3dbc51bfadc1ed701caa3063602fd9ca73e61f99c9b84a276618fa3d689bd551a217f07c3c4bb5b097585bd467be63ab0241ad487d4adb277f4a87a90f31f201
+DIST firefox-53.0.3-ca.xpi 448943 SHA256 96c7f00088e2c758071d95c79ec474b9d56ef34c7d11c83b62e069e6d0e15d5e SHA512 4f6c169294fe7680aea6c80096840383de57fb209c852778e2da449ea7376296ce4fa76a018bee818cf413af438f366a42102e538537b06e3d9cf6270cb77bf7 WHIRLPOOL 2f924577ac0ed2fd0e10f5bcb90d418b305bd09b2fad8f0a9711b272728c3158120077feb5fbe08d00c5e9016d19a215751791db1f6677b118a1b5246f5b9f6f
+DIST firefox-53.0.3-cak.xpi 463843 SHA256 232ca5ce0105c67baed0ae7695d879621830595131ee5cd245149917bbc72c2b SHA512 49f7d0019487aa3cd164ddbd606f2aa3a6b32fc7845b417d785f964e0d5e548304bfd8673c6ecc4be55e09749831f4ad1208236aab040a1022badbeacb922f80 WHIRLPOOL 0594818e9b2c6d2fd706e5b2c0b54ef7eb4fee6fbba2107b5479df0b5004b62d7d7acb5ba066d930da71ff74a8eadff1817f6a5deeddd400e7e29f455ed3e62b
+DIST firefox-53.0.3-cs.xpi 449412 SHA256 fa3281d69c9f2dac9eda8e96157f2b191641852562fb713dd104c94412112e7f SHA512 88e809d5deac35088955d9bd83752e797f46911d446ced508d4ceae118679c764a84e21f399b8265bdf47ecb17adb5836868f544eb8aa39adfeadbba335d76bd WHIRLPOOL 93a22a9216aad0382cd9878294ced71ea0318520312efc75480e0f7f301fe2eb94fd97cac3950c345b875a81bcb51cd31ff51eb7df52eece82bcaa55c2c16b2b
+DIST firefox-53.0.3-cy.xpi 441505 SHA256 632866f99885ac791216307f403faffdd36782b59ec4d71e5b80239a3f78782b SHA512 309b6081b93fe5ba70365ddc1e8af69856c444ab0215c6332b24b1fbf86a8ebfbe0e150e32c75e65abedef1fafcec0f333bee9ee46c0845ad3d56a7809846d8b WHIRLPOOL a2c95a071664f07e08582e6b7535cafdba5953ede0f07ef956b80c63f03d9a986e7dcab64a01beab254c12fcc2af9d8e794dc65254eaef171a58acd44bb1416f
+DIST firefox-53.0.3-da.xpi 428974 SHA256 85c1b80c5a0d4f0b0b991963ddff203624486fbfe51c5012ce656f201449fd1d SHA512 a38abfc580eacefc1fd589c3f3d5e6646e11d725332ec87d39c33089a4601c604c9b69bfea664106cbcb58a5dc7562b151f26622871c8990af0e4aaccbefda2d WHIRLPOOL b9ca55546e2f3247e004a1b270862cf6e4b31134719361ba303befd50883fed43087da60067eb9650b7ccce67b9e8aaece1966dcf38ff39129ffba319e4bdf15
+DIST firefox-53.0.3-de.xpi 447785 SHA256 4c8a3bfd1c4fb2975d5a8510a0bf1f15eb1d0bedb583aae05254954ae81c65cc SHA512 429b592fadf4c625268708273544653ba771fbdfebd9fd8f302c4dd50a9d983fef915945f40cbbce1ed1c528aa953731b0ccfbe5fb28175a2716a88877156b30 WHIRLPOOL 7dcdda4c4feb3a7d997c2a72c51b76ce58388dfc2b8fa076dd2e0e0fb950c1eae490ebe8780765c7ea69b3fab7db1d4834547ead19352d1659ba268d2d953ceb
+DIST firefox-53.0.3-dsb.xpi 464375 SHA256 fa0e95bb08506b4978bf57829ab12b030ba995fd49fc6ce6800bad20c1de2b6e SHA512 087389e331b9a58ae9095a984804793fbbfaa58a112a23f95c47e0002fc2061d07d4dbace257d98eee22981b00711c0b7c3c90fce37d694381d34de281d6c8bd WHIRLPOOL 01109f112bf2a2333430d5c8369971b7694afe310b86b2801864806cfe842f18d9af9ebc0d79ce7479e22052bbe545c7d234acca2ad7a81fb99ec2ba3fda12ae
+DIST firefox-53.0.3-el.xpi 523413 SHA256 a647e41baafbf943051c6632092074f6c753c303698aabfba075ef7e131c5ac7 SHA512 31ed912c3a098a56177ef3de1e6b0d14a60df1c8db2bf039f5815da3eaa50c6c1b99ff901093ca43411e40105b0803726ce528b4bf9d2efbe6c435c484dffa0f WHIRLPOOL 68ffb0e9e035c62b3dfa671fbbdc7d5cc998c5b586441be7990c6b270c68b9a5d61d25ac70f8b58a26b99d342149bef901d4d7c36cc86e74686473050f9826ef
+DIST firefox-53.0.3-en-GB.xpi 424830 SHA256 f1d6a52496f690a5588f7e7ed6e494ba8dbae32fb11a51a27885d442058fd5dc SHA512 e060719de2bea93436e4e128d8648644dddf0343da787c99a47fe4ca6ca18dd6d284190701bf57efe0530797ce50524e85f833a7181cd1c4a66cda467a0b2a87 WHIRLPOOL 19f6a7bd8e49258f381957f49a08a360385cbc195611e1569bae318147c9876498d6df9def052e8cc7479dbce0c389f966eb05f3c6b249dcd706b948652ca85e
+DIST firefox-53.0.3-en-ZA.xpi 417992 SHA256 06fbcdacf39b7230c6ae7f97a6b11d61c649f0db5a48539cf7ac8da194bcfe86 SHA512 b527f6598ff203a495f8b0553de1ecf01bfb1986d519e75a0b1aba55041051672f2aa327e9d2325a9d2fc64eabb70629bac83e5fb404e8f5fd60a9881dbcbc75 WHIRLPOOL daa327760a19144e31fefd3b68e76f300e9f5957d73b6cb8088fa7ab49c9645d2d2ed9658a771c452bff98c776283b44b85bced508a03af01229eb62d4fed0e8
+DIST firefox-53.0.3-eo.xpi 442323 SHA256 8d65c14c9946b82f3de6f06ddce3ffca2b8eccf6f8c114c77de5f37fe090c851 SHA512 3076895093534bcd8dd024b05bf0aa93cdf80c8f8cc2da4cf1a3ebdfe4b58b19c05429228f309a748eb1cc98dea852f7adbea8174f145fd050bb137ae92b7951 WHIRLPOOL b0a568a06e911bfb6f96706331f83c9947c9384333f62cabf8c4b31129795f6da9f6c4307f3a7e76dfab5c828e3fe46c5d84580e388eb51cea989ec7c0030442
+DIST firefox-53.0.3-es-AR.xpi 450768 SHA256 1cef38483eab7bad50f814e854fd78b3aae5e94a4fdf886610d0a874c8a3c5c3 SHA512 4f6cdb7b1973b6b4b6b7ec616d6a4113bf58d7187a93e0820481db594bed5f3b504d761007454aa1dc22a1c817c5022af6addf0558865cd3a30450d4dd2ee876 WHIRLPOOL 7cac25cf62cfc36be9c12bffe6522415046e3dd7026e0bb264e9d3c3200644d8a70bb4aeea446a105f9cedca3bcbacf91c2a8994472d9d3d80d143e885d2c371
+DIST firefox-53.0.3-es-CL.xpi 450477 SHA256 68f738ae30690751e37d290ff4dc45d6464e659c3c24dd95077e44d5e70af42f SHA512 0d9f5783296f33b51b744cd4657ee0687d12f5f379e00124e7a7b4e89f3763da64818420117ba5a7792c56dac0630774db8545725051ddf172552e8b52585751 WHIRLPOOL 13cb0570e8831b89617e37fb7450cae597fc92e0f3d37e98d81eb62cf26652f19b56b593b7c1d9398858e8191204fe676c27f4251a37cee2a2536181c3f22102
+DIST firefox-53.0.3-es-ES.xpi 347589 SHA256 4b47102f9fc36e651d7501d94e36da372e7e71fd89eed8c13b0b39c64e645a04 SHA512 fffefe8f35a428ae1b4a73da516a538ef5bb76017b7854145ed07fb2b57908819d542c129e4418e80893ffbfd4dbc72c1e5888b45664ff3f2ba73e4a9d734561 WHIRLPOOL 47d17685ac3ff34f9991163359fe659badad6efa4863d49b4bc50d68354fe51efe77d14676a7e1f54e4e3c5a7432801e7f003e3de17165540728765ca65b7c81
+DIST firefox-53.0.3-es-MX.xpi 453326 SHA256 31992fc3284854d2ecd15c8c05ece2e6912ce8db48a41cab13249604fd0033d9 SHA512 e9bb25870fa1c93279b18af92a03168b666c3d160ea6e5891c1104e7e25ba16fcf6bc65021dd5d81f59fbb4083d4f14c0728b155d21337e11192d79ed26ce8cb WHIRLPOOL 3f8aa2d20e1a09db0a9ce4df57fe43f2c0891b0fd361267fcad7a9361af0630e6ab808c2884bd03e27da91932f954576d1c0167225ec68c0d1a0e828e08f5497
+DIST firefox-53.0.3-et.xpi 428865 SHA256 c3d9c9f96826712ef327ba273e43bb628e6f1cfb751ff12719d1be659e3c8c7f SHA512 973e3acd5469adeb2bcb6ea1b6f30dc90eec18ad765be598e52fa264d987d9cc928b880133f285ff33bd05e303435c553c47927f75d0d91c66844fb9ac9a1a7d WHIRLPOOL 3f2e224dca81cb2632b087bef48c7830732448f4f9671f4e72c5ca13c2b7d27208152dec2e4fed07242de0067ea4f92529b64bf628463c15c290f358eddbe80e
+DIST firefox-53.0.3-eu.xpi 443204 SHA256 81481d249ac98833e51b0d847f8fb4091dac80b1ca613303f0067d3b0ae9b677 SHA512 f7e976cf9c0f8a0eacf7f718f2db134417c3326b9dd45288f16cb0911d2e5ddf9a990df7e0a297fe13a9f51e08d715eaa3da524f0b8e813d28c890eb10f3d576 WHIRLPOOL ad1696d7f8deb6dd64596aac77c4940b65f15b0677e304e11f62e1cad52a749645393ef8e89d59cc53a87a89eb8137793d826a4c8f1a11694980f3879a428570
+DIST firefox-53.0.3-fa.xpi 496782 SHA256 88f5a080963cc08d56812683636e8b939c649028822a6c6ff1a2acf7d15254fd SHA512 a822cfd12f787aceb94d2a79722da1deae2ed14384322cc63cfafbfdc2205739ac4716316ec43733b0e401e2e65a428c5f253ab1dc4bc3831ad654510fd8a6be WHIRLPOOL 68b911f1b4f8d8e791fbf322fb7211c1e8b9e07db23b03eb5ee46c07baf932f7c9351f116ea1fd44a7f08bcf04cb3cb3252487652853799aa2e755a84bf25cfa
+DIST firefox-53.0.3-ff.xpi 446670 SHA256 4d335479465769e31ab9d315d1be373da2306b78370a2ca61929f1dce746cd1b SHA512 7aebef4f08314a87e80daf6ece782059715fe4040da08c14bda214da017ef3bc4eaf5e80a21aea1ba74bd0ccc79fe3edd2c978782d5ea4392bdbe26e29b11038 WHIRLPOOL e18152bf7b9e56034ae582238f336f1a3395ce27455ba1c984626e6fabff5e86819b957c09393f350e7fb314bef0d67f3d3462a2ff3d6a72a2588e93ecba097e
+DIST firefox-53.0.3-fi.xpi 434622 SHA256 62970f8b0bde16afdb29067887c74ed00bc74d317621335683243a780d30d29d SHA512 45e72b4b6b413cf4ca4de57dacc2c37a559c63eb476e717b7787350c4e400f803e2d46d983fb183d9994ac50d519d6b6822d48ba088f0322db81d2a0d4a086a4 WHIRLPOOL 7926d573148c052b21f402be67cbb78964006ea2dc4203b5d73bf04a71537ea2be5942e2bc5a7e087681f2746c09a15d3b27273c77e57a99d92dbc5bd7127dcf
+DIST firefox-53.0.3-fr.xpi 457535 SHA256 f593570f85f3aed79f99038f93447e41a28f025c5233d75a0b8ca232fcdeec3a SHA512 34dae47c19f9ab1b016901660c5d521a1b87a51a825bff428bb65256200622ef7e1d32cbfc8f57503426659ca661dc46ced59942fbb9e4b10ee8cb97432bd9df WHIRLPOOL 510d71ab10122c7079bf91f7470993f8273a84501f4b6c2a995934bcd5240c180216da0a6afdad1a229bb4dc97945d5e5228da53dea9dd62f09c18eb4dc7031d
+DIST firefox-53.0.3-fy-NL.xpi 449823 SHA256 dc0e43045727efa78a152ac0398196540cc17e1bd7c450c43a71484131f82701 SHA512 eae203b99a144590f7902f2d3da4981bdc1b431d7f97d82ae1086195e480da2ba8343fcee69a15f110598deacd0f65ba4f98bd19d97d2d03e2685fd028309b8c WHIRLPOOL d47f8472a7d60f3825c9b4e0959f76174b04b59d06d94f5b1f2308d72d222789bf391a6bb0bde01b3433e2e0b1a403e4c1498319648050c1c3c37f324c9e1867
+DIST firefox-53.0.3-ga-IE.xpi 463130 SHA256 04e1a50f8030162244523f92d9cf0ba7a195ba742d292c64b78c88fc983b7584 SHA512 0c978c9e0e2739cd46f9f5b4dd4393f39c96480debe420634573fdde05139282ed4c88f23870bf91490ea95950fe25a6e82ecfeb57c0bfcc8b774986e08cd632 WHIRLPOOL ed57d5b5ce7a0a1dfc80cfc47efa5050d9b659b2a07431f99618dd2caeebf2e3aeb6048c1804d46dc5bd232130989997a9ecaa909d16a6e0fb7b38918b56ccbe
+DIST firefox-53.0.3-gd.xpi 452062 SHA256 0d1890182a95cd2adcba8ed965e0553821d6a9597f577a1197bdcedd855aaad1 SHA512 f2059549643091c631fb55819cc686e12a7f9508bfca2701069cf3eba7f2714f6070163bc0f27068797c754275f5df23403f3db600adccec56d31e940ee70b75 WHIRLPOOL 9e495539f674f85bc150b80c6828261a33b3d9277b66f61a308ea4cb53f54fd50777406257e7a28d7235e618775a764f25ac94da9b2cb31dc71d00317ac0b0db
+DIST firefox-53.0.3-gl.xpi 449152 SHA256 acf0716f7f771d73cb21055428128d9498d633fda7763c3db9d427e8ba6e4243 SHA512 b787dc3340fbf4ebadc6648939cad3f526790c4fb056d3eff4e9c5fa34c00c4912f03bc5d1a3d89572c736a51b8f028a3f8e2cc4dc0665698aee3bde37b63186 WHIRLPOOL a71e0c1f087fc6a5cd667f5560e0d9824604a86710392b6286d7eb245af06705aaa74d1773723df0b429b36bae17fde843ad95da578aad068bf30564b315dd24
+DIST firefox-53.0.3-gn.xpi 461573 SHA256 a115f95820f4d653053fec02b1c1400ab957a819722d5a29951aa1407c2024f1 SHA512 b1ce66105d29a68c508a02045ebd73f758feff7ce328b9c6bb2fb4f6cae0c56ffe4727068610bd2f50008dd68e35db4c4e2ef19a80de6306f383e979a12e0098 WHIRLPOOL b5205d798ad756dd1f5b2748a54cb5eee453581750312a04b00e40b88605b4440365f3e35a8dbaf6a113c02bd5dcbdc40fa35a24e511e2080d3f8c290f77e20c
+DIST firefox-53.0.3-gu-IN.xpi 493672 SHA256 a62119d72e4f8e4b3f00a429ac0028fe6ca53f1294ae2089415ef2050c7f87a6 SHA512 ed89e51f951e0a99d75dc2d798be53c89be1fd3f24ece485b0569014c0edd3b4376680ced424d178573d051ab540e95b32d1ba0effb3ef8b54e86fa5db950f62 WHIRLPOOL 6c5210d6ef5077cc292cd51f089ffc87894a2599903ebe287fdb5cdb9ed385331802ec23e9e1299a0dd3d843ac3c2a41f7b4cf00586dc84ba0432cb2c58a0b32
+DIST firefox-53.0.3-he.xpi 460050 SHA256 263d142979b67853d37f60ab29f984b8e14a0609a6dd85da927383d9301e5499 SHA512 722d123d876ab69b82421b154c264cea4d2b8c05a6fd9f27150671c860cb3c689f7a1741544982bf9d79637a9e9b3441e08a215126ecc7be6134f413092192b7 WHIRLPOOL ff9fd7736678dc87a1121315637b25fec1a0605210ad97a1f8ab77fff87f96e9b5e042e29f81f2e3a20ae547792cabbeeeca768979b086ba518b6515116d4b87
+DIST firefox-53.0.3-hi-IN.xpi 511788 SHA256 2a450c9aaf941ba8f9c0ec12354529f3dfb47d9de66685066634fd2e5359cfea SHA512 200e3ccd9c89156fbebcae7f182486bf39c305bdb7323569c04568bbfe2f0ad558542625efa9f9b117df5b9a51650f0327a0b01784e33196c5b2be73dc90e186 WHIRLPOOL 94efe227ee9d5413149c8bdfa834390d561f4cb9d12f0dcdb498a98442fab932bda3e6a5efacb3e90509c53b6a1b8ccc45fe9120034bbd25a9fce13af3f947b2
+DIST firefox-53.0.3-hr.xpi 453110 SHA256 e931cbf3ace412f860dcc7e0b14d862459f0c54e6f8abffa83825645910f11e7 SHA512 a6a151a94892f328cd96bcd508c757ee09334fb68c251f2e2caad18ef2ca66dab110df43e6ea912344697db554a5f5bac4e8427193700d23501afc1d80983051 WHIRLPOOL b6474023d7ad24746bd918c6fc906365dcf9ba410aff43149ddf8b522fd873b8d0ab5e13ff5e2a87e203d71c2ebee65e455759562d2aaf123a675748e17e3b45
+DIST firefox-53.0.3-hsb.xpi 462173 SHA256 9663469370dc0a6ed450bf4061f0bd491e7766740aafbbc79057534ac319967e SHA512 d9d60e3fb1a065506b1a14eadd654499e08a8538c846cdbc9aec888a33c7d45a797879b9b6857478f710844f483d6bc80b608ba8ba4e2ce5462cac5591662e8b WHIRLPOOL 0a5ce2c32eb0202088fc41f552717bfd6ebb85f1e69294e66a14dfd2d8fec37961550a196a9d80d1b7968934c23b6007577bccf66f7ebd7b601e80a7c46cfcba
+DIST firefox-53.0.3-hu.xpi 456925 SHA256 fc28470f937ab701a6262425a01e725d1c12e9fd5045750019608f00434ba93b SHA512 9f71044f5147161738ba8feea527b675fd764ba534875adb86c2a003ef6abf13932f48e8c329b8aa77b06f5432ba031a56aefe25f246eea31ed711a0b7fdf210 WHIRLPOOL c4a59d33571c405a182fdc0e31dc3ccf9126ee86710cf21c4654cde49cf06eb82499248ef6e04e01c654a8e0ffe55b6b8925b9891b3629f0ccf65da4768bde3f
+DIST firefox-53.0.3-hy-AM.xpi 500718 SHA256 eec34716ad97a2fe2a1a8449c4f450aef326c2d13b75ec571dacfedae918ee5d SHA512 3a9bc08459840ef2f65fb1ae28458e30b200e7bfc01a86b5466974fb544b76bc209a0415c2d0a7e330ee7d0e0dc9bc579a9e6e4b57a69f15f3838f0b34c093a9 WHIRLPOOL 1aecca7e4fa363169b1c4f78f86cb225723bce4adb761787f9a6f939d8d2595320938e5f7464f5d132882e2478e8704135c344985145baabbbf211734fc2db3c
+DIST firefox-53.0.3-id.xpi 430281 SHA256 25df7f7d38327e8ff8388d9588ebf29423723f76f99b890db8d41c0d6dc6655d SHA512 235209e34b857a9c918fcd144ce01a39a5b567b18debacf67040a25fbeafc04af23db93818c326a887492adb1d964e08c0677841e85096d94a60506550c30eb6 WHIRLPOOL 8fe0bfe791dbe0efbba44c4c11d33020dc77961e61f224c1bbbc8d1d6c61204d44a424f4fd8c84af9de850db239e0de125a83d5e455f1a5bb3c3394fc62d76cf
+DIST firefox-53.0.3-is.xpi 447332 SHA256 d929734bc994f3b20f7c8cbd4e25d98d9081afd63af81e6fd5318688e6b57eac SHA512 1456f5449617bf24e8a7194fa1c0e1da935f80a4ad85662ff1c4fa103f5615ac32d26728720889c21f1c28884856fa596e89287843ca255ad27c87bb31b55a73 WHIRLPOOL f9fa10afb01f67ca1ca1976c9d90e77ef0651731abad8e58880167be4799fddccbd0a0cca2d8bb02cecc5ad7c1555a858a0db34882a90bcb92e6f75d74b050e9
+DIST firefox-53.0.3-it.xpi 341969 SHA256 4f8a8855b2680e8bc2323727d3a2d7aab0cdd9f718b1cfd3586f6b93430f88cf SHA512 4a230f8c3aed1b2f3285b08054130a24b215e4355c606bc10ae39123c3a0458cc7e81ecc569e637b2497cd1fe4c7f9a73133a2118210fb0bff6439bb49b00223 WHIRLPOOL bb82c195b36fd34213092a3200e3f598b316b1013ffb549effc3cc0acde282b3f699eba28cf98a13d5749b70a6e8e3b398bb5628af2a79c1df74dd4d758918e7
+DIST firefox-53.0.3-ja.xpi 493029 SHA256 fd7aa5fa31bf8160ae1bba834bdf43129c14978cacc775d3625bc42555844f2e SHA512 e6206cce4bf33121a10bec4602676d7a483ec6c6c8a6333453d95131a5fffca3b4d54f2b0560121419940bcabb607a0f90b99c376fbd6ff38b23e6a7cfdbfad2 WHIRLPOOL b76e8b31a85d2a3d0a965994e0bbeecb66e34318ea6c8f3758a811637de3cb51fef79589e3ac0f677b4a503be452915fcbb34fce83636bccbbb74c95127e17cf
+DIST firefox-53.0.3-ka.xpi 480046 SHA256 64b359537bf0484808f18dcd0338ac8c45a48bbb1c4727d1df7af34ecd8ba310 SHA512 6d8cbe601323fe69baa3ad1abaf877d45c059f74bc2899174011ddc2a906b043e7cbfc8ed9624a2e112d4e2e780b13739b772dc150fc10b3469c3ddc9b7fc536 WHIRLPOOL e7d21e49689f12e8a5f2a8cf2c514190de4bc47f5d6d9f0a2a01e8b767a86e973719feb76bf799021664989c2ef2a71ba5c598c5a1971a14cf7fe80e0cb8b503
+DIST firefox-53.0.3-kab.xpi 449396 SHA256 225c329d738f295078a95330fda73a9f9f24f5a0ffc812985fb0a3f25513497e SHA512 1a88c19ab4bbe4cef49355eaa846679ce54c364869fb71a43a8f31fd804c014260182c6c7a86a4a8fe798473b45b002a83ebe1e56321f7f6a871c89851d0474d WHIRLPOOL 9f4c51d7ed6800b3084b59341e6bb5df63a775a535d69dcb4947db80c245b0fb155838bd0ef591c8fd75b523929d292e91e8b765f2340f66ce5ff79b9d2b09b3
+DIST firefox-53.0.3-kk.xpi 499341 SHA256 085d618e649720ab7a8649f4b5ad0e576aa5dbefee4ae0f23480f19b8dc48ca2 SHA512 0f5db26c2bf9c44ded62b5858b966f68f17108fbd4e54072aab44ea086ec480d6883198e44a9426d2f539d4ef6e40bcf50c5015df3e7b1abbc4403a24d6c477c WHIRLPOOL c0a1da3700c2f416b8940ce1adb5fa26e8df4b3cb86ff3fb3e6a5cbbd00ae26d9221463e940a59496186968fe7d2e5f4764aab4388bb385331ae8ea33dec427e
+DIST firefox-53.0.3-km.xpi 524729 SHA256 d2c3dcede1bd71d85877b8f9b4b6e300275baa9e9f266d65066ed49ffd970fe1 SHA512 4942709be3aa751f5a62646b14d6f344e5c5d3ae8261852309fc71b3fe86661aec30183e7da0ce06b5d5bdb15f711237cc9fe23889a270564834a16285aeef47 WHIRLPOOL 8d58c93d956f4a23234c6e82f2c1c77b03cb286940d887d3d08648dc6d691da26d0987244948fcc03ce9b2b1ab11c8db6265fa80e42d2606fae7a9c0b71627cf
+DIST firefox-53.0.3-kn.xpi 524037 SHA256 fad69dedf7db8d0ba39209dbb4a6e759c60e541c253101ec67b288cb2fed9ceb SHA512 10158baa68603394bc009618d3f326912f06cea67942284d376d07c12953c195f1e85ec38efece3c531e0a1d3924c82154e7afef88294dd975f9025365cafc38 WHIRLPOOL 224d482567090b7ee6378fb194f0ff282d1e628d08b94f9be4fd7985002648cddea15094a09c278bfb315932be60cdda5e39037565b55186feb8ac662f9a1c18
+DIST firefox-53.0.3-ko.xpi 468653 SHA256 7f0b62d524629a037505f8deb1e400c3da5fccf78c0de975655f973e79231285 SHA512 9d1e019db91d0af5f7a40e0cf95bc2b0800a1725f49c428a321b84a97c5370c81244aeccbcc63bc26e57e60b2f53b699fe6e7a7fab6caa0f5e36aaf3ab0c616a WHIRLPOOL 06730d0c2f8bb85cbfd4d7d36a4799cedfc0207a4805d810299b7e5580def60c3f8fde3066cbe78e1cf8ca4d5a82c5899f81ec1c6f8d10395d7b4c13fa3b0f74
+DIST firefox-53.0.3-lij.xpi 435430 SHA256 54454c19503de03176a98e7a9c1bae14bdc40886bb730b7f26e7b0d38d92a971 SHA512 c2172854c49874fe322710f2cec184d11081e6c8ca236dcfd957702d67f2ce0e89bc90152578ce0f17ee1fe500d847be649616696321f5a0caf161c610acfbe7 WHIRLPOOL 3f871d1ed3b7c62890e8d6fdc1326e2e7e1a811b8a09bd68ad90a9c895e9d60c0a449cb34ce2a8c0209d7bc9d965d01c5db5797c921ac8b4fd19ce7e81ca1d52
+DIST firefox-53.0.3-lt.xpi 457034 SHA256 1861bc9a195ea3b0319a8c1b8b664fe1e4b5e007ebdfa4f7d1784631da2f8c0f SHA512 a034e8b5805e07efc57a9de7b81daeafa4caf3e45f722c3e0287b85e6d02cde6d0835fe5a553b52546c0b8c0a3107a673c0b65b4dea18dac168f5bf518590ddd WHIRLPOOL e4bb9fbb15d7c905d2b69e655355408e321c71dad5b4f0e04651c270b29a0b25c77813a1c15a191199421f97726d9bc53832c02362948b8ea1e65004733e7275
+DIST firefox-53.0.3-lv.xpi 453378 SHA256 c00e2a8254107817c1f2d27947bc91755629fa734035099693c04a7ff9065d90 SHA512 707a367d6a8c340e93dbf00498da23d7de63af187745b8140d3a790377f078356db21d03878a5dbf20757b1036c0a24aae5af479186fba6d4ddb0139eb6974c4 WHIRLPOOL 857cbd09204ef43b16e25eaeaec1f7d74138573a33b97433d512d9ad1b1e6910e29677d5d1592b95326273c287935e0d50347154b26bfeaf2078b5f45c7c51c8
+DIST firefox-53.0.3-mai.xpi 504302 SHA256 25665e8c4a73180dca5c6b271c4d89b8a800261b019ff2728a61954af10f5de4 SHA512 f755da6bb19e9157d86c42bc1935c654c28de88e097211ba1483748bafdbed0cf3b040c67422e147df2f357278981a6e677b7d6d0b03f4aeb5d568b29d04feca WHIRLPOOL aa3e3ad861c735603099c3c527de56b61f7ad3c4ff1748c1672cb0572d78f350ab552c0cefd4d14ebab26c9c97d95083bc6454109d00f6cf8ea9a58e21cac680
+DIST firefox-53.0.3-mk.xpi 499956 SHA256 78868c7546daa620f186c72c84f51d1ff30fb007e3b3dba4dfc194c109525682 SHA512 fc1325e348f5699b05113482a6c05e6763e6ef4c9d89ba7a2e58a7593bc0fed4a0510bb71556d7b562f6785e559f972775d9417d7dbb4f6177e3f0af73d84396 WHIRLPOOL 6feeb9b6dfb3af98c0a242130a073f5fdd98633641d32224478ded4a134afdc035d8006060238f8d547a6a8be30e1823e732bafb8de2673a714001dd155ecdf3
+DIST firefox-53.0.3-ml.xpi 520667 SHA256 857d6e655c21deef2c0b1010d911c420175e914ec2793239e27b849939f388e2 SHA512 0085ac530de2a90afaf0b23dcfec555dfd0b33123a6561145220e878528a9197d2a3d0150723f58753889b0f61cbafb1a0436f15a7c4cc4ff3a6cc709728911c WHIRLPOOL 83e1c7066846be7424f6a3405996d8a4f2b62ddc195f180df2beea21f305daef0349c76094bf133a60d6ffd78cf1588ea271feb79e552f635c76d87c7ffc1e4d
+DIST firefox-53.0.3-mr.xpi 507882 SHA256 56367d182c2815d059c41bbac11825a0b7c72b9b30a5adb57863c42a97fb6624 SHA512 eb2dd4993c1d09d53b593c5f31d6c349a840fb1306734288992987357920e68cefe4cc84ceca0fab6604e985170742a541f07dcaebe135ad9b7417effc8ab970 WHIRLPOOL 8a199f75338c94b64f11fc47c138eb08f908bb86649dbbf7fd96afc85e9c2a7fdb4d23a5e5b9ac9e1cfc206c21a96a67c1abe81e1577cd4b146c9dc6120bf499
+DIST firefox-53.0.3-ms.xpi 440728 SHA256 4ceb5646daa509065fa5de098600d4b60160052240772d33cef78f8b6a34e697 SHA512 f76ef725428865216e2bf851b64bb184692f758a9557984bead3b6c3bbbff6526ed1c9b926ecfdbc9872549fcf5af539b91856288fd0f2c14d65c8db142ccce8 WHIRLPOOL a1ba74e5492dc3a5c7c4597bbdfc58372b21bd4bdc7aee3b22340fca174cf0e9d5a3d7ce2f49089a8599c4bb3194f7fd87da535c60044a7f58733ae74601b502
+DIST firefox-53.0.3-nb-NO.xpi 439033 SHA256 b812e5b4f681d38dd6ea9a707ce5297e79f25d7216f4436ec22ec580f0880b6e SHA512 41ef08ddf904277b86b277ff2d4c030c000cad84f2dda027b738912c61c004fd2eb101048702aa81b707c1c5d07d1b6301c79832af8fcad16bdab0efad197465 WHIRLPOOL 5384f192d901d69ecec74306223222043b2ba329918e6162caf61c15166a4276f6194ba8e1f42e21dfd360c79c0becba8885e0cd187575bc5ad6e9648655e46f
+DIST firefox-53.0.3-nl.xpi 436860 SHA256 abd34f2c16841f9a6159b4f6de967ea19f1920b941f89802ab8c34347a073932 SHA512 7f3d4c0599412f0b6eaf6686d4c1404c1e1a675145ae228a35a6b0eb06fb4108962c505edce7f4e10b7dd64ac8798807da5ec4ed7686df55d7f27685d366d6d3 WHIRLPOOL f14c320c80cf3f531b5fead7784fbc02f9cabfbcd7bf44737c211fb15a906225bebf06e87dbcf7a132f0968df26e16953df00e1feda077cfe7f7b58afa1f037a
+DIST firefox-53.0.3-nn-NO.xpi 433329 SHA256 e42e3197753f83bbda085fad8f7b1582ccc0af48a9b4189f8987d8314ddc7e38 SHA512 b3d732d50a944c2803277c9c39c2f0fbdefecc4052c43143add0b5559f30046c0532742ef90fefff29854f892e8c2144c2cda7088441c22872c24c8ea051e609 WHIRLPOOL bc0edc091fdb2d3f270a48b9d9c03fd77712a5fe7b3d96fcf173711ac38824ce87bbbfa4fdc3d02224a5eab15f88284ec7bf7e94f580455db34e0f8f7f9c4468
+DIST firefox-53.0.3-or.xpi 501208 SHA256 7bdc757b4d74430d0821e6e3cfe6ae252655fa7c1f82478a1140b32d794f5f60 SHA512 3c02ebac41e896ebd8cfb0d8ee7e7ffbf62763686442989d832c712fba331a4e4490be64ae5f54ca884ec2f5b7121f1dcec687066d018aafa5086144ed539c47 WHIRLPOOL 72e9bccf82968e9918a5b13629791e633b9860848fbab30fd9bb241c56a4d3f79aac59a08375b7ab2440b9b50acfe6a5c318d85c5832ac23d464329ef49bb707
+DIST firefox-53.0.3-pa-IN.xpi 480864 SHA256 a6a94c7bf40c3d50112284c704bec10db14997913d5696b700b78b7e5c7bbc01 SHA512 ae4b08d7fc56e5755ca17409b025af9d0cea91e8f952655c76f8bb290d4d38feaf76fc25f234b07240e05c6a3b55405895122587854fc8c89d918f08d90e601c WHIRLPOOL b0e422e5c330e88fbe4287c5c4b781bfb71ee93d9e3f2f6a41c4114a558002497f0bc1ddd425228f027720c11d5330db5e345efa8f67c693423ff9124d775fb4
+DIST firefox-53.0.3-pl.xpi 354949 SHA256 d7091eb558474f63d12ac1e182d397c708264f0465444d5bbe06340461409621 SHA512 f0a274d88afc538982578f60a4ae775746c89dfe62915b4264c793ae609abb72e1cdacc69f99d4f93e62f969bb57e6bbd1c950b062dc0d9c662df694ce3aac61 WHIRLPOOL ab5492c58e642884c569ad1cee75d067b295f46f1ca82f2418fe3a14f86f132d0e880983ba1e886aae790e705fbbf881a7ac1d181aba635030acd3d224576d1a
+DIST firefox-53.0.3-pt-BR.xpi 442708 SHA256 34297b6aff54b29803c2c534fc31405cbc5a34a0ebaa1e2bd5be01674dec0355 SHA512 be8d6a21ddb8ec0c0673142ad409065c3ed8beaa48c82fd86056567b7c6eb7199adb58d506a3368b3bcd80d73526cdc55d01235d8230c6f8f14c5cd51883d130 WHIRLPOOL 112331836a551791ed49bbc848751d5924db52b1782aae2fc4bbc3714a4b5d3c20d954c3ac344bd2f0ea81e77825290d2139fef45588455c2cff2cac0f14de06
+DIST firefox-53.0.3-pt-PT.xpi 441599 SHA256 b7fd92c3e4bb7425457d1de0a4d0944766635bb984e6d31104704160e465c3d1 SHA512 d642223e3a557556ce630d2198ded928c6a594b2f00b133ad218ef65279f043fcb9374941dab36da436ee934a58be9552d12dafe88cfbff708219b1ff9b64b9b WHIRLPOOL 67644fe451bf842fe8a601b26e99a45c16173b4146e5bc3cf3e42508f9135d2a7db7d75c45e2e314866c57110476d6055339414bcfd6ffd47fe82707dd42791d
+DIST firefox-53.0.3-rm.xpi 439749 SHA256 02c74fc48145cc3b40d06c94210313b7f24975b45bab9aa877b392bf932713bc SHA512 763395268c11fcdd6a3db82ba25a38609f31716ba1516bf3b4b531e4fcbcb17644973f7b86aff2c918cacccbefe0af3834bcfa82c4a43d0655daadc1662d8025 WHIRLPOOL f216e2ae64a800fba6e3dc2fded47c81d571259b98f88a82a2d805e6bd035578190c194329505f0fb77f1880dd8882c9a1b5850621671c2ea06795cb32cbc38e
+DIST firefox-53.0.3-ro.xpi 454823 SHA256 9d0dc4348d0290b5308cfb3dc2e15583188ed457e5ea3e82e08974eac998519e SHA512 b1bb74c03a902dcd7a5cf57b1195b70368b126acc16be3184b743a1b1b437227192b3affeed4f4d05962fc274871ae2bb610e97d9dca4920f85d1e87682c7330 WHIRLPOOL 1fc05f8d0073e7ed7e84a801ec31b8f71b51339bdadd73f4b9cb38525039904a32ce97489c71c1c313c3f52543990fa9627a46b246491ded1d9000aa514d9117
+DIST firefox-53.0.3-ru.xpi 506894 SHA256 51d9943f124ca27928bd2812873b234715b038f2b1cd89cbc1faf9daee0dd0c8 SHA512 e727eea4ef3d71f9a51072983d75c232fadbfcc597198755063f7a493a1a5ba0df66058b3ddd15a1cb2cf21d93c2baa6b74c245e9e3cd6ff8e22b396a65f7a9d WHIRLPOOL 4fd23d8b095bb08fdbfbe58da468b257847ecf98de065460e036adb3ba8d75aa16edcd8588913ea8e6a7b7b725da8fa30431825e22021e4f8656a2b29cc3cfa1
+DIST firefox-53.0.3-si.xpi 496183 SHA256 9b20181adeaf5e8a81f0014612d280b80d2d43b9c3da28b45fa2d94c5c16d3d6 SHA512 b992b48a03e0cba437f23de08113576f474215f241b68d134ec40bc7f38594e7b14dbbf493f79fce0855450bb6712be7b1e9fcb954e63f4d23a975713544f123 WHIRLPOOL a69b1580d7bdcc2633c9085d6d5bea748383ac0eb4044536cfe2a80163766006acc15ca151a7ce553745528be5afc340376deb72993345d07adc78ed6da144b9
+DIST firefox-53.0.3-sk.xpi 460859 SHA256 3d394c7bcc143c59fb9bebc8309f8ddd4c13ca35fd44400957729b9146b99879 SHA512 86da73856584af230578601090a2bee10f547033496a1ac9da33b1296a9e336918c0be8a1d25aeba943d4483b69329f042ae5ad3b958b9de2d09eaeb4fc45976 WHIRLPOOL e32141097185151c7347a72164e89b5a3d1fa586a66bd7f3992c999f66ccd2a38ad2d2e5dc186125411a1dd3d761ad0a29983af3d13bfa251c98ee6e0046fcff
+DIST firefox-53.0.3-sl.xpi 438369 SHA256 3f328c63bb70243cc2e74a6a4403f8755354c7b85f6ae87a74853de037a69a26 SHA512 d6616d64a74dfac9b0c58c009dbd6636e879a12d7a8f802dd063538807b6f4c46293f2311910e15045e099368c9a0df1d0cbe143498efb37a3203f3f73f5f542 WHIRLPOOL 234711dcafa9b826c6cdf327bf7f98d232ceabae877f4fc8b7aca950231d0755070684e41a7aca2e2776e059722bc33ee2e671f7ed5713e1bdb9035b3004acb1
+DIST firefox-53.0.3-son.xpi 439834 SHA256 beffa4c7fc7387a04fef9d96ad1cba47c4a4545e6f25d2826c96b11d1dbd8d36 SHA512 ab76cb2139b8264eb7aa50b1b86e1c803dbf79771ee7046994bdf8aa96ef9c8e8396fc10b3136454917bbd1c9ba90b7a5135ba87d6ff61bac0eb284759ad71a3 WHIRLPOOL f2a5794fd19e85b32e7f4c78e096580b2faeebc09acb526f9ac2d2ec1f957959300faf22479cc06797fb574e609f4f30c733f86d4090c2b5337953092070e7d2
+DIST firefox-53.0.3-sq.xpi 453422 SHA256 e7ba6289dd07bc11df9481bcb6dcf9159a84f163efec5ae92d25a294ef1f6cde SHA512 b27ced4c381d123fb45f0ffe46d7fb0c6c432a85c8aaec2e2786bd2e5315918a51c43def4d403a9cbd2676282af4d0ab5a63f5c4c025a12d033a8ca99232945b WHIRLPOOL 65a7b6616bc9a7476be20a2a5de90709a0b19e7396f6bf3f526836a29ec386049c21a6e5f06c0e1c4e80bb75164b4a557f16ba730b282ed7e84fd11d8b6770c9
+DIST firefox-53.0.3-sr.xpi 467997 SHA256 5fa121ca8cf3c8eab17332c9f43bd94414190ccd2827fe51b68946ed04856e77 SHA512 b08a54f740338965cd81342e9913fa34ad8710a0e8f94cc481c2a927bab2e8b3a51e7d0b7e2366e8acc59b65c5d9b6519695083ad450a94696e637708d40362b WHIRLPOOL 8529660349b06c54f7f34452526f4e371ec9c0f3a365ae3166e4ef3fb5d8b5b42998ea904bc80e68018cc201e79b8121a812c0a966103e138432cc8022724ea7
+DIST firefox-53.0.3-sv-SE.xpi 445795 SHA256 71949c2ebf794037b8bf4bd2452a8aaa72f603012fec0a921aead50eae2ef27a SHA512 8bf5001911ef38ef3d21bae267c8adfea7e81b864fbd194f9dd03454920072f2db0e37f88006143a51356067e53b58ade6529ee73f5fbfd161d635753ae42870 WHIRLPOOL 121697ef14fe6360dd11f82b064ff5cb3516c84e17a57e0ca57abf36a8405b219df9d326f014de0e23d11acfcd3604f6de4e0e51be09d2e34130934cbed1f93d
+DIST firefox-53.0.3-ta.xpi 500480 SHA256 391a6d7622d216673e5f2cf6391724ceecb257aac6089ab290dab510bb5ff92a SHA512 044aec0a69893de31beaf5995fee4f759dab629ad1269de2335e97e231201f20673a7c7794846da9fabb07832c6ac8e040053b27d775a31e2d90cff96ebcbe06 WHIRLPOOL 906ab2b77ff865ce36a15f8a4d94545563175684f4a976734bd31eef6b6f047eaef0c2ddc6b9c95bbfa528f6f6536af65b3e144467e3f1d7eea362289cc4c443
+DIST firefox-53.0.3-te.xpi 520475 SHA256 a80e1c178f1d27f2a551665faaab48445fab20238212ae5c0dce9b9cacc1247b SHA512 7ef33f861464e7b5f844479f75adb92847369649bccef28505da2019ff0babf93ad5cfcabbc75543aa6bb96ba00787991aa6c5ad831e581cd4c9958d630f9895 WHIRLPOOL 0fc6c4bfe2c43d46c8f83ebbc1b53fbf3d0dca52e9df6d33d6bc921fdf74cefb598977919dad7416d90a565f00bf00ebd228eb5d0f969bfea466f5ba32e636a4
+DIST firefox-53.0.3-th.xpi 494087 SHA256 6357bdc635568f52b9c03b8785b4cf86b656fae69d2393ea7b53fc87360803c5 SHA512 3e0dd4af719f3e54b35cffa7d7738b1f1479a9e32113233d360a7a80cab49e02d3716ef59e463b7687ca23a5dd5a0ac9f813f1b91b6dbb0efb4b5e7d4132514e WHIRLPOOL 40a3dc2a83dfbd6b6dbb5820295e1230ae08ff37662e17cbc81c1304252dd102a1f6a1715cb64028281563010c44552821850760f1bde59f0eb757b7fcf2c89a
+DIST firefox-53.0.3-tr.xpi 445852 SHA256 12e9663e2a591de9b4eba5d689f25ff98e2db45781ada5877d8d21f093800eae SHA512 5f9c796ceb7a6ac0540cc767ebf0186f8bdd8e10279bc46f46902cc0b1052bfd9a34b3c17d47682ef71323888ead81e48b737db7e7955fd3962c30ae99b9e754 WHIRLPOOL b6997ace2ccf9dfd1950acef4739ba69c4c742fd185d0069fcf5a904020df3f4a6d32036bb129e61a820f464815b5f1aa2bcf66eee0f0528f207e5f1a39011a6
+DIST firefox-53.0.3-uk.xpi 497432 SHA256 966d51bd93cf4b53721357770fca2c4bbe064a067bc044b1ba0e269213b442a5 SHA512 2b7db5b10edd4778558351e54abb25f5145b57b3a7a23ab283525baa1d3b75b957bc0ef75d0114ca4adaeeb08f7ecb37579ac367c5fc4f74e5ccb51b828b55c4 WHIRLPOOL 41d97697e66935bd5004282e03adda73cd18240bf6dc25556f4ad9e11062f103c82fba4f3c13e9c759586bfda9861612ac83c8c98c21476f0b568fd8ae3fdfdc
+DIST firefox-53.0.3-uz.xpi 453391 SHA256 90d44b439af4204fb022e99e045540268d8ac078470e7a7d756671161d79d5db SHA512 cc4a8f1ebea394a930029a180ae6da9b7df6348385dc27d7f0b1532647db370b491ade4038536030fc9d0b1165f5758d0082826669e09d07b8c235a9956a82c4 WHIRLPOOL 6fa90df7bb7ac838084fc1513f85e763054f09835c2b25bfa3de51bb50d9886e5113cc49f7773d0db6182cb0f951d146109e68e759d7bf221af4d14df16cde74
+DIST firefox-53.0.3-vi.xpi 455841 SHA256 cc67e32dc6aa0f36827e4a9f156b8476950cc876bbbd9668e7f928dc7c90aa9b SHA512 53466093b570157cc73c00a73d24668bf923cd4461e4ae436a38ab4e8506cb7fc9b2a25f9f2a7abeb6df19323071d77f774380d4b6c41f1061d8e4c367c0c54b WHIRLPOOL fed118d292ed826a3b2995b01c5438fd0eeaa93a974dacdddb5e31e3f56438ba0b4396f9e469ddb59f055facefc59bbd24a1db50aca20622174938999e4bf8c5
+DIST firefox-53.0.3-xh.xpi 446171 SHA256 fceffdd06821fc224e5a7118e54f4ac14d73b175784f654646791878899ea385 SHA512 00441a43d066338b2b51f57143727d09811fd168c8722bbe77fc321e1517f7dd068d3f6ef4d0f40cd1acaa7eb84421d1bce187bd6858c1dc4550750ac6cef366 WHIRLPOOL bd13cb49eeafde48db822e43395ca9fef37aa05f7b507974c846d6d985a1f19338ae6dd0edf5bce26772e7481f0f7941cf9af8f16074e9d44a5e6c8eecc406d4
+DIST firefox-53.0.3-zh-CN.xpi 463955 SHA256 befcbbe52e769631c3792555e4e579684762c719696fb4c0e0d48a98e4a5d599 SHA512 c8c0c05939ce72f2a72cfac7cd209789fb55053f88ad711ecf497e36a3a37446860a261f7fa2b00cea5b5035d9bee549b0209ef51a2dcdc2871b187780f390b7 WHIRLPOOL 756502bac6a030af7b0fa08fb29ec83ccf87319bc079b6f95adbce4d53ab5f78cd30361a077959d9aa832bb00ca49b751b168896c8eb9dd32536f4e4ecf3cf18
+DIST firefox-53.0.3-zh-TW.xpi 474982 SHA256 32e697c5f5188085fc1bf08216ca8d562cd2c286ece23e61d9a6359ff6e78061 SHA512 556d9a868e137c7e5b7c005b746db62b6c6cbaed668dcb513235a05e9bb84ffc0f0fb031a7cee58c75b802a939b402e083d46306a80be599309bf6124d8ece35 WHIRLPOOL 25929eb57e122bccef20f19d951e4ae0892fb966ccb7b06a1e55a77511dc8fe44453a5f373fc3dd32d2947c5c80200069919fe3c22db28f0b9eb3e1cd78ea046
+DIST firefox-53.0.3.source.tar.xz 215253212 SHA256 78cc89650b6d8baacaf55f1a486de06bf3bb5b8a3082fd044e70225e2816e348 SHA512 cef5de1e9d6ddf6509a80cd30169fdce701b2fed022979ba5931ccea7b8f77cb644b01984dae028d350e32321cfe2eefc0236c0731bf5a2be12a994fc3fc1118 WHIRLPOOL 2e04efa111e2f4547a38ef3181487ac872fbd8c654c8ef62a593691f2f04ad5380c559c79e8b4f10c8012b072767cb0baa3773b728ee9dfa1d775d3394a6b3f7
diff --git a/www-client/firefox/firefox-53.0-r1.ebuild b/www-client/firefox/firefox-53.0.3.ebuild
similarity index 100%
rename from www-client/firefox/firefox-53.0-r1.ebuild
rename to www-client/firefox/firefox-53.0.3.ebuild
diff --git a/www-servers/varnish/varnish-5.1.2.ebuild b/www-servers/varnish/varnish-5.1.2.ebuild
index 13c2238e88d7..e9d0fe5bb051 100644
--- a/www-servers/varnish/varnish-5.1.2.ebuild
+++ b/www-servers/varnish/varnish-5.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit user autotools eutils systemd python-r1
 
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 063c383bafe4..7d183ed87281 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,3 +1,4 @@
 DIST libdrm-2.4.75.tar.bz2 774589 SHA256 2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f SHA512 7d30029dfc384024eb6a82a04122064366572f5888ac4594fd9e02bc0a22ed2d154bef1840bd24f0543b77460d6359d7e424d424e10f4256ee3c898041be2292 WHIRLPOOL 24134409e59fe48bae02890b8153c063a49b114bcad9911487aa25ee594fe622ba04a3b2e486a2944ebe4177e205a8a970dd8d584550022780a70cb0447decf9
 DIST libdrm-2.4.79.tar.bz2 783711 SHA256 c6aaf319293bce38023e9a637471b0f45c93c807d2a279060d741fc7a2e5b197 SHA512 62d6dbdf5e4e73e948fcb128a3ee76c88843d0aabf0af5751526829e9b95cff151a121af88ba9625acc7f5bc4ecfa71f9a3762005d5da76cff1d91dfc8ea8ea7 WHIRLPOOL 38e64cad8cd49a44931b598896d9ced625560a0d9da4f095d4d76eff3b64d8ab80285a6df2ff3c27ab41946fa0dcc718960cf01ac662be891c0f561997058208
 DIST libdrm-2.4.80.tar.bz2 771243 SHA256 a82a519601e9cdfad795e760807eb07ac8913b225e25fc8fe9bc03e3be6549f1 SHA512 478f64bcc6f4815368ae86d023f11ba6b37595bb9d8baa588b466c6c0e2aae48a50a489137750ed21fbabef5afabf183c78c152eb770bfe316fa7401b191a30b WHIRLPOOL 210f62c21aa27fb93eba3a8303daeab80b9da4b20ec6a70649fbad88f4277559a58018fbb12ff4b92bc6b8dc16b7ccbec1724bfcafe353382673352e9ac6d16d
+DIST libdrm-2.4.81.tar.bz2 786276 SHA256 8cc05c195ac8708199979a94c4e4d1a928c14ec338ecbcb38ead09f54dae11ae SHA512 5f7a1524acad59890d3f890bed90a660a424e18a88d587ca356223bde4a7446d1c540f97ec11cb10d2e7ed1b4ae86127957634354a1be6d04199295ab24782e5 WHIRLPOOL 2694fe988c7ebf34b30076a10dcb2d5ba8a24ddddb1ad348da69874814d64e78ad48f959275faa02fabd798ae214f386ef8437bdf48d485f77519b8759d695df
diff --git a/x11-libs/libdrm/libdrm-2.4.81.ebuild b/x11-libs/libdrm/libdrm-2.4.81.ebuild
new file mode 100644
index 000000000000..464b3a444ebf
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.81.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+else
+	SRC_URI="https://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+	epatch_user
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		# Udev is only used by tests now.
+		--disable-udev
+		--disable-cairo-tests
+		$(use_enable video_cards_amdgpu amdgpu)
+		$(use_enable video_cards_exynos exynos-experimental-api)
+		$(use_enable video_cards_freedreno freedreno)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable video_cards_omap omap-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_tegra tegra-experimental-api)
+		$(use_enable video_cards_vc4 vc4)
+		$(use_enable video_cards_vivante etnaviv-experimental-api)
+		$(use_enable video_cards_vmware vmwgfx)
+		$(use_enable libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		--enable-valgrind=$(usex valgrind auto no)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-misc/qt5ct/qt5ct-0.32.ebuild b/x11-misc/qt5ct/qt5ct-0.32.ebuild
index 947237d1e287..6fc2aca54932 100644
--- a/x11-misc/qt5ct/qt5ct-0.32.ebuild
+++ b/x11-misc/qt5ct/qt5ct-0.32.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dbus? (
 		dev-qt/qtdbus:5
-		dev-qt/qtgui:5[dbus]
+		>=dev-qt/qtgui-5.7:5[dbus]
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 95936b9032cd..1df2486596eb 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,2 +1 @@
-DIST 82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip 1830730 SHA256 fc6a28df089e47b68931019ce038b6e2fcd78e93de7f6984a22262252d01c16f SHA512 0fa4f7b52442793ec1bd82c74f9d092c69262e4f1fa93584fef17bbe0e5cbde08bc5ad0924631801bb43b41d90c37077a317c61511553f98698096eab05791eb WHIRLPOOL f1a45b549fb6ff9bea2eb4e3719b5dd43a78f6f418c61691cebab313d56761147d928648e103c654309575bec7c716a6f1cd1ef7a9b484c09edee37233cb0ce7
 DIST x11vnc-0.9.14_p20161013.tar.gz 1702047 SHA256 050f2d9428996a8c3ad420933923b45fe516122f2966aefb5fb8dbf10dcc7917 SHA512 82207e4d721dde633aaa13dbd1e6a18799615f8e3c225c33d4f8b01775fb81fb6b92a817e7d014653ac7b2349b0b31e46be8db25c5fd5e3ecee8fb93ca665b97 WHIRLPOOL 449f729044b98f86850779343105bb4edd71861225b1a0eb64d1a977e21918d0669b0c50fe696fba46bb6d6709f31c3445b775392c46b49a0af9bf53f62f6196
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.13-fix-compiler-detection.patch b/x11-misc/x11vnc/files/x11vnc-0.9.13-fix-compiler-detection.patch
deleted file mode 100644
index 0828b0154e6e..000000000000
--- a/x11-misc/x11vnc/files/x11vnc-0.9.13-fix-compiler-detection.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- a/configure.ac	2015-11-14 18:49:21.000000000 +0100
-+++ b/configure.ac	2016-10-13 09:30:37.530000000 +0200
-@@ -6,2 +6,3 @@
- AC_CONFIG_MACRO_DIR([m4])
-+AC_PROG_CC
- 
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
deleted file mode 100644
index 4fac03cbeaab..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="http://www.karlrunge.com/x11vnc/"
-SRC_URI="https://github.com/LibVNC/x11vnc/archive/82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="avahi crypt fbcon ssl xinerama"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	>=x11-libs/libXtst-1.1.0
-	avahi? ( >=net-dns/avahi-0.6.4 )
-	ssl? ( dev-libs/openssl:= )
-	>=net-libs/libvncserver-0.9.8
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	x11-libs/libXt
-	x11-proto/inputproto
-	x11-proto/trapproto
-	x11-proto/recordproto
-	x11-proto/xproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-S="${WORKDIR}/x11vnc-82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a"
-
-DOCS=(ChangeLog README)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.13-fix-compiler-detection.patch
-	eautoreconf
-}
-
-src_configure() {
-	# --without-v4l because of missing video4linux 2.x support wrt #389079
-	econf \
-		$(use_with avahi) \
-		$(use_with crypt) \
-		$(use_with fbcon fbdev) \
-		$(use_with ssl) \
-		$(use_with ssl crypto) \
-		--without-v4l \
-		$(use_with xinerama)
-}
diff --git a/x11-themes/qtcurve/files/qtcurve-1.8.18-glibc-2.23.patch b/x11-themes/qtcurve/files/qtcurve-1.8.18-glibc-2.23.patch
new file mode 100644
index 000000000000..06a27d5a8854
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.8.18-glibc-2.23.patch
@@ -0,0 +1,13 @@
+--- a/lib/utils/color.h.orig	2017-02-16 00:55:24.000000000 +0300
++++ b/lib/utils/color.h	2017-02-16 01:00:40.176467232 +0300
+@@ -25,6 +25,10 @@
+ 
+ #include <math.h>
+ 
++#if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23))
++#include <cmath>
++#endif
++
+ #include "utils.h"
+ #include "options.h"
+ 
diff --git a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
index 7eee61a30f2b..7a9617a62d99 100644
--- a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-remove_qt_filedialog_api.patch"
 	"${FILESDIR}/${P}-gtk2_segfault.patch"
 	"${FILESDIR}/${P}-std_isnan.patch"
+	"${FILESDIR}/${P}-glibc-2.23.patch"
 	)
 
 pkg_setup() {