diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index c30377724f15..593b83ce0320 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -8,3 +8,4 @@ DIST systemrescuecd-x86-4.6.0.iso 467294208 SHA256 cdf1db091a7d963e3395f4d9b90f4
 DIST systemrescuecd-x86-4.6.1.iso 470530048 SHA256 5812ea8198831b15db9ab37e772524a047c5750a9ee79789bcb4f77e117bf4d5 SHA512 3ae7c4f3f2196190c8bac44da35878450ef5455240e10f5bf2063a28f0f1c59d35458c7db42a3324e8b963a9e8b250a1b54ffa85e5cb6cf27c9e94ae1fb593d3 WHIRLPOOL fc389a182b2942efea89da1fc088c6d38e2c3a8df35d6012e3a3d560b3022866fed169dea2249f3d236cb1e559fe3bb44ec15c78a7740e93c843cebcaaf6dd5e
 DIST systemrescuecd-x86-4.7.0.iso 479350784 SHA256 79de1d6f41dc195a247a15ef95f610b968a955b2892939326f58440284f481bb SHA512 c0246dd558186d3436666ef6509eacb2abed82a3205e47eb00b0fa0e98cafbfd6dd8880e83bb7e98b2b019b6f1a0797abcb26c5101eed265a83c37139085dc1d WHIRLPOOL 8f4cfb37dfe0ac7a788aff1d488b7c41dc34315aacbd0cf25ba2cc48824c77be748d8f5228f2b2fa92271f7d5e4e20d6207f7ae80e394111845be7d1fe133348
 DIST systemrescuecd-x86-4.7.1.iso 481220608 SHA256 3d99953b14788c5b50d72083c7cc72d3edecb440077c71edd108fd90aef86505 SHA512 13114a4e4616dfb8f118c07724fcca1fe9dd739a7c2dd8f5553f48dbaa744fe6d211cf6f341159b4ffda090f0101bd96f72d3e11c7c8c77a33a888d3c2859a6c WHIRLPOOL 4494cbb7095d8447928400b7882b458c0be2552462fd64250dffee189f7dc60db4e5978e33eb34ed505d97c8964713241c0676e931ec3570358a87bedad853a6
+DIST systemrescuecd-x86-4.7.2.iso 482217984 SHA256 b0a3333c091ec2f4658e2a150305053a2cf50c63b217465cd504559dee4447a7 SHA512 2340facff40d8f7eaebf75bba771333d21e8951384c34b04dcc5734de3c18e0c8e50e5cc35b93ab91df48f2ba9dc51ebe97a820fdb322d9f169df7067d6a92d6 WHIRLPOOL 3bdbd296a5cee2dc6cd47313bc70c95b65dd4d198cc67907c3215e181b2ffc3366a3fce49561650ce70d9d732a646b039265543da065702c1e6894219d1a438a
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild
new file mode 100644
index 000000000000..d7cc39e4ee14
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}
+
+RESTRICT="mirror"
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-doc/linuxfromscratch/Manifest b/app-doc/linuxfromscratch/Manifest
index 8e736d73b7bf..bab81a8ecbb1 100644
--- a/app-doc/linuxfromscratch/Manifest
+++ b/app-doc/linuxfromscratch/Manifest
@@ -4,5 +4,8 @@ DIST LFS-BOOK-7.4.tar.bz2 201600 SHA256 185ed3ea84b15825cb7ef59d202b6af48d87844e
 DIST LFS-BOOK-7.7-NOCHUNKS.html 2094733 SHA256 a8ca1259eb59b4df2eb229161914e812ab59f4eec5f1f319de14d1410e9d3c77 SHA512 72130c50b46eb20d8a0e0fe8d88215029d705a2836f41b044151dbac1b3ca08c2d9640fa89005f4a6e5ffdb2b894caf01d94bfdb0f35b6e7e9b818ee25ce70a9 WHIRLPOOL 329c2a6b55b61a4f3d317d9051ee6df3e496816601e4ef79d6d85461f3d2d68a46fc0441ea29a5df55e02536c4271819335068dccada9bcd8686e008bfbb3bed
 DIST LFS-BOOK-7.7.pdf 1739822 SHA256 63fefce41cd8042d4e60481c881f76606e04e50f9b6afa47f56152ea33d79780 SHA512 a6c50c98cc4d3533b0a3e32e8d19a2c48f0ed1246e1e729e553ca2f308c0a7252ff8dcd0c734517cb04c2e7f9a3ec50e94651bc789731a4384e4f55538b639c6 WHIRLPOOL 2af7006fd503d08e86b5d7885b0018b623f892f1900430f081c0b37096bbfe9634b774cc31bb4e852b26ac0de2e5399141af83c5fd31ca70663a7f3b8efa15b4
 DIST LFS-BOOK-7.7.tar.bz2 202946 SHA256 6b1f896d2bbea75b5903462f98d62f6e961aa3cc98fd03d1167eb06360a8a61e SHA512 72f245119e3bea5823c4117145e530f76d10a190ee5eec68d8d3b463e3e06d489391ba6b33cc42bc8b776373a97ce33c92ed5f7e7fdff74fe86d01d794b5fcbd WHIRLPOOL f8acb8dfa2eefaacf8d16e435f0f1f12b697fd692a6fd3d7cd0375d824c1fef459966a46314ffc7810d4f2bac9084721b0ca773dc1fbe9ce5e87d07bd0492326
+DIST LFS-BOOK-7.9-NOCHUNKS.html 2080270 SHA256 5d97cc9341c17899383b7ce474ce0be9434cde17471a650b6f0e1a924909003a SHA512 fb127a5c2cf10d8fd926dcb75c7744f4a1f2428e93dd715ee321b427de097df353787cf6344acac9544b6c6dca8f2444a2834fb605463f0c730680cbf9f85007 WHIRLPOOL 5bc97b627303efc3fe143967ecb48ba109749b6ecc2e1f262efcde0290fef570192df306fa8b61695409b9b230660d8df6ea1e6a7f4497b9070ee3e70041d426
+DIST LFS-BOOK-7.9.pdf 1736489 SHA256 3166c6cab1a25d0b5540d6da7be98d48ffd900be313a7aed005c04cfe7a9aa13 SHA512 3805e067cd26b90db9960fbbd4d608cc5edd341e8039496906905855f498b99ad7af78cd73a2123417173c2cf588593e0009a4154478733dae9a4ab1821c5edd WHIRLPOOL 6f9203421744396ba95eacca39941255e8264b0b95f58b94e3ae58ac3991690e4633285f7de60fb9ad2450680b1427402db25350cf498b34a7cc0b5323d0eff4
+DIST LFS-BOOK-7.9.tar.bz2 215253 SHA256 8ddfd54d56c987245fe9b55cefce43ad593599bdfe0ee01954d11142a465086a SHA512 231f9f5896191cdca0e9df401c5ca1e29de612b94063a87725277f5a6d11678ce2d31df69ef1ab453ab7b485a33ff645ba317e62706284476a9c350f6e959b77 WHIRLPOOL 42be7bd5b61f32b5d524bc20145e5069b7c10271eea700250adc6a604abe081c44119c4caeae58411a6202edca801bc231ad12bf0c8f981f5ecf19aaa91c6bc4
 DIST lfs-bootscripts-20130821.tar.bz2 33885 SHA256 6bf38eb5b6757ceae4e73e9af3393a4df9ab4cf70995b127ab927d06ea7cd35f SHA512 c6a4262a67cf04eaa1ced205598b6ad5a9a361f78b0000c2eefea16af22863038ad1c01e3eddbf571e7cc44788eedfdd147b99d7579ee09063c2ccc9e8309786 WHIRLPOOL a58c9d80d8440c038de2981d41b9aeb822b34e6bbef34691aaeeba3104a656eaac5a52d17b3cc0a631198690d30a813d1995e26cd4f654e22dd243b29a126569
 DIST lfs-bootscripts-20150222.tar.bz2 31584 SHA256 264ed371e4fbae692a3bbb434ad0966f6f95d9ae7f6e3233148713093d8dbd85 SHA512 983da1da3ee1c3456c195b887c2bfab0ff0b338ee7f6cacba9faf6f416f8d92129ee92a0bc4402f64fea8fa647a386c439a81725fe0a30a68e337c0f0aea0916 WHIRLPOOL f9f5b50d929a162a26ac0caa877a82dc570dc47ad90a9280012fb9db463dd2a673d534650dfa00cfd7f037d173342c31720b2b45ba2894d3e819d2b7e23957eb
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-7.4.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-7.4.ebuild
index e73e1177b85b..7c0af7d6c4f8 100644
--- a/app-doc/linuxfromscratch/linuxfromscratch-7.4.ebuild
+++ b/app-doc/linuxfromscratch/linuxfromscratch-7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ SRC_URI="${MY_SRC}/LFS-BOOK-${PV}.tar.bz2
 
 LICENSE="CC-BY-NC-SA-2.5 MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="htmlsingle pdf"
 
 DEPEND=""
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-7.7.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-7.7.ebuild
index c18e08399e4f..066cdebd8189 100644
--- a/app-doc/linuxfromscratch/linuxfromscratch-7.7.ebuild
+++ b/app-doc/linuxfromscratch/linuxfromscratch-7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ SRC_URI="${MY_SRC}/LFS-BOOK-${PV}.tar.bz2
 
 LICENSE="CC-BY-NC-SA-2.5 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="htmlsingle pdf"
 
 DEPEND=""
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-7.9.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-7.9.ebuild
new file mode 100644
index 000000000000..51ce20a83024
--- /dev/null
+++ b/app-doc/linuxfromscratch/linuxfromscratch-7.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_SRC="http://www.linuxfromscratch.org/lfs/downloads/${PV}"
+BOOTSCRIPT_PV="20150222"
+
+DESCRIPTION="LFS documents building a Linux system entirely from source"
+HOMEPAGE="http://www.linuxfromscratch.org/lfs"
+SRC_URI="${MY_SRC}/LFS-BOOK-${PV}.tar.bz2
+		${MY_SRC}/lfs-bootscripts-${BOOTSCRIPT_PV}.tar.bz2
+		htmlsingle? ( ${MY_SRC}/LFS-BOOK-${PV}-NOCHUNKS.html )
+		pdf? ( ${MY_SRC}/LFS-BOOK-${PV}.pdf )"
+
+LICENSE="CC-BY-NC-SA-2.5 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="htmlsingle pdf"
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack LFS-BOOK-${PV}.tar.bz2 \
+		lfs-bootscripts-${BOOTSCRIPT_PV}.tar.bz2
+
+	use htmlsingle && cp "${DISTDIR}"/LFS-BOOK-${PV}-NOCHUNKS.html "${S}"
+	use pdf && cp "${DISTDIR}"/LFS-BOOK-${PV}.pdf "${S}"
+}
+
+src_install() {
+	dodoc -r *
+	docompress -x /usr/share/doc/${PF}
+}
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index c3a99a04deb0..77bcd0cc0085 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -43,7 +43,7 @@ DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f6
 DIST wine-1.7.9.tar.bz2 21323337 SHA256 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0 WHIRLPOOL 333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
 DIST wine-1.8-gstreamer-1.0.patch.bz2 30908 SHA256 00cc1e943e2dffb7d588bb5befd444655a661bc0a0e51e49651af47e9421c501 SHA512 46901b549b1c84f7d8f8ff4485d1faf60a108cdf84feddc754739aff918e1e979b0b8a1a2604e5df6693bdfb02a3324516a187187f019bea13bc5485fc51aec9 WHIRLPOOL afe4caaf7b3d7ab07a9d8f6ea32125c1838745d399eb9ef2211c669bcd445ae5020991bd729b0460a6804fe5d44a2f42c32d94b2de32cc4b338f9391dcc6f78c
 DIST wine-1.8.1.tar.bz2 22839063 SHA256 149ad3daaf8593b36c5c061285df0ec2a25e20ea48c61323be91088c4d22ca97 SHA512 e4cc3d00f28a616326f3069c7eeb94dc07759018b719bc37fe733b0f5e5d17f54ed2e877a964e9ea235362c49bf45bb3ec7072fba3d66648e6c7d55568e863cb WHIRLPOOL 8970d900c769add34a079f84c0562fca2d7e303ee9aa15de0fe2fde059de01256951c5ffeddb7b0a126599636e83d0d4ebdb8c0df5cde218fe8858e8b2451a0a
-DIST wine-1.8.2.tar.bz2 23635449 SHA256 031b465cb5252f9b3cc62b2b7c16545e1138aea4896170eab19b6674f4311e94 SHA512 7861fce21aa9891d7086343591e4ea241e476e0d4c54485f7ce687bfc2b5e0fc7bc025e4b83a9f6ca3a99d50597bcb1ab5fc4983f4c59eb699cc584385c6cadf WHIRLPOOL bf2b42e8ce973af760b080998aef22881cc20a6865cdfe81d941212ea164dd1b0e91f1115ad516055b8b498bc224d767716d47e3fdaa7a0cbf52427e5e5f1c88
+DIST wine-1.8.2.tar.bz2 22857786 SHA256 51624fadf0145e87f0c01e7ce8524ea1e8d9d360c3e8a86e78cd26a52ce55a6f SHA512 ed4883443b29c00409143932de40c543a65acfc01ce61f223e6ed852e6869d1936e5d6c1c3942335d2fb6c9ee923f6187ba9f3207af9900911c4258c0266a321 WHIRLPOOL 6e658ad3def7b3784753df00534ba67f6b634691a058e20bfefcf4dc44c126e5afc1789135b9e6925e1d79afa82d1c2c39ff696b6a0318d080774d829c5e978d
 DIST wine-1.8.tar.bz2 22843418 SHA256 f33b45c18112b2071fbf9edee0e8c575407f9e2a9855ca4ee918ed33efa7c6f4 SHA512 34308e82e04dee714fdbd10f29cd6cf6326e5e6e9134f7076e58b09988211065b8c6584881b7e5dcbc9b3906a819ab8a72b612b060cb9aa50b5b67f03bdab089 WHIRLPOOL 335a48f1b34cd1038d62290e52c3189b842d4077b7cf0bcb9d003595992360dc36eac1c592d31db44598de68010f3934daa1f4bcd0a2ca74aa130a39a74f7ce3
 DIST wine-1.9.4.tar.bz2 22974777 SHA256 75c1eab6b980870b367a73db6e57eb0dc9242c2be8546f94084577a0ed0bbbb8 SHA512 e7b35290ec8f451163a08e841c559698a6b7264b320058e38ac788bdde66042efbb88511b30fa38383844425eaf0b6f4ed4b8412feb843ed405cb510a4a9000c WHIRLPOOL 875e11e9163df8c3473aa7b79deb5c6783a2068e678c4008cacf730d81c2f141490264a10f4345ceadd7aba100d3fc71bdfda7858f89d966d339cc2772cd8190
 DIST wine-1.9.5.tar.bz2 23034629 SHA256 fb526308e7ac5e202c0f0b663d4c7a943419d9eec766af6831caf23914300f09 SHA512 cae779353bff61c215d0969288afe6e6e5192cdf0f86f8b15073861f0a22cb6b508ceb084e9b2cb5c5c658abfec5751edf9cb48930bc97c43ecbd6953427fc07 WHIRLPOOL 7f0c29b13b67660d364b2bbc86982a92f73409cfca3e8a31817c39df36d9ad476a9762f135d85fbb947746367277576a97fb6a012f346c11454c43ef75ac9fa7
@@ -86,7 +86,7 @@ DIST wine-staging-1.7.53.tar.gz 9638222 SHA256 438f41165987a57635694dba2f67cc435
 DIST wine-staging-1.7.54.tar.gz 9647030 SHA256 b244ab05326e0a4c149beba0684afc100d44dca8e6ff606bcfee883b21b27303 SHA512 f6e58be01ba10121d6904cb238b2d91dd79cb7d14d623c00a897e655adb88332bea125cedf3fad85e680c76aacfbab16dd5035c322278155defd3b493054aa23 WHIRLPOOL 4c053ad96e67f4e82c93d3cfa9b6f885c4c3fe693946dd0e2a30cef556aac55f9dcafb5c56ced0f714f8ea9448cb4e22f144ea7f3561cfdb5bbff1b049d34f07
 DIST wine-staging-1.7.55.tar.gz 9604441 SHA256 856b630fe95250e3d2dfc80588529e42e92e37f2e974ce8d3da37b39bf5cc3c3 SHA512 a6fbfa01b6d6efc75f79235aea86091c32ddf91ca300c73325c8347949c627f53ceb0fe085d6c212602797b0496d36c0a79f08eae4644a17774e95906332032d WHIRLPOOL ad232568c9df5d436a79a3557c82e231eed121356d8db1f5a3c0e7249b6c2760d87bb433ff30d6db53ce190b2d49401aa387b06f0c3f74925aefea7b1d73f112
 DIST wine-staging-1.8.1.tar.gz 9598557 SHA256 12a4e54376515e2ab8ad79855ba724ba065c8de619c5da192ec528cc365f9c97 SHA512 d24bb78aed1e50ad73e742608048a68097d40e3c6563c1bd5adc2fab6abe0838dbce2d9f700ef71d876c6dfee232e97bef91bbc8f6b6c9092ff8db5a2d0f05ac WHIRLPOOL cb1400586860d4e6dad3f3bad78bdde27f8ea9fb703180533f5852368041879efe93e716df8f54bbeabba38b7d921ec0e2737bc6121c8cb5fd5af8d117d7e538
-DIST wine-staging-1.8.2.tar.gz 9618287 SHA256 5edc355bac1e65d721cedd325ee3ccf16bf2775993ceaed607c5398d54626d9c SHA512 4f8f2716ac7d215c33f1bbfad93bf3bf76ca4a928fa273d555eeaece4810a39fb19231042b66904f8d23985e3643bea973c08cfe955c40108a3dcbeca60e0a7e WHIRLPOOL 792930a860886d9bce100a9798d28a244d23b0efcb0700af3f188ca0a1ca5775d818cc805e1f9e60f926d880e78c3b6ee5c42765658d9e6904bed01b593132c0
+DIST wine-staging-1.8.2.tar.gz 9593817 SHA256 388cdcdfcb80df56df10c0487c03b1f2a5d5ad5762eaf4036ea59dacd43eb64c SHA512 8dc795b99cecdc852d9725c90250de1441f2a9ba8abb96f9c7340115541cd670efd1e8640d34502c15a6e3eb77a1d9fc581f5464109976e148665ab25465b7b9 WHIRLPOOL 0a54f239fb21201bc72e72aa3fd5f94b5411a8fdbda85515b53cf04d77439d7d98db3c385a175036b1d3478af071e478f1fb16050823c6455078f719ab85b2b6
 DIST wine-staging-1.8.tar.gz 9632566 SHA256 c66f3dd6a760d516affe7467c4fb2d15ea8e2f0c72bcda1982219948dcdff11b SHA512 7b030b217ed0b37b8037d782406f75fcdb681c81371eafcab87175c0e6ac8b50fc58fe364e933e79eff168c1755412276fae3f914b7c36a6937aea1f6e35b022 WHIRLPOOL 8cff5d1d4c23405b820dbf9e7f73f7bba785e04ec2d9087b0977bb7aa1e6b84c2e6c3ac2f9cc72ba3c16f2b9c8c3607ea02ef1cd52d428a2b441333a424d9a21
 DIST wine-staging-1.9.4.tar.gz 9719676 SHA256 1b3c6bb3e21e549fb8657cd9a2117946b7e78140b400c614dd41b041b6dc2674 SHA512 2c81b9f0315ed4f68d1874482805c9b6d3f2f9611f6dd1477ad0632d17f66e7f5e75720e5c7cef3a873876541c9d7d212fa8803a57cbec415aca32793a734634 WHIRLPOOL 0a66f53327976dd63532b9350d64461df3dcb0ea2fdc63d3498eac94d92387cf4bd53054c693c4a902f7fbba8ad0f2fdf59682e8622f3920a9a426344c656f54
 DIST wine-staging-1.9.5.tar.gz 9889302 SHA256 e12c5fb741e6c5b55b99c37d6bba1746b0f40317f27198406e63f260ede3600c SHA512 aaaf08449e956f5f2b42440f8becf7233a22f2f807041b5524fae3c25c80078b86a84e6000803e014a5d2fc089e3df78cb66f0d1fe35675ae0f4ffdfa7ba3f10 WHIRLPOOL 692da1ec383b7efbcb12c8fa4078ed9b4143eb101baa06523f5bd85c749f0b87fe9a550e4d60e3c33e3d896782c9bc957f61171d01dcadbc8847ecbbc57c40ff
diff --git a/app-i18n/imhangul/imhangul-2.1.0.ebuild b/app-i18n/imhangul/imhangul-2.1.0.ebuild
index 525f0120689d..a7bcb6006b95 100644
--- a/app-i18n/imhangul/imhangul-2.1.0.ebuild
+++ b/app-i18n/imhangul/imhangul-2.1.0.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
-inherit gnome2-utils multilib
+EAPI=6
+inherit gnome2-utils multilib readme.gentoo-r1
 
 DESCRIPTION="Gtk+-2.0 Hangul Input Modules"
 HOMEPAGE="https://code.google.com/p/imhangul/"
@@ -14,12 +14,23 @@ LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/libhangul-0.0.12
+RDEPEND="
+	>=app-i18n/libhangul-0.0.12
 	>=x11-libs/gtk+-2.2:2
-	virtual/libintl"
+	virtual/libintl
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+If you want to use one of the module as a default input method,
+
+export GTK_IM_MODULE=hangul2  # 2 input type
+export GTK_IM_MODULE=hangul3f # 3 input type
+"
 
 get_gtk_confdir() {
 	# bug #366889
@@ -32,43 +43,39 @@ get_gtk_confdir() {
 }
 
 src_prepare() {
-	# Drop DEPRECATED flags, bug #387825
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' Makefile.am Makefile.in || die
+	default
+	gnome2_environment_reset
+	gnome2_disable_deprecation_warning
 }
 
 src_configure() {
 	econf \
 		--with-gtk-im-module-dir="${EPREFIX}/usr/$(get_libdir)/gtk-2.0/immodules" \
-		--with-gtk-im-module-file="$(get_gtk_confdir)" || die
+		--with-gtk-im-module-file="$(get_gtk_confdir)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-
-	find "${ED}" -name "*.la" -type f -delete || die
+	default
+	prune_libtool_files --modules
 
 	insinto /etc/X11/xinit/xinput.d
-	newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf || die
-	newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf || die
-	newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf || die
-	newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf || die
-	newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf || die
-	newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf || die
-	newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf || die
-	newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf || die
-	newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf || die
+	newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf
+	newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf
+	newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf
+	newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf
+	newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf
+	newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf
+	newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf
+	newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf
+	newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf
 
-	dodoc AUTHORS ChangeLog NEWS README TODO imhangul.conf || die
+	dodoc imhangul.conf
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	gnome2_query_immodules_gtk2
-	elog ""
-	elog "If you want to use one of the module as a default input method, "
-	elog ""
-	elog "export GTK_IM_MODULE=hangul2  # 2 input type"
-	elog "export GTK_IM_MODULE=hangul3f # 3 input type"
-	elog ""
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 0b328fafe2a6..0ddb73ebb7b2 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -1,3 +1,4 @@
 DIST poedit-1.5.5.tar.gz 2594758 SHA256 3c94c9825c11a2d1ce10e083ad246e8625469f358da4a5a2f6210170b970f949 SHA512 a3524e27681dbf97babef7bf3ec56d6b7cd736370f8ed86b53c717a5a2eb36245f9ed89fcd28b57bd4d6f5ff5fb98d6c1615baae0bf10be720dcfdafa57ad4f4 WHIRLPOOL 893795acc85183cede0313b9220179cafa17a92033e8472e48454475f4ecdf51a014dc7123e9396a38a98217c43666919e7a1dadf68ab2f401b920071cec3d23
 DIST poedit-1.8.3.tar.gz 2319253 SHA256 2a73c659506c31eac142ad5b070a2370a797f3e81813c915bdd75fac2dd21ec1 SHA512 c09faf18c9e58b2f4547e47d22a2237589eb4663985d0d3411e6f83691c34d075bff188fc14a9e245efe89d976377956d604c7f09d0329ddcd70383243f0f6b0 WHIRLPOOL 31b324c4c5b731836865c7bd464003b38406bf114f39354e9c6cb2bcfb65d5a3dead3e05ba780d2f0e13d504368d40e365f6372b6c9d5493814e063dd77a0bdf
 DIST poedit-1.8.5.tar.gz 2404829 SHA256 cf541b8cbaf5d019cb2bd8f97c848e9f2d59dcf771d2281fc08f1122a923d96d SHA512 87eae2bcedc07eefb097edf263db10b3947956cfa504eddb259e3c3cfed6215ad0da4517fe5132b61041c39a7fbabd298ca42582570295bacbbd62d5ffc6f6a7 WHIRLPOOL 316e0593e2e5fa82c893f9b55ab0b8b2816a65f33e64f0b25985704c05c8d5d319cea4199c3c9685c57a0fbd96ace26f091214aab66a02dfc858759be8d7d99d
+DIST poedit-1.8.7.tar.gz 2483945 SHA256 562d9fdf44869db63ad5c219a79aeecda859490d57e43e00140b0e8114006a46 SHA512 609022e696915cddb130c561c7eaa7dff76ce0458f58d9b8de34f0e8b98839cdccaf4a593e0e4eded67252cece08c61f961191f64cf4d76fa148f403d9705e68 WHIRLPOOL 8d1b7eafa8605323d8e4048e07eb631cac65eb2f98bdbe61687cb18c79120ac12187c6be60f112695b624857f0483c9fb6ec5e581691cb07cd14dcd30728d09e
diff --git a/app-i18n/poedit/poedit-1.8.7.ebuild b/app-i18n/poedit/poedit-1.8.7.ebuild
new file mode 100644
index 000000000000..c99617ec8018
--- /dev/null
+++ b/app-i18n/poedit/poedit-1.8.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+WX_GTK_VER=3.0-gtk3
+
+PLOCALES="af am an ar ast az be be@latin bg bn br bs ca ca@valencia ckb co cs da de el en_GB eo es et eu fa fi fr fur fy_NL ga gl he hi hr hu hy id is it ja ka kab kk ko ky lt lv mk mn mr ms nb ne nl nn oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv ta tg th tr tt ug uk ur uz vi wa zh_CN zh_TW"
+
+inherit fdo-mime l10n wxwidgets
+
+DESCRIPTION="GUI editor for gettext translations files"
+HOMEPAGE="https://poedit.net"
+SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+# db/expat req for legacytm (backwards support for pre 1.6)
+# we currently have 1.5.5 in stable so this is enabled
+RDEPEND="
+	app-text/gtkspell:3
+	dev-cpp/lucene++
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/icu:=
+	||	(
+		=sys-libs/db-5*:=[cxx]
+		=sys-libs/db-4*:=[cxx]
+		)
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
+		rm "locales/${1}.mo" || die
+	}
+	l10n_find_plocales_changes 'locales' '' '.mo'
+	l10n_for_each_disabled_locale_do my_rm_loc
+
+	setup-wxwidgets
+	default
+}
+
+src_configure() {
+	econf --without-cpprest --without-cld2
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch
index ee6543c7dd6a..9f8f43114899 100644
--- a/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig	2009-11-27 21:07:46.000000000 +0800
-+++ configure.ac	2009-11-27 21:33:17.000000000 +0800
+--- a/configure.ac.orig	2009-11-27 21:07:46.000000000 +0800
++++ b/configure.ac	2009-11-27 21:33:17.000000000 +0800
 @@ -55,63 +55,6 @@
  AM_CONDITIONAL(HAVE_DOCBOOK, test x$DOCBOOK_XSL != xno)
  AM_CONDITIONAL(BUILD_MANUAL, test x$XSLTPROC != xno -a x$DOCBOOK_XSL != xno)
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild
new file mode 100644
index 000000000000..e1d31a3ee77d
--- /dev/null
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+inherit autotools eutils gnome2-utils multilib readme.gentoo-r1
+
+DESCRIPTION="Yet another IM-client of SCIM"
+HOMEPAGE="http://www.scim-im.org/projects/scim_bridge"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+IUSE="doc gtk qt4"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=app-i18n/scim-1.4.6
+	gtk? (
+		>=x11-libs/gtk+-2.2:2
+		>=x11-libs/pango-1.1
+	)
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+		>=x11-libs/pango-1.1
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	doc? ( app-doc/doxygen )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+If you would like to use ${PN} as default instead of scim, set
+$ export GTK_IM_MODULE=scim-bridge
+$ export QT_IM_MODULE=scim-bridge
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.15.2-qt4.patch"
+	"${FILESDIR}/${PN}-0.4.15.2-gcc43.patch"
+	"${FILESDIR}/${P}+gcc-4.4.patch"
+	"${FILESDIR}/${P}+gcc-4.7.patch"
+	"${FILESDIR}/${P}-configure.ac.patch" #280887
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+	# '--disable-*-immodule' are b0rked, bug #280887
+
+	if use gtk ; then
+		myconf="${myconf} --enable-gtk2-immodule=yes"
+	else
+		myconf="${myconf} --enable-gtk2-immodule=no"
+	fi
+
+	# Qt3 is no longer supported, bug 283429
+	myconf="${myconf} --enable-qt3-immodule=no"
+
+	if use qt4 ; then
+		myconf="${myconf} --enable-qt4-immodule=yes"
+	else
+		myconf="${myconf} --enable-qt4-immodule=no"
+	fi
+
+	econf \
+		--disable-static \
+		$(use_enable doc documents) \
+		${myconf}
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	use gtk && gnome2_query_immodules_gtk2
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk2
+}
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 91b4662f9130..13c28d54c41b 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,4 +1,3 @@
-DIST lyx-1.6.10.tar.bz2 12559454 SHA256 dcfb6fc0f6880e706d45ea16459ed2206265179f3882b4685e4955c18adaf569 SHA512 c6d3f18f555e45ef86e22f42f7c8727ad0e1ad2cc4cbf87557f3ef235d894d46c5a87fc5923e2c02a5d9ba342389bf213af156a12c17e3b5f2308b9602b182dc WHIRLPOOL 0543590df1cc353fee939fee83db55aa146418c36c9422faa07cf9a1723002b83deb92f7ff89d49abb4144fe62d0fcf917257c07aaeb0d6e016b39393a8ab542
 DIST lyx-2.0.8.1.tar.xz 10481988 SHA256 fa0a9c6070554e0d12d24e9b3c4a1e5fc2ee853b3fbe83e2a415635cdc973c59 SHA512 17e313d3118dfe439f5251384f2fffdb45ffef5ec515953b7af0762d35c8e156a9338de698cea91cf8b3cedca1fc08364d8f3c50c9345f304d57004af695f901 WHIRLPOOL 6a9ef2df39861d373e1c6288f5443f910632a09ed4d84e409efe06459f2f39d3c30462b3a26aafe37c5216b765882e7ab5189e7d164b71def97f50877784754c
 DIST lyx-2.1.3.tar.xz 10778624 SHA256 2fd52e7e5ee372983eb6b0a7f04765cb0df6f8c1f3420081d9f7761acfc75682 SHA512 c2930d0ff1dfb7dc23e07be7141cd50c4fa023f32fc3653745b4f5031460c6fe5acfc955c0af5b3bf9505d7958b0d1e301eefd0a894bd02bb4c3f966f54332db WHIRLPOOL 818bba837ed7e63609c1067e94f3281a9d9ef2049ba1792a010372cb544e6ead8bab0ec1906f083e8fa27f8ae8145c1cf7a4772cf3952caccf5bbd2a2c1026be
 DIST lyx-2.1.4.tar.xz 10928716 SHA256 d13548cf183f2fc241df8121420933702491a7460c78a0ef6dba0e9e438ef32a SHA512 7547950e3c11e88f0ccf2cacb56709f9722d4cd03a5ee751af4489f6d343e13ee6b4e0ff7b830532572975c6cc9506686ade2afa5093f765d21b4d1b9ee7339d WHIRLPOOL a5d8533902fd5dd5a696645941c532bfe35eeaf76f411798a0aafcd01674e678dd65d2c0a58af09a6739adaf80f821a2676c340a349fca61929edfc5a9389938
diff --git a/app-office/lyx/lyx-1.6.10.ebuild b/app-office/lyx/lyx-1.6.10.ebuild
deleted file mode 100644
index 9cdf27f611a6..000000000000
--- a/app-office/lyx/lyx-1.6.10.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-PYTHON_DEPEND="2"
-
-inherit gnome2-utils qt4-r2 eutils flag-o-matic font python toolchain-funcs
-
-MY_P="${P/_}"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="http://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/${P}.tar.bz2"
-#SRC_URI="ftp://ftp.devel.lyx.org/pub/lyx/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="cups debug nls latex monolithic-build html rtf dot docbook dia subversion rcs svg"
-
-LANGS="ar ca cs de el en es eu fi fr gl he hu id it ja nb nn pl pt ro ru sk tr uk zh_CN zh_TW"
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-COMMONDEPEND="dev-qt/qtgui:4
-	dev-qt/qtcore:4
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXrender
-	x11-libs/libXfixes
-	x11-libs/libXext
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	dev-libs/libxml2
-	app-text/aiksaurus
-	app-text/aspell
-	media-libs/fontconfig
-	media-libs/freetype
-	>=dev-libs/boost-1.34"
-
-RDEPEND="${COMMONDEPEND}
-	dev-texlive/texlive-fontsextra
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick )
-	cups? ( net-print/cups )
-	latex? (
-		virtual/latex-base
-		app-text/ghostscript-gpl
-		app-text/noweb
-		dev-tex/dvipost
-		dev-tex/chktex
-		app-text/ps2eps
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-science
-		|| (
-			dev-tex/latex2html
-			dev-tex/tth
-			dev-tex/hevea
-			dev-tex/tex4ht
-		)
-	)
-	html? ( dev-tex/html2latex )
-	rtf? (
-			dev-tex/latex2rtf
-			app-text/unrtf
-			dev-tex/html2latex
-		)
-	linguas_he? ( dev-tex/culmus-latex )
-	docbook? ( app-text/sgmltools-lite )
-	dot? ( media-gfx/graphviz )
-	dia? ( app-office/dia )
-	subversion? ( <dev-vcs/subversion-1.7.0 )
-	rcs? ( dev-vcs/rcs )
-	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )"
-
-DEPEND="${COMMONDEPEND}
-	x11-proto/xproto
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-	font_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/1.6.7-python.patch
-	epatch "${FILESDIR}"/1.6.10-gcc.patch
-	echo "#!/bin/sh" > config/py-compile
-	sed "s:python -tt:$(PYTHON) -tt:g" -i lib/configure.py || die
-}
-
-src_configure() {
-	tc-export CXX
-	#bug 221921
-	export VARTEXFONTS=${T}/fonts
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_enable monolithic-build) \
-		--with-aspell --without-included-boost --disable-stdlib-debug
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ANNOUNCE NEWS README RELEASE-NOTES UPGRADING "${FONT_S}"/*.txt || die
-
-	if use linguas_he ; then
-		echo "\bind_file cua" > "${T}"/hebrew.bind
-		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
-
-		insinto /usr/share/lyx/bind
-		doins "${T}"/hebrew.bind || die
-	fi
-
-	newicon -s 32 "$S/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-	make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;"
-
-	# fix for bug 91108
-	if use latex ; then
-		dosym ../../../lyx/tex /usr/share/texmf/tex/latex/lyx || die
-	fi
-
-	# fonts needed for proper math display, see also bug #15629
-	font_src_install
-
-	python_convert_shebangs -r 2 "${D}"/usr/share/${PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-	gnome2_icon_cache_update
-
-	# fix for bug 91108
-	if use latex ; then
-		texhash
-	fi
-
-	# instructions for RTL support. See also bug 168331.
-	if use linguas_he || use linguas_ar; then
-		elog
-		elog "Enabling RTL support in LyX:"
-		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
-		elog "You must enable RTL support in LyX. To do so start LyX and go to"
-		elog "Tools->Preferences->Language settings->Language"
-		elog "and make sure the \"Right-to-left language support\" is checked"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-
-	if use latex ; then
-		texhash
-	fi
-}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 3e280edb7815..44edc129d4df 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,3 +1,4 @@
 DIST calibre-1.20.0.tar.xz 32430560 SHA256 475e09b1be4b9977240cbbe6743ab79da4b1f1afe3fe6015d212d868e8f2fac4 SHA512 84ac25080cf4948398b79f9a1af688cca9cf9a5a9200b2aad649f5fda1cd0556be4ade0c8b09ea6ffcc95654eac0aaaa5b8f8ed6ea9830174bc150e64de85e31 WHIRLPOOL 61b6ecde2e3f8679c1afea95dcd152a94ce03522c06dff34b406a5705f6255243f0565fbb5f9bef3ac96d7127190bd1b4363233fa24fafcd0412e061201f6fe8
 DIST calibre-2.35.0.tar.xz 37470944 SHA256 7d883c7ed5cf7c3c2e53c4d18e3a67c15d8a0d3425df57919adb57132860518f SHA512 a693c23e93ad1086fe70b0cc7dcf43b1a9c004f045a3c2fac42f6a4b9f231d4f1e7b55c8bae133ac48389d4e233e245deb958365e9c0283cd8668f0f5a2326a2 WHIRLPOOL b07308d7bb9803a3a882aaf4143d287352aafae69383276d6ee95f7b92a8f65c50c8a5cdc6c242ae87d8faf13ad830fcea9e27364749614219bb221a3d6ac36a
 DIST calibre-2.47.0.tar.xz 38924632 SHA256 048681cf6cb09b136017c6c99a1f1d908c6fcc3cdb2d40455cb4af8725395d0c SHA512 932ab2bae12ce128fa497bdd95d3c5f4f67e65bced5b73882f9b812cd9290c0a89c04c89ad3e1b421119c1ca88b5bfb7870a3060c91b5c8198e5ad709dbfdc96 WHIRLPOOL 15f4d3e19eafc57aabb526147926a4fa3343d340fcbc528df91ade6d82a7bfa6f993baee6224508c8dbf551d9640c16db71fc30c438675d09876b633dd3f6ea8
+DIST calibre-2.55.0.tar.xz 39854472 SHA256 a3a4f2914d491ab8c63725c11272d53bb4a91d282e6e5c6e0f245cb94b138188 SHA512 f067c93f7b32dbb8f94e30831df1bf755c25edaeb9dd4793ec79941738e2431e5fe51219d169056b3bb1f71b4223e933cc29fdae6572f212109b44b696bd6af4 WHIRLPOOL 433c68117f2aec343db026851de1807ebbcef91b229cb7790a9a3de35bb9ea6e20c194097ab4b283935843d998aba61f5a036483d743e35b9cc8dffaa809c5fb
diff --git a/app-text/calibre/calibre-2.55.0.ebuild b/app-text/calibre/calibre-2.55.0.ebuild
new file mode 100644
index 000000000000..71a3cf0af4b7
--- /dev/null
+++ b/app-text/calibre/calibre-2.55.0.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+	unRAR
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="+udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2
+	>=dev-libs/icu-4.4:=
+	>=dev-python/apsw-3.7.17[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-fonts/liberation-fonts
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	media-libs/fontconfig
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.5:=
+	>=media-libs/libwmf-0.2.8
+	sys-libs/zlib
+	virtual/libusb:1=
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-misc/xdg-utils-1.0.2-r2
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-0.6_rc5[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.8.2
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/extensions.py || die "sed failed to patch extensions.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
+	# avoid failure of xdg tools to recognize vendor prefix
+	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
+		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
+		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
+		-i "${S}"/src/calibre/linux.py || die 'sed failed'
+
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	epatch \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
+	local x
+	for x in /dev/dri/card[0-9] ; do
+		[[ -e ${x} ]] && addpredict ${x}
+	done
+
+	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	#dodir $(python_get_sitedir)
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	find "${ED}"usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index aa2741da5ade..7f7fdfb65b79 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,2 +1 @@
-DIST nfoview-1.10.tar.gz 102058 SHA256 49e771c059824563aa518e163c68da0c08b04bc174521d2ecff7934a550d4b49 SHA512 6114a6944b7886a6def01cd47649109d5e16921128cd8be122cb3395831038037b45160c3f0449e31fbb2bec88ac1e2c07294a5aaceea51a4fea93b7ea4440af WHIRLPOOL 348eb59e68320591f6a6713ca3ce20e44b0c9d07d35edf791619a66c85fec811b6d12951c0690ed5b6650b5a6e8491612a1d426cdbe6121d5e5d29b8c861feb1
 DIST nfoview-1.15.1.tar.xz 88400 SHA256 ed7643a781e9a96a904b1165dbefd0440fa029d25819233f0543925bb7067b1e SHA512 e4cf86003b03ae57b8a4e76990df77c7e9e441abd8ab0440385405b0f600a85539a152de5893ebe75797bd96ecb811086c48b1439b9f8719050eb12315f67426 WHIRLPOOL da47cc6275fec9a8d01d2bd38eabbf66188eec7c7e6cd657f3ebfbe4b51f010a3dcbd29faad7978aa504a8faa191959d8a3d36b0f54c301c84d3a2b089a4309a
diff --git a/app-text/nfoview/nfoview-1.10.ebuild b/app-text/nfoview/nfoview-1.10.ebuild
deleted file mode 100644
index c436277819ae..000000000000
--- a/app-text/nfoview/nfoview-1.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="3:3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.*"
-
-inherit distutils fdo-mime gnome2-utils
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/otsaloma/nfoview.git
-		https://github.com/otsaloma/nfoview.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="http://download.gna.org/nfoview/1.10/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="http://home.gna.org/nfoview/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pygobject:3"
-RDEPEND="${DEPEND}
-	media-fonts/terminus-font"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	distutils_pkg_postrm
-}
diff --git a/app-text/xchm/xchm-1.23-r2.ebuild b/app-text/xchm/xchm-1.23-r2.ebuild
new file mode 100644
index 000000000000..5c34a9154353
--- /dev/null
+++ b/app-text/xchm/xchm-1.23-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+WX_GTK_VER="3.0-gtk3"
+
+inherit fdo-mime wxwidgets
+
+DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
+HOMEPAGE="http://xchm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+DEPEND=">=dev-libs/chmlib-0.36
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND=${DEPEND}
+
+PATCHES=( "${FILESDIR}"/${P}-wx3.0-compat.patch )
+
+src_prepare() {
+	setup-wxwidgets
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS README ChangeLog
+
+	cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
+
+	domenu "${FILESDIR}"/xchm.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/dev-db/aerospike-server-community/Manifest b/dev-db/aerospike-server-community/Manifest
index 879ce22fa6e2..04f025255b23 100644
--- a/dev-db/aerospike-server-community/Manifest
+++ b/dev-db/aerospike-server-community/Manifest
@@ -1,3 +1,4 @@
 DIST aerospike-server-community-3.7.5-debian7.tgz 10810815 SHA256 9177bc49b732534371a27544adafa6792504b90ecb2e1992de7882ed7b221c32 SHA512 55b78b1992fac52f85d0405ae78b590b8af60880da0fc307570e13c2468f7e83fc1b61c3425e4c98fdb955c3d19c96c3f8e557f803c6d8154ec9d3fd453b2ca9 WHIRLPOOL 5569dd54bf68ee68ebb4bc709d8a5d816115781dd3a05997685c1408dfc1129e83f251b973c4f5e736a728998cf8f54543f9800214c9efe6077f1a92c5f40cee
 DIST aerospike-server-community-3.7.5.1-debian7.tgz 10811406 SHA256 8f6647c64a9431a7cdc92276ced5146fad6bba45d5cdec53474c739697ecf432 SHA512 125664a82f757ee647d80cf09f7874cec9cef2cb319dad2563b4aea7045c7797755474aacd3d35b52b1f0d1fd37cbf7ca85e985a3d0a29278ffa35fc92f13af2 WHIRLPOOL 1a8d55814567e49e1787de3d9b76641e4ff41a6dd15d913c6f93f3c6ec8e3a13f90c9365691bf8a74fb02c928eadc41ea9230b3137570e521bfc5312c2eeeda2
 DIST aerospike-server-community-3.8.1-debian7.tgz 10981771 SHA256 c10eaa991e24e256b5ce558ade94a6d7480a75a5de1ab78a7620757bf6e7bb7c SHA512 1f54d2dc7a2630981af749b25e4926cb52ab9b0396943e3d753457da79eadae1b4525abb5ebe878368bb5356a6727842a55b92a54d60db9215f696793a7bd6a6 WHIRLPOOL 282f17afeff5f3d458226848a6985b71abe4cf5c1f0eea6b39754fc54132be448e0823562d0522455fe2e467070eba374a0915977416a9e015d481e9b9354ae9
+DIST aerospike-server-community-3.8.1.2-debian7.tgz 10985656 SHA256 7b386b801e66ee66ae2e9dd2f10ef92035c49092d51e1c20420dbf1fa8fc42e8 SHA512 15d053b9f81d63155680c4cd9bd1f8e06b3ecbaaa99313b18ffd6e21a41d225508b5a5919a7c4d74e6ff33303dde75abee84964d560776712d2e1957f3638eb2 WHIRLPOOL d4570f8a370219b5ae0d36312627355c31925df896ef41e3527c73ddbf25cd386d06c387d86e599a4f53898f299db880d9373910522accb3b9d937abf29c5b27
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.8.1.2.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.8.1.2.ebuild
new file mode 100644
index 000000000000..6327f9e2b561
--- /dev/null
+++ b/dev-db/aerospike-server-community/aerospike-server-community-3.8.1.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Flash-optimized, in-memory, nosql database"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="app-crypt/gcr"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}-debian7"
+
+pkg_setup() {
+	enewgroup aerospike
+	enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
+}
+
+src_prepare() {
+	local server_deb="${P}.debian7.x86_64.deb"
+	local tools_deb="aerospike-tools-3.8.0.debian7.x86_64.deb"
+
+	ar x "${server_deb}" || die
+	tar xzf data.tar.gz && rm data.tar.gz || die
+
+	ar x "${tools_deb}" || die
+	tar xzf data.tar.gz && rm data.tar.gz || die
+
+	rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
+	rm usr/bin/{asfixownership,asmigrate2to3}
+}
+
+src_install() {
+	insinto /opt/
+	doins -r opt/aerospike
+
+	fperms +x -R /opt/aerospike/bin/
+	fperms +x -R /opt/aerospike/lib/python/
+
+	for dir in '/etc' '/var/log'; do
+		keepdir "${dir}/aerospike"
+	done
+
+	insinto /etc/aerospike
+	for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
+		doins "${FILESDIR}/${conf}"
+	done
+
+	insinto /usr/bin
+	doins usr/bin/*
+	fperms +x -R /usr/bin/asd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/aerospike.logrotate aerospike
+
+	newinitd "${FILESDIR}"/aerospike.init aerospike
+
+	fowners -R aerospike:aerospike /opt/aerospike/
+	fowners aerospike:aerospike /usr/bin/asd
+	fowners -R aerospike:aerospike /var/log/aerospike
+}
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 88e419c04ef4..6112cc37ccae 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -8,9 +8,12 @@ DIST icedtea-bin-core-3.0.0_pre10-x86.tar.xz 56360920 SHA256 61c45704a8302d196ec
 DIST icedtea-bin-core-7.2.6.5-amd64.tar.xz 53018784 SHA256 6adb5ae0e07b29f89cf3ee4a4ed8739ad92f3eb6d276e38ac56056570b70f263 SHA512 9b65828ae84939a7951ed26ed1e55abe42bc8362447b8c8b408e6ea64b80252d1de49a2ab17493dbd920fbc8b496b530486e35946c87094bf5ade452100c80ef WHIRLPOOL 0ab1babb5cdfb17f69692f4430226a0217de6b9ac4f691b700dbdd123b5f221592092f68ba548834692387b580633f704388d12ab20d2212a23793cfbfc243d9
 DIST icedtea-bin-core-7.2.6.5-arm.tar.xz 43997476 SHA256 d897fbcb7e0587ebb3c1cda83b558eb231983bb44cb2fc306b0fe30c0692d4f9 SHA512 8a328f5f508a815b2e13f0cf27d21a724c29e6228007e6dde418f1a41981d3c3d8c205586560c1f0110e68a176cb58329cd80510a3e33aca0994a78a4456bd89 WHIRLPOOL 4ef90a28853456c16e6698f6e6fe4d46eb745062773da10cd8c75071c5a7b7dc73ae1da21dac1474f156e06cda98a5ceb94a65fe8b79b1415c722126deacf43c
 DIST icedtea-bin-core-7.2.6.5-x86.tar.xz 54670860 SHA256 ffdee3645634771922e6b160012ba2200c7f59e91dd890e8e61f2b35126751ca SHA512 7ec33501a2118f85f3bd14435eb9aca5711b77fa379db21b63d50d5f20da33cb3818d876f8be3ab40d7cbd8df7120d0b73d06415284463d50614510a59ebd41d WHIRLPOOL 7cfec521ab9cad48cd1296c76c12d8cc57a830a416fba591d0d7e0d7ef195341a3b401196049516c0a905dafcb36323bb68bb013b4cb4ea6b6a702972a984800
+DIST icedtea-bin-core-7.2.6.6-amd64.tar.xz 53051836 SHA256 9729ac37ed34b60f6a9c18c6865e99648379c79e24f189842c0f8dc81424fd9b SHA512 ee621f3dfcc19fb274acb8b936f7256b2053ff97864340732e6cf97db5a265d81ace7269c9f90ee7e4135b4299d7ecdd2b660f5e806ede64e4d74a4dd80b0592 WHIRLPOOL bfd8dd85fd074f7f16d296a41bf7ccaaa167fbeeb3bfcde4119c2b2ee8a59aa2dad9e627a15dd3790f318b9fc8fa8328ead9c472af527a82a93c153b1d92de02
+DIST icedtea-bin-core-7.2.6.6-x86.tar.xz 54697212 SHA256 c33e89990e1207458abc56ab0b2720b239ee0a3924e73360e19f52e7a29f8ee6 SHA512 7ebca976f2864cee1e08ed858e93c0dbbc850d127c9359b7e1edb7abacd7e14e0b5cdbb1f042ffd40232cbcea72f21074caad2a669096a5a5a7808c246d4e04d WHIRLPOOL 6640c59170b451f81541cf98451325d596115ad8e530b9d5fabb6f060e4e32e09c9ac49b6799694508108f09b58b82f98c4bd4d678ea8d9319c5653ba342d873
 DIST icedtea-bin-doc-3.0.0.tar.xz 11682788 SHA256 41bcb752716f54a2b4f0d3c25de4a95d77dab3e735cdd785ed79bb04614feff2 SHA512 ec57ce1f403952960c6accd691e375882ead088b28308231cec5ef05e61701fd56c15c98c7ba7b34ea41f338ad3b26cd13cb6b673a2a3ec9b0402066df3b4484 WHIRLPOOL 27b588ff1c479de6398d1a912edca9a2ee150473cc17b435d0356520b7d3dba0c7018dffb440d8966850b5e8fa2b6ea58d8c3e891f049583f6b30356b85dd631
 DIST icedtea-bin-doc-3.0.0_pre10.tar.xz 11688120 SHA256 cc26fcea4f5208e11ecd00a5c99c4bd5b0541e14ced37aa4a8e0e396c7565797 SHA512 ecf6a8654caed4c7fc07baff10010854e6751fe2eb2377979c1e68e6f1530ed60df0574df422b6f03f6acc20e9b943fd4db2e883eafa00480abb4bd14bf12f9c WHIRLPOOL 760dd0cba2e0438eb65d75002995d64fa9b968bdcdb8b07da61552b1f2044312c5cd6b3981a64e1063f14974ac7ca080d0eb3aa3884553844ba97992bca63da9
 DIST icedtea-bin-doc-7.2.6.5.tar.xz 10605544 SHA256 ae3e5078e8705fffbd95e986c99ce5ed8f8e76474f2c3c005aed0eef67b55377 SHA512 e24f52b8d39e329fed5e8f76a6d15a168454c252db653b46eb4fc5dad63483afefab07794718b9149a76bb62ccdb9f6eda8da9229043eab362bf359b04b118dc WHIRLPOOL 42693d3769ee3ab9af6200d7702244a941a07a01f41f3db655cae28b5bddc527989860dbfdc93681cb4ef22ea5b0c2a489ffc765abb15317ee07762a46f2b863
+DIST icedtea-bin-doc-7.2.6.6.tar.xz 10603724 SHA256 150a8aa157b442569b60491c5261909a7a381e0a253070e2bf6d9fd8d0344708 SHA512 39ab65e002d9f780c881cbdea41a4fbae792080399a020c189d7fccf24a83c604ecc90b6fad47b9657eba11254b1021d8c45d83cb8a0dcfe62011f9cede53ce3 WHIRLPOOL 480fb25b1b551699163fc07ad5bf31e774c38f4ef51694d906d0f5c5c5d3f4941806b352ee472fdc3e02c007d96a28d395c41adc4d4965f826babb2465011bb9
 DIST icedtea-bin-examples-3.0.0-amd64.tar.xz 1811800 SHA256 b08dad2eae1f91cc2db9124f66cfd3c11c8aa8001f2e1be7fd1ad0c214db3ab2 SHA512 5e37b6f5c5e4ee651af43b5ffebdb91ed995f26693f333b50a355fdce508c3a349e9a01d1c74640bb7cc56825da88b003175c9ef4a274e2b4304976c40257158 WHIRLPOOL 80f991e760f743b60b7c4d052b5593ed57f2f1d87297b0ea716bbc1c467753fb1c1709f198b55ab8cd2f87b303a88c328205e7ce21f5ef2e32e0a27877bae280
 DIST icedtea-bin-examples-3.0.0-arm.tar.xz 1794400 SHA256 2fcab4acb1aa08b4a3428e0aaa0c628269cf8fe7fbf3ec89f816391ec45a4e02 SHA512 409d80d2b7fac2bdd21886fc6852f7a4f31da6fc790519dabfbefca8da7c4beb17080eb38e5a707a63f9922d3839b96c0a9484be7104ac4569b9ae23b59c9ffd WHIRLPOOL 513feee6807661d90fa1eecb47c7c9e87eae58b3cad7e6814231d004edb3648f1ac3424b0607a7b505ab67ccaa37481336ab9c8a6eb0450ea7e63d6a6339157f
 DIST icedtea-bin-examples-3.0.0-x86.tar.xz 1817080 SHA256 6bc424021b45d1e957cab1bd14d1de21e9be12650e24ead2aa21a53ca52e2e3d SHA512 65ef2dcea0be74dd7e2f5b3c6f0023c8c87e11e7f6ac8fb500e3a2ca0ca401bb0ab806b64f78fefabbfb69dba66877d2866cecc5d9e76ed2cfd55f0e8c1d81b1 WHIRLPOOL 9817369422ca16c11e6e4023e9f356be277b705cc59cf66ad9d2d6e46534e57be7cffe03180191760d39cd990177af8ad9c7554908e21da5f8148273c7b1e5be
@@ -21,6 +24,9 @@ DIST icedtea-bin-examples-3.0.0_pre10-x86.tar.xz 1817288 SHA256 56092226edba7270
 DIST icedtea-bin-examples-7.2.6.5-amd64.tar.xz 1796824 SHA256 9730fca1e431168169e71a6cd28120e2da97894771ff99bcfd3fc814ed85402d SHA512 a931737a56fffd65ba3dee00d68a22ee365c783e87cf37cf0fd69620465acb9b5f64bd36ba3798a5d9549f96f7290500a0abbe5d5cee40fc66c5db15b44ecdc5 WHIRLPOOL 5affef2b772efbd96d6fe799bd686b7155fcfff1b3738f116cd8265fa2e784dcece7867d456657f0a213b663c8d7ffe4799cf1ba30e1dab1d9ed57b256121081
 DIST icedtea-bin-examples-7.2.6.5-arm.tar.xz 1779800 SHA256 563ac5025c8d3a6f0066ca479d9f0053e6bd2440dbe07b2dbfbcf3aee6a87699 SHA512 3c98a62aebf83e5e6e36443b8c42925a2534e15cc369cef4d06d39b81e82057007758462c5b7731a36e862d93a7e547ef2051b9aef313f24fa261277715771b7 WHIRLPOOL 4dc678d1b9e5a9245fb01fb93fd76e6892783444a2026cbd44ccc843cb8229328a43687688c849605e933605366b6904abfea9c152477f9db50b4f7b91ba0c06
 DIST icedtea-bin-examples-7.2.6.5-x86.tar.xz 1796620 SHA256 1571042672d5d53e4f56e84397411273639e45d05ac706d0b845ac8355f82484 SHA512 ee59bc512af1555480a9219cd01bf2e4f935534c2ba93f8323b4e1dcd69131920dd9ab621e3dd8e68e9cd3cd6fb63ef19274a37b4e954d4570f98211a501e005 WHIRLPOOL 9abc2a7198e31cf33796df0c6ac5b5008ab53d286da086e7e5f526e366339fe68e1c506276cb7044fb7eaf07070de2d00a979b941931665f3a20f9b899bba273
+DIST icedtea-bin-examples-7.2.6.6-amd64.tar.xz 1796808 SHA256 b6add78d86e3420f589f6bcfee1e4a9fb983fc4d0b6a905fe162dfca56e73500 SHA512 38e2d91f6621e38959c2d0bef84f4d566370303a5b50cc468cae6fc97da46d752fccd8c980b6490f43709c0c6340c3af88dd9f7c9a0d7f400289127aa568b3ac WHIRLPOOL c212b2a953f784a05759a1b82d7120fbb5f642d8d7f014750f8c509aa44c29f193f17dc86257b1b653f0e5334e167054f71021726745adc8b8d1c57273902223
+DIST icedtea-bin-examples-7.2.6.6-x86.tar.xz 1796496 SHA256 5f7a4f52ed2f36d06ecc6c37041e2b400ed84c56ef4921375a925682b4523d88 SHA512 e80c965ca8cccf60561138fb5c4f21e293b6e44b5a4cecc97d94ffbccffe4f18da40942e2659c7264df54563c8db327b5e7a7f71fbf6ef873a4e74afc122050a WHIRLPOOL 402a1e10aa17e875dd83adff72dbe9d37c05b40a44c26e3212658ea690efec3dc9a61b57aebe24c77f16c52961dcd925f412c645e828e9e0456ae3a8d77ebd9a
 DIST icedtea-bin-src-3.0.0.tar.xz 45650888 SHA256 b5be2bce2d1ae180edc153ccd8ad5549aa8fcae1f33423b42794cb98283eebaf SHA512 95ef74d7be58e82e1e873f3b9ff4dfcf6a8e172d59bbeebbe85df53662ecef2eff9ae19e6d6f952f873f14dcc1d38e1045230224f5ed27b930436bff8a77a8ac WHIRLPOOL 978f52a370259912be366e2bd1c7998743fa00065d39c713f73f6c983bcfcd393791435c6e1ecabc5e7293234ca0b3272395074fca3b4bd99f4588be2ccae19d
 DIST icedtea-bin-src-3.0.0_pre10.tar.xz 45654080 SHA256 48f2402a183b21cbe9af45eb0fd47b07f22b007c27c2730bf99b7cb588fa5718 SHA512 c5bdde545f997c4451fdeb2b20a6e7eae9519419b84e716ae6789ed5f0828ff3ab22c2d1f86bda907175a31c4d0f8ad4fbc45548c5a77f7d9bc2bb2125edfd85 WHIRLPOOL 1582af0d78242f0ba7d1a84c326678f9231d6c6b81e9944a093e9ef7ee748eb6a74bb4cba65751da2f8937496e0084cfa6d6eaf9dbf0788adff2f55cd2eef127
 DIST icedtea-bin-src-7.2.6.5.tar.xz 40046964 SHA256 85bd4d4bc2abed47ef2bf7dd5eadbf5837efe67fe4cc322dea8096d47a980930 SHA512 cc5de0f6ede1a342380d5a1ce9ec279ae7f7bab46ea5504c0c39318ece75ad867fbb095e8a8aac5ecc64a02bc8376cf283b36f9a21fbcd485b8d0be636ebd047 WHIRLPOOL 276845b53eea26df67542e240c7f3068fa554c610be1ff7cd43729a57bb74ced6082f5920cc7deee81b8b286bedd24866c67909fa82574aba73e7ca19411e46e
+DIST icedtea-bin-src-7.2.6.6.tar.xz 40045788 SHA256 4d759dfc12a39ff44650b61a5a89f2ee4dcc5d6d0a863c54f8c6e2c86023ce8c SHA512 13cf426366bd7ced497d16b76dd5d49aadfac45e9686b78c185b4d7c95b47f96fecfc789b14138780592580c39857a2d68d8d35a6d016fb4ba1c0c8103b74f9f WHIRLPOOL f645c6da2a5c08e48bd6598bda025776d4e4fceb3a92898b4c5d9ca7321797e834df572656c07cf24fbd2eb0cde097b38137472857d968b663ccba2788406c07
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.6.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.6.ebuild
new file mode 100644
index 000000000000..f2c3405196a2
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.6.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix toolchain-funcs versionator
+
+dist="https://dev.gentoo.org/~chewi/distfiles"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in amd64 x86; do
+	SRC_URI+="
+		${arch}? (
+			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+		)"
+done
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND=">=dev-libs/glib-2.42:2
+	>=dev-libs/nss-3.16.1-r1
+	>=dev-libs/nspr-4.10
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	>=media-libs/fontconfig-2.11:1.0
+	>=media-libs/freetype-2.5.5:2
+	>=media-libs/lcms-2.6:2
+	>=sys-devel/gcc-4.9.3
+	>=sys-libs/glibc-2.21
+	>=sys-libs/zlib-1.2.8-r1
+	virtual/jpeg:62
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	!headless-awt? (
+		>=media-libs/giflib-4.1.6-r1
+		media-libs/libpng:0/16
+		>=x11-libs/libX11-1.6
+		>=x11-libs/libXcomposite-0.4
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.7
+		>=x11-libs/libXrender-0.9.8
+		>=x11-libs/libXtst-1.2
+	)
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( >=net-print/cups-2.0 )
+	gtk? (
+		>=dev-libs/atk-2.16.0
+		>=x11-libs/cairo-1.14.2
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/pango-1.36
+	)
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="!arm? ( dev-util/patchelf )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7(+)] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if ! use gtk; then
+		rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
+	fi
+
+	# NSS is already required because of SunEC. The nss flag in the
+	# icedtea package just comments or uncomments this line.
+	sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" jre/lib/security/java.security || die
+
+	if [[ -n "${EPREFIX}" ]]; then
+		# The binaries are built on a non-prefixed system so the
+		# fontconfig needs to have prefixes inserted.
+		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+		eprefixify jre/lib/fontconfig.Gentoo.properties
+	fi
+
+	# Fix the RPATHs, except on arm.
+	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
+	# https://github.com/NixOS/patchelf/issues/8
+	if use arm; then
+		ewarn "The RPATHs on these binaries are normally modified to avoid"
+		ewarn "conflicts with an icedtea installation built from source. This"
+		ewarn "is currently not possible on ARM so please refrain from"
+		ewarn "installing dev-java/icedtea on the same system."
+	else
+		local old="/usr/$(get_libdir)/icedtea${SLOT}"
+		local new="${EPREFIX}/opt/${P}"
+		local elf rpath
+
+		for elf in $(find -type f -executable ! -name "*.cgi" || die); do
+			rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
+
+			if [[ -n "${rpath}" ]]; then
+				patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
+			fi
+		done
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index f200eb72e609..bfc60fac074a 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,11 +1,11 @@
-DIST icedtea-2.6-corba-389551542e13.tar.bz2 1072454 SHA256 427969fdd78513a11ddd9d5131a068e0b26ca2c8f14951bf8b161fecd07fe77f SHA512 b9b48e79dc183e823caa2bc8600de001618ce5c9a10671639ade9cc6515ddf90a8a4554cf76c7633632ffc71833f247b39ae184a8c625f11cdd92a393eefb201 WHIRLPOOL 0a14f7f118c4bd4623b0351f870927e08485d79ede3153b7d171f9fc303b8a8dba182185c1db9b21fd88ad094d8706890c77cbfbb5dccb8a587130e53c37d622
-DIST icedtea-2.6-hotspot-04d7046d2d41.tar.bz2 8164174 SHA256 43983232fb10abeac99478e7045c04a93fef86185e2b9ee9c7b46f2903441cfc SHA512 7ecd1880eaa3e5c5dcad9ed083bd530e13f0a13476ee4594c37d2bbb55ca816423609075e97aadb3072010163bcb9b16935b5047688315af74a2d63099323a38 WHIRLPOOL 268d38ac11f1af3648e482d8e27b327b2d2ca7fcf7f2eab1350374c2dde4afa8373ac97ed3ef9531921bae8dbe7a07114c0dc2f14dc50f04bb50e078b0197aa7
-DIST icedtea-2.6-jaxp-8a56658cb829.tar.bz2 2732669 SHA256 7bb5e1bc9f0807061e157aeb356dd0e3b9fa019fb316beee3aa0181a335ba37a SHA512 64ad347aebc763ff8f9db3821b0197a400ffb5c6c75900be9b25d2af0b090323bebb0ab44b6f43a8d5c1a13f9d779dadf07a99d245281cfbcc0673db30b063cb WHIRLPOOL 83c9773b809dd85baa637152b3bbc2d7f9c7c61c4659a16edbc883ea0efaa70dde0533395b1e8b1f17fcc8b2f9cccd85e244e773b16bcf0cc735b8f51f4c076c
-DIST icedtea-2.6-jaxws-9c049d7f5adc.tar.bz2 2021930 SHA256 4e759ade7e47713f6f26afc1ffcd02f2edf967582fae2ec6b4d73dc81be926d0 SHA512 8b71f5bcdad6e2191c100d8095aa0bbffaafc79a4a4b81d495430ba6c4ea1287b407f36333def5384f646cd18d916270b900f8af475641ed8c5d3361dc613d69 WHIRLPOOL f8cbe3646698c3d8b564b700ea53c2e1cf37ce8f47498a286173cfe338330bc640844c4e0d6271e283c84c2db71f76f7bf8127fbf93145ed87a972662a3df32a
-DIST icedtea-2.6-jdk-e727fe32654c.tar.bz2 32423186 SHA256 cd3810553b1066c21f2fe08a73de72e38ba7e72295cd32dec70db481a24421ba SHA512 459c0ae24f9514020d794d8acf0189c0ef9dff589f034a061cea605890ae7ed6327ab4adc1761be406bd8e3c808d3f4506b3610b8096c5045844f54aac51c994 WHIRLPOOL 861ca3d1163357e5c5562146e8940082bfbc36e7cb12ac0517d68f5d4a4e98c8ddeeabc0376d2b9db2bbfd2742c64014f7deaa8553269a798be8e5e3f399969b
-DIST icedtea-2.6-langtools-f6593c32cc46.tar.bz2 1707644 SHA256 6c6c676c60af61638a0c3176f0312fcc0abad16d1d3cdbe11aeefcc3357a78d9 SHA512 d469a26381d5163998c85f9afa33facd1d46650b7097cdeb190d4b50b087abea5fb3b4caf8a72e228e5c7d012dc1e2c44c0bca6d4363be354f2923f48127aa8e WHIRLPOOL 940591f4601f00eb3ba5422a7687e148a4acb61ece99e29daa0eff145f4897750b9780af5cceb21aa1a1a951d4ce6dc84427bb76bbb42a23acab5e977cca501c
-DIST icedtea-2.6-openjdk-8e728c41fec5.tar.bz2 130030 SHA256 c66f56a91a6fa9e3c889bbbc5432a4e082b7d3735188fb508fa7ec70c142abdb SHA512 10626285c0dda1fa9ba3b843cc70d61c1d417dd87e5def60d8df6d19b4ce40d2b0b0e007b6a52b4468b5a152aa50f9efc6a45dfe6f31cfbf2d47897bee3ca13f WHIRLPOOL 8f4f5e5c4e75a0d9aae89872482925a37b80a7e85d74a8d6968c28fa3dd488176ddeff9c62f81b90a4e994ac2c04d6704b6a2eba4cf734783ff106af8942ce25
-DIST icedtea-2.6.5.tar.xz 2072216 SHA256 e752304496bb11ae9952beb11e6743dd84e55b340eaca716f310c5a0f48b53f7 SHA512 8b6dd1fcec8ceaa0525872123ab9327093c5df35b322569942909a0a61e0bd4225984e2f17f30bd392b829368379cbd3efc8b14ce09a442b9d13eaa78d749d5a WHIRLPOOL 8bd4512ddbeceeda7515a4e74555243582a8201eb800f7a357cb67e9744f30d030fbadd571e4130a18d9c43cbb4f25227e453e95976ae83118e0a79f4f6f2b39
+DIST icedtea-2.6-corba-ca3e3c4c5a61.tar.bz2 1072731 SHA256 ce886c97a150465df3a36c4281d5f36ba8ee2b081b5b76ecfbefaddb723b6a2d SHA512 377893e3ff8285966cb06ca2c4b276a4241df191743b585feac9c142135ec5b74615433c5a52576206077d282683ebab5f05a7130921ff76b5b7916561d6926b WHIRLPOOL 7889d1af35038e8f213fa9213f7051d62ecaf9e8034888483947299e64a80b60fac468c36589577d1608175e71e7f5ebe7c73725a4943d99b064427a0b19211a
+DIST icedtea-2.6-hotspot-3022a3d80efd.tar.bz2 8164643 SHA256 a4e8f4fef724a34e5eece3c2c1de4e60ff12e752549c8df11ddcd6f3042e0dc2 SHA512 44e99f086a16ccec2460ce8335ecabb3893f81abe64b4940ac66cd17d4651e37f6fdc1706ecd8150d5310cf240359ccac0aa77d96fab82a8216e1ddfd88ab70b WHIRLPOOL 35a7951ddf1ec416e031faa1c65210f76b58693ab41442c2eb0ad4ec631da8942feefb050dd9c173a43c9ad76ad3e1e7e9529375ada9f321e4bd876558d13002
+DIST icedtea-2.6-jaxp-683427778edf.tar.bz2 2733076 SHA256 679eb46054afea3098713beee85639c4a5a5af881e94be527409feaea4272d30 SHA512 26fe3739e85f63eb2149db4c89dbe31f4d54c1c7265802e456ad4df4212a9218b60667c6ab33e6f2874ac9b86d12630b6a9877d9a2b104f27276a564498d5678 WHIRLPOOL 9765849715ed80900e8c18a7a83e48af79c9b187bd152c294198b316c5973df7388d92c5b5653269a00fd318325571ddcd23101f8795a37be1a82c565927c244
+DIST icedtea-2.6-jaxws-63f7bf7ed2d4.tar.bz2 2022402 SHA256 f9af138096f4d11e381c3cc949dd3ee37cee5bfff15dc21cff5c16a2f9e7c218 SHA512 05c0f06f8f77c133aed646b0172cd40ffbe606f2d3e092b89f5f6f5a53dd489ef87b0abd9bb3013bf31ab2ea693c2ab627c4da7f19075628ada28a4ba1d85735 WHIRLPOOL ac19707fc39e8255762977c9b86991d8f425e18da6cbdf4fff33cb2f911bbb0ce9891c4d8c9b912aa5a13460ca188ac81388b099b7d1f4e63d98bb76927b8e6e
+DIST icedtea-2.6-jdk-55c38c1ace75.tar.bz2 32434755 SHA256 1baa92ca72db1b80fff18ca26bd49e5fd5f2927df9eceebf3456cbd86a710a9f SHA512 7fe81eaa9f1f96f95276d8a4fe5c48817324d487e99c43360cbcccf48d2bef7e43be3bc0f38c9cbdaf4a63794c83d04fb362bd64a3f18e886d9f87868024d6d8 WHIRLPOOL 8b00b6c3fb18970896bd943cfee01929edb8b2c4f3e74caef7e5629b3de34aeca0cdb7ed911f9627f8bb83221ed3cfc3319a1b65159a0a2cfd4799daeb28e52d
+DIST icedtea-2.6-langtools-e42dd50480d3.tar.bz2 1708918 SHA256 54bb2cee7b4fc5bbc63a4c9d7008602e12f75431c7f129ade7c405b53c2363f3 SHA512 55ad5b729fe85710089017402e575b5f5f2426c54401bb40202af2bb7af722d2b3370f12f5ba6be941b60177ee45ad15911fdca554c213c09c93d9404d85565c WHIRLPOOL 6c4d5dec34dfdcd9ffc831020790529193b665f92cc7bee33df8e5a7c97a0dc51f1adb5b675c81fb347f07ed4854bcb6bec34714935995826573c2c1464d186f
+DIST icedtea-2.6-openjdk-882cfee70fe8.tar.bz2 130156 SHA256 24f813e6cb938272a4da37b46b48aa86820b13be0747747e6c8fb4aad72cadf3 SHA512 fe72b626a60e8dc7939d35069ed90e8053676e8b45a9eca78d6abb2c7e3bff15ed7f84300542e726a8cd6a8fcc73ae2f779843de79654dd6cb4ef04fb134c222 WHIRLPOOL 4cc443730734c5b3d4f57de7b3ecfaefe8029ce4143b60e80011d871f322076816edc11a39c718f0cfa6d2283315186b8fe488b1f8b5aea16736a88970af513b
+DIST icedtea-2.6.6.tar.xz 2072632 SHA256 79949744436158d9ded3a758c22da7629f843ea3913afdffc65ea0f1a26d544a SHA512 ba603ec6c16b5642d1591717ea14378ebe045e4128a8eb517de94df32c3bb03b636f051e682cf5990c3a1bcbf2460a97965cdc139bf265fe5f97bedaa539092c WHIRLPOOL 7716613f6463dcaa514c980ef0850c2ad42319275b504d0ec55e0dd54e0dbff5c74af4f53b0e466dbb41c4ab5ae2694cb3a5f74b19de4913790ef9bff6554985
 DIST icedtea-3.0-corba-37af47894175.tar.xz 936876 SHA256 d77480d5d0c9620562a66b01fda9be4de58c2881cec680b4f2682ef09087b3cc SHA512 21b2f069f1eaca62a46518173de3c1368963db489f436d5ad705c7cb36ecc259d342c059c4c593427e96604164f78be761e1fe4118d8517ece3630280524ad30 WHIRLPOOL ac7292f0a32cfa7b58d3616b704bfd90ead49044bb51fccc1ca87900555d15f28b3d3137512fe007b40f0a130d3e6eb9d805112725914b0f0721ac8dbad8794c
 DIST icedtea-3.0-hotspot-5e587a29a6aa.tar.xz 6766584 SHA256 76717fa6a84fde60075c19fbc261709bd9c3b849952c817c0ac6b46b757ac0d7 SHA512 c8a2355ef81ad1dd4a2f6be0e5cdaba9d6d66a4fd5514718cc09ed391bcce269a17a34fbc89d7c6d3e7a2632f2ffcb0028a8faaf41649055a096407a24cacd0e WHIRLPOOL 4e83ea5ee631ca76e7919a944f9f1a3a007ca951a99552ee087bd6d2d6e027c5ce9963ec3c593c8132a984dd9818fc42abfb0792b3628d44491488700b20ec09
 DIST icedtea-3.0-jaxp-4ed5441e40e1.tar.xz 2296120 SHA256 4ccce5442642561cda78116a019f5c0ea690725a374ccf5695b3af00393d26e8 SHA512 47e968f674176f74706ab268098a1635a54de7282993abc46a1c72c8d24f21216ed898bbca830623f5afd11912a744138547d6d22a82f68fa1ba15ccc7a9e375 WHIRLPOOL e94f961336d1e8b176ab2486ae98852049f930af3ee31dd3f7491544244c78d6b5657334fb45b9cc863bb6c377a6b1ab5d71df1257d02bc9e79513cd41ecc2ce
diff --git a/dev-java/icedtea/files/7-cacao-pr-157.patch b/dev-java/icedtea/files/7-cacao-pr-157.patch
deleted file mode 100644
index 0701363cf38a..000000000000
--- a/dev-java/icedtea/files/7-cacao-pr-157.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -Naur cacao/cacao/src/vm/options.cpp cacao/cacao/src/vm/options.cpp
---- cacao/cacao/src/vm/options.cpp	2014-12-12 21:14:45.000000000 +0000
-+++ cacao/cacao/src/vm/options.cpp	2015-12-23 21:01:37.644275263 +0000
-@@ -26,6 +26,7 @@
- #include "config.h"
- 
- #include <limits.h>
-+#include <stddef.h>
- #include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -60,9 +61,9 @@
- 
- bool opt_run = true;
- 
--s4   opt_heapmaxsize   = 0;     /* maximum heap size                          */
--s4   opt_heapstartsize = 0;     /* initial heap size                          */
--s4   opt_stacksize     = 0;     /* thread stack size                          */
-+size_t opt_heapmaxsize   = 0;   /* maximum heap size                          */
-+size_t opt_heapstartsize = 0;   /* initial heap size                          */
-+size_t opt_stacksize     = 0;   /* thread stack size                          */
- 
- bool opt_verbose = false;
- bool opt_debugcolor = false;	/* use ANSI terminal sequences 		      */
-diff -Naur cacao/cacao/src/vm/options.hpp cacao/cacao/src/vm/options.hpp
---- cacao/cacao/src/vm/options.hpp	2014-12-12 21:14:45.000000000 +0000
-+++ cacao/cacao/src/vm/options.hpp	2015-12-23 21:01:37.645275246 +0000
-@@ -26,6 +26,7 @@
- #ifndef OPTIONS_HPP_
- #define OPTIONS_HPP_ 1
- 
-+#include <stddef.h>                     // for size_t
- #include <stdint.h>                     // for int64_t
- #include <stdio.h>                      // for FILE
- #include "config.h"                     // for ENABLE_DEBUG_FILTER, etc
-@@ -77,9 +78,9 @@
- extern bool opt_jar;
- extern bool opt_run;
- 
--extern s4   opt_heapmaxsize;
--extern s4   opt_heapstartsize;
--extern s4   opt_stacksize;
-+extern size_t opt_heapmaxsize;
-+extern size_t opt_heapstartsize;
-+extern size_t opt_stacksize;
- 
- extern bool opt_verbose;
- extern bool opt_debugcolor;
-diff -Naur cacao/cacao/src/vm/vm.cpp cacao/cacao/src/vm/vm.cpp
---- cacao/cacao/src/vm/vm.cpp	2014-12-12 21:14:45.000000000 +0000
-+++ cacao/cacao/src/vm/vm.cpp	2015-12-23 21:01:38.046268504 +0000
-@@ -29,9 +29,14 @@
- #include <cerrno>
- #include <cstdlib>
- #include <exception>
-+#include <stddef.h>
- #include <stdint.h>
- #include <inttypes.h>
- 
-+#if defined(__LINUX__)
-+#include <unistd.h>
-+#endif
-+
- #include "md-abi.hpp"
- 
- #include "mm/codememory.hpp"
-@@ -690,6 +695,19 @@
- 	opt_heapstartsize = HEAP_STARTSIZE;
- 	opt_stacksize     = STACK_SIZE;
- 
-+#if defined(__LINUX__)
-+	// Calculate 1/4 of the physical memory.
-+	size_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
-+
-+	if (qmem > INT32_MAX) {
-+		// Allocate no more than 2GB.
-+		opt_heapmaxsize = INT32_MAX;
-+	} else if (qmem > HEAP_MAXSIZE) {
-+		// Otherwise use this if greater than default (128MB).
-+		opt_heapmaxsize = qmem;
-+	}
-+#endif
-+
- 	// First of all, parse the -XX options.
- 	options_xx(vm_args);
- 
-@@ -896,18 +914,33 @@
- 		case OPT_SS:
- 			{
- 				char c;
--				int j;
-+				size_t j;
- 
-+				errno = 0;
- 				c = opt_arg[strlen(opt_arg) - 1];
-+				j = strtoul(opt_arg, NULL, 10);
-+
-+				if (errno)
-+					break; // Invalid.
- 
- 				if ((c == 'k') || (c == 'K')) {
--					j = atoi(opt_arg) * 1024;
-+					if (j > SIZE_MAX / 1024)
-+						break; // Overflow.
-+					else
-+						j *= 1024;
- 
- 				} else if ((c == 'm') || (c == 'M')) {
--					j = atoi(opt_arg) * 1024 * 1024;
--
--				} else
--					j = atoi(opt_arg);
-+					if (j > SIZE_MAX / 1024 / 1024)
-+						break; // Overflow.
-+					else
-+						j *= 1024 * 1024;
-+
-+				} else if ((c == 'g') || (c == 'G')) {
-+					if (j > SIZE_MAX / 1024 / 1024 / 1024)
-+						break; // Overflow.
-+					else
-+						j *= 1024 * 1024 * 1024;
-+				}
- 
- 				if (opt == OPT_MX)
- 					opt_heapmaxsize = j;
-@@ -1498,9 +1531,9 @@
- void VM::print_run_time_config()
- {
- 	puts("Run-time variables:\n");
--	printf("  maximum heap size              : %d\n", opt_heapmaxsize);
--	printf("  initial heap size              : %d\n", opt_heapstartsize);
--	printf("  stack size                     : %d\n", opt_stacksize);
-+	printf("  maximum heap size              : %lu\n", opt_heapmaxsize);
-+	printf("  initial heap size              : %lu\n", opt_heapstartsize);
-+	printf("  stack size                     : %lu\n", opt_stacksize);
- 
- #if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
- 	printf("  gnu.classpath.boot.library.path: %s\n", _properties.get("gnu.classpath.boot.library.path"));
diff --git a/dev-java/icedtea/icedtea-7.2.6.5-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.6.ebuild
similarity index 93%
rename from dev-java/icedtea/icedtea-7.2.6.5-r1.ebuild
rename to dev-java/icedtea/icedtea-7.2.6.6.ebuild
index f1c743e23909..02601f116d7d 100644
--- a/dev-java/icedtea/icedtea-7.2.6.5-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.6.ebuild
@@ -3,10 +3,6 @@
 # $Id$
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
 EAPI="5"
 SLOT="7"
 
@@ -16,13 +12,13 @@ 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="389551542e13.tar.bz2"
-JAXP_TARBALL="8a56658cb829.tar.bz2"
-JAXWS_TARBALL="9c049d7f5adc.tar.bz2"
-JDK_TARBALL="e727fe32654c.tar.bz2"
-LANGTOOLS_TARBALL="f6593c32cc46.tar.bz2"
-OPENJDK_TARBALL="8e728c41fec5.tar.bz2"
-HOTSPOT_TARBALL="04d7046d2d41.tar.bz2"
+CORBA_TARBALL="ca3e3c4c5a61.tar.bz2"
+JAXP_TARBALL="683427778edf.tar.bz2"
+JAXWS_TARBALL="63f7bf7ed2d4.tar.bz2"
+JDK_TARBALL="55c38c1ace75.tar.bz2"
+LANGTOOLS_TARBALL="e42dd50480d3.tar.bz2"
+OPENJDK_TARBALL="882cfee70fe8.tar.bz2"
+HOTSPOT_TARBALL="3022a3d80efd.tar.bz2"
 
 CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
 JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -230,8 +226,9 @@ src_configure() {
 	fi
 
 	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+	# In-tree JIT ports are available for amd64, arm64, ppc64 (be&le), SPARC and x86.
+	# arm is broken as of 7.2.6.6.
+	if { use amd64 || use arm64 || use ppc64 || use sparc || use x86; }; then
 		hotspot_port="yes"
 	fi
 
@@ -261,10 +258,6 @@ src_configure() {
 			ewarn 'If so, please rebuild with USE="-cacao"'
 		fi
 		cacao_config="--enable-cacao"
-
-		# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2612
-		export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch"
-		ln -snf "${FILESDIR}"/${SLOT}-cacao-pr-157.patch . || die
 	fi
 
 	# Turn on Zero if needed (non-HS/CACAO archs) or requested
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index 9f46d54eea50..30162c1a7984 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -1,2 +1 @@
 DIST java-cup-src-11b-20151001.tar.gz 313405 SHA256 959189360a8530c9e06cbf8cb99795bb4fcc25a00d774e961c98611c769b8f33 SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e WHIRLPOOL cba8a784f156b21ae2a40afe02112b5bded04176bd54b3190f1d210e5603334553f170b02f91f970ade3f68d8d00715f1237dd43476712f4e24c5d0857bf6304
-DIST javacup-0.11a_beta20060608.tar.bz2 285727 SHA256 cb3ad4951d734bd1e5a6ff835018dea26a47564f820ae0a925f9c30f2fb7e1ff SHA512 383172f7d9cb127ad5d1d6de561eaf53b057bf7511f6f8c353fc03860daabb023e11330e0518b9c390e255a643c9c1e609b5fbdfd3c2e92dd68dc2d2354a931f WHIRLPOOL 6480219de3a997eb9a942ce816f9868dc13d06b8c0553521e9cf37fe568265cf752efcd36d9b64ea424d225d4823fce0652c9b0d7e1c853e38cd9f00fb12ce30
diff --git a/dev-java/javacup/javacup-0.11a_beta20060608.ebuild b/dev-java/javacup/javacup-0.11a_beta20060608.ebuild
deleted file mode 100644
index 2830520c4ae6..000000000000
--- a/dev-java/javacup/javacup-0.11a_beta20060608.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="CUP Parser Generator for Java"
-
-HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
-
-# We cannot put the actual SRC_URI because it causes conflicts with Gentoo mirroring system
-# No better URI is available, waiting until it hits actual Gentoo mirrors
-
-#SRC_URI="https://www2.in.tum.de/WebSVN/dl.php?repname=CUP&path=/develop/&rev=0&isdir=1"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="userland_BSD"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4
-		>=dev-java/ant-core-1.7.0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	find . -name "*.class" -delete || die
-	java-ant_rewrite-classpath
-}
-
-src_compile() {
-	eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)"
-	rm bin/java-cup-11.jar
-	cp dist/java-cup-11a.jar bin/java-cup-11.jar
-	eant clean
-	einfo "Recompiling with newly generated javacup"
-	eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)"
-	use doc && javadoc -sourcepath src/ java_cup -d javadoc
-}
-
-src_install() {
-	java-pkg_newjar dist/java-cup-11a.jar
-	java-pkg_newjar dist/java-cup-11a-runtime.jar ${PN}-runtime.jar
-	java-pkg_register-ant-task
-
-	dodoc changelog.txt || die
-	dohtml manual.html || die
-	use source && java-pkg_dosrc java/*
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/javacup/javacup-0.11b_p20151001.ebuild b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
index 4d82769faa60..5b64a4546159 100644
--- a/dev-java/javacup/javacup-0.11b_p20151001.ebuild
+++ b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
 SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.7
 	>=dev-java/ant-core-1.7.0:0
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index b4c0417d84c3..42c18f344a0e 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,2 +1 @@
-DIST jflex-1.6.0.tar.gz 3035885 SHA256 0774da0ee2d01fc9274179de4243e0d229c01b5cf0fbb78952fb7fdc4672190c SHA512 16ce4a89f75ce5f3da02433ff66d39ed4db567b4cf7469997dd2617b82e52d589bb17ec3a2f36b4d00a62233e48820bc2e043dcc9ae3c01f1eeca323c0166eba WHIRLPOOL 4d9e7e8c3a0da66d860b895699d5b50e29f781f1cf18cab436f545b1fb007297ca9433694ce3808452c5d9340eddc978c2b32019b5a8d5d8c6cb0558543ea18e
 DIST jflex-1.6.1.tar.gz 3027791 SHA256 9879fb4ea7b286af3c3439cf148f5739dfa722edbd978f2f798268b2e016f8c0 SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b WHIRLPOOL 27e2769b1b1dc720cee71718eca024905fd9e200c53771c2db293471b0190d9a3c9d2245fbbc5ab76a1f22e1496053d35d625a34c09819b1e367f78840152666
diff --git a/dev-java/jflex/jflex-1.6.0-r2.ebuild b/dev-java/jflex/jflex-1.6.0-r2.ebuild
deleted file mode 100644
index 7975464e7b44..000000000000
--- a/dev-java/jflex/jflex-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JFlex is a lexical analyzer generator for Java"
-HOMEPAGE="http://www.jflex.de/"
-SRC_URI="http://${PN}.de/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-
-CDEPEND="dev-java/ant-core:0
-	=dev-java/javacup-0.11a_beta20060608:0
-	dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.6
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-IUSE="${JAVA_PKG_IUSE} source vim-syntax"
-
-java_prepare() {
-	# use a more convenient version number
-	sed -i s:"\(name=\"version\" value=\"\)[^\"]*\"":"\1${PV}\"":g build.xml
-	# fix bootstrapping
-	sed -i s:"\(name=\"bootstrap.version\" value=\"\)[^\"]*\"":"\1${PV}\"":g \
-		build.xml
-	# add javadoc capability to build.xml
-	sed -i s,"\(</project>\)",\
-"\n  <target depends=\"compile\" name=\"javadoc\">\n    <javadoc \
-packagenames=\"jflex\" sourcepath=\"src/main/java:build/generated-\
-sources\" destdir=\"javadoc\" version=\"true\" />\n  </target>\n\1",g \
-		build.xml
-}
-
-# TODO: Try to avoid using bundled jar (See bug #498874)
-#
-
-EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
-
-# Currently, this package uses an included JFlex.jar file to bootstrap.
-# Upstream was contacted and this bootstrap is really needed. The only way to
-# avoid it would be to use a supplied pre-compiled .scanner file.
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	ant-core
-	javacup
-"
-WANT_ANT_TASKS="javacup"
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	# Compile another time, using our generated jar; for sanity.
-	cp build/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA}
-	java-pkg-2_src_compile
-}
-
-# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet.
-RESTRICT="test"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-	java-pkg_dolauncher "${PN}" --main "${PN}.Main"
-	java-pkg_register-ant-task
-
-	if use doc ; then
-		dodoc doc/manual.pdf changelog.md
-		dohtml -r doc/*
-		java-pkg_dojavadoc javadoc
-	fi
-
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/main
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}/lib/${PN}.vim"
-	fi
-}
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index 6b50fe0fda77..9b3cda61b7ef 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jflex.de/"
 SRC_URI="http://${PN}.de/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples test vim-syntax"
 
 CDEPEND="dev-java/ant-core:0"
diff --git a/dev-java/jump/files/0.5-test.patch b/dev-java/jump/files/0.5-test.patch
deleted file mode 100644
index 796d0d022dd0..000000000000
--- a/dev-java/jump/files/0.5-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur jump-0.5.vanilla/src/tests/org/znerd/math/tests/NumberCentralTests.java jump-0.5/src/tests/org/znerd/math/tests/NumberCentralTests.java
---- jump-0.5.vanilla/src/tests/org/znerd/math/tests/NumberCentralTests.java	2007-10-10 00:27:47.000000000 +0200
-+++ jump-0.5/src/tests/org/znerd/math/tests/NumberCentralTests.java	2007-10-10 00:28:38.000000000 +0200
-@@ -220,8 +220,8 @@
-       assertEquals(ONE_HALF,         NumberCentral.valueOf( 0.5));
-       assertEquals(ONE,              NumberCentral.valueOf( 1.0));
-       assertEquals(TWO,              NumberCentral.valueOf( 2.0));
--      assertEquals(Double.MIN_VALUE, NumberCentral.valueOf(Double.MIN_VALUE).doubleValue(), 0.0);
--      assertEquals(Double.MIN_VALUE, NumberCentral.valueOf(Double.MAX_VALUE).doubleValue(), 0.0);
-+      assertEquals(Double.MIN_VALUE, NumberCentral.valueOf(Double.MIN_VALUE).doubleValue(), Double.MIN_VALUE);
-+      assertEquals(Double.MAX_VALUE, NumberCentral.valueOf(Double.MAX_VALUE).doubleValue(), Double.MIN_VALUE);
-    }
- 
-    /**
diff --git a/dev-java/jump/jump-0.5-r1.ebuild b/dev-java/jump/jump-0.5-r1.ebuild
index ab05dc1c395a..9e222f78ffed 100644
--- a/dev-java/jump/jump-0.5-r1.ebuild
+++ b/dev-java/jump/jump-0.5-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Java-based extensible high-precision math library"
 HOMEPAGE="http://jump-math.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}-math/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-java/jump/jump-0.5.ebuild b/dev-java/jump/jump-0.5.ebuild
deleted file mode 100644
index b189eb063628..000000000000
--- a/dev-java/jump/jump-0.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source test"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JUMP Ultimate Math Package (JUMP) is a Java-based extensible high-precision math package"
-SRC_URI="mirror://sourceforge/${PN}-math/${P}.tar.gz"
-HOMEPAGE="http://jump-math.sourceforge.net/"
-KEYWORDS="amd64 x86"
-LICENSE="BSD"
-SLOT="0"
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jre-1.4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/0.5-test.patch"
-
-	sed -i 's:${java.home}/src::' -i build.xml || die
-	java-ant_rewrite-classpath
-}
-
-EANT_BUILD_TARGET="jar"
-EANT_DOC_TARGET="apidocs"
-
-src_test() {
-	local cp="$(java-pkg_getjars junit)"
-	ANT_TASKS="ant-junit" eant do-tests -Dgentoo.classpath="${cp}"
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-
-	use doc && java-pkg_dojavadoc  build/apidocs
-	use examples && java-pkg_doexamples src/examples
-	use source && java-pkg_dosrc src/main/org
-}
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 763c940c4ad5..eaaa6791782c 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,3 +1,2 @@
-DIST qdox-1.12-20100531.205010-5-project.tar.gz 519732 SHA256 7ec2a48498f996e35c6bfdbff1dbbb061e51ff16862c4f3c3f12235d30857cca SHA512 b549704c941ac6333f4d96a880c4c05af6793043ad5f3d8adf6352c285507f7748905c57c91261c4171b1e6c3b11bb8e2ecad68a413a5297eebd92ac2d671809 WHIRLPOOL bd560572d5d41f39918237519e7d201bfde30e27e6d4d5d55f543681d833380553df8b062ca3392f9b9b3d185e48ac689dd7492796e9211ef9b21797129d3017
 DIST qdox-1.12.1.tar.gz 519833 SHA256 6c716c013b27d79eff31de59ab69b734d6744c32548549aaf3e6875915172565 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5 WHIRLPOOL 3e828d430637b18a8c91d273bb26b5ccf26f0f2556639b0af9ed3527eb28bb29de4d2dc8caaf07a0bbadef4001564db67eba63f0440d30e3b83da8f5e209bb41
 DIST qdox-1.6.3-sources.jar 63731 SHA256 7ddb3a75c1ab415c631ae39660679630653bbbed84895e5ed4b4775ce5327846 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965 WHIRLPOOL a57aecd3ccf7537af450dc54da65eb9b49b87b461b5929e36c49f5f40a5344fd84625afda47f6ea2860d65a200b34b7abc751ba377ad4404de4f9ca8a55bc36d
diff --git a/dev-java/qdox/qdox-1.12-r1.ebuild b/dev-java/qdox/qdox-1.12-r1.ebuild
deleted file mode 100644
index aa685c7c4e70..000000000000
--- a/dev-java/qdox/qdox-1.12-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Parser for extracting class/interface/method definitions"
-HOMEPAGE="https://github.com/codehaus/qdox"
-SRC_URI="http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz  "
-
-LICENSE="Apache-2.0"
-SLOT="1.12"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${PN}-${PV}-SNAPSHOT"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip:0
-	dev-java/byaccj:0
-	>=dev-java/jflex-1.4.3:0
-	dev-java/jmock:1.0
-	test? ( dev-java/junit:0 )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-java_prepare() {
-	if ! use test ; then
-		rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java
-		rm -rf src/java/com/thoughtworks/qdox/junit
-		rm -rf src/test
-	fi
-}
-
-src_compile() {
-	jflex src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die
-	byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl src/grammar/parser.y || die
-	mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die
-
-	# create jar
-	mkdir -p build/classes || die
-
-	local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)"
-
-	if use test ; then
-		cp="${cp}:$(java-pkg_getjars --build-only junit)"
-	fi
-
-	ejavac -sourcepath . -d build/classes -classpath "${cp}" \
-		$(find . -name "*.java") || die "Cannot compile sources"
-
-	mkdir dist || die
-	cd build/classes || die
-	jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR"
-
-	# generate javadoc
-	if use doc ; then
-		cd "${S}"
-		mkdir javadoc || die
-		javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}"
-	fi
-}
-
-src_test() {
-	java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \
-		com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_register-ant-task
-
-	use source && java-pkg_dosrc src/java/com
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild b/dev-java/qdox/qdox-1.12.1-r1.ebuild
index 542db4d57880..6ffaf3f9b065 100644
--- a/dev-java/qdox/qdox-1.12.1-r1.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.12"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 
diff --git a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild b/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
index 3cf57ca43193..4cd1c071b393 100644
--- a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
+++ b/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit scons-utils eutils
 
-DESCRIPTION="Binary-decimal and decimal-binary routines forIEEE doubles"
+DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
 HOMEPAGE="https://github.com/google/double-conversion"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
diff --git a/dev-libs/protobuf-c/protobuf-c-1.0.2-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.0.2-r1.ebuild
index d1d76a7f8ccf..0a8174d119ed 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.0.2-r1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ inherit autotools-multilib
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
 
-DESCRIPTION="code generator and runtime libraries to use Protocol Buffers (protobuf) from pure C"
+DESCRIPTION="Protocol Buffers implementation in C"
 HOMEPAGE="https://github.com/protobuf-c/protobuf-c/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 
diff --git a/dev-libs/protobuf-c/protobuf-c-1.1.1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.1.1.ebuild
index ac9abe7137e7..6a86a8ee50a3 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.1.1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ inherit autotools-multilib
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
 
-DESCRIPTION="code generator and runtime libraries to use Protocol Buffers (protobuf) from pure C"
+DESCRIPTION="Protocol Buffers implementation in C"
 HOMEPAGE="https://github.com/protobuf-c/protobuf-c/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 
diff --git a/dev-libs/protobuf-c/protobuf-c-1.2.1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.2.1-r1.ebuild
similarity index 82%
rename from dev-libs/protobuf-c/protobuf-c-1.2.1.ebuild
rename to dev-libs/protobuf-c/protobuf-c-1.2.1-r1.ebuild
index 92b6f732d159..f4585bcacdff 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.2.1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.2.1-r1.ebuild
@@ -9,16 +9,17 @@ inherit autotools multilib-minimal
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
 
-DESCRIPTION="code generator and runtime libraries to use Protocol Buffers (protobuf) from pure C"
+DESCRIPTION="Protocol Buffers implementation in C"
 HOMEPAGE="https://github.com/protobuf-c/protobuf-c/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
-SLOT="0"
+# Subslot == SONAME version
+SLOT="0/1.0.0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs test"
 
-RDEPEND=">=dev-libs/protobuf-2.6.0[${MULTILIB_USEDEP}]"
+RDEPEND=">=dev-libs/protobuf-2.6.0:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? ( ${AUTOTOOLS_DEPEND} )
 	virtual/pkgconfig[${MULTILIB_USEDEP}]"
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index b294007f4ffc..41c01ffc9a10 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,3 @@
 DIST botocore-1.3.22.tar.gz 2349601 SHA256 02a6d320b09179bc5dcbafd4be732d9431bfebf5bed6d6b6508eca96b599a399 SHA512 7b349a78c83051a29993ce00a11ecfa4734425c3ed27ce3e405140e19017b5c670d857ea489ea1f6f3ec767b3e4704547565b2ec67f5d7001a0cc30ff2a39de7 WHIRLPOOL 98c5e7488c6d1fe5c3e3484c770f8b346508359c5d174e5660f10ea62b054f442e3d15cc716ddd5acc42f1af0a10463c1923de138338175f1dcba9ced283c8ee
 DIST botocore-1.4.10.tar.gz 2453883 SHA256 f0b740d07cf7b7a4ec08cafdf9db8cfd813d2d69bde1e7de0cffc50bf075aa4b SHA512 51009ad6abc1f413e9dbeea52207c96df7d1647a6da8f0139e7557e36a3ad0fa440d32f430f5d7f690f0ec70b9c114ac1544c6fcddc8080acf5f2fa14bc5d1db WHIRLPOOL c9bc19adae6f7c4eceb33e448e717f41639fbc9126a07c6f511ccf958ace98fcbea54f0dddd2e928b4435fc3abfdd8b4da745b05227fd7397de89448e411e32b
-DIST botocore-1.4.8.tar.gz 2445498 SHA256 47bcd9bdcde8661f79a031da68f21bd86cc5ecf07cec5cd1de0af114911d1806 SHA512 80d87b70eb2d70ace91e95746cb9e15f4435e12d141769764a7f82fbb03a1ce2c85266cee93499ee26f343bfcc700dfde7e6e5ec3af9b8ab0a99a8cb9997d61c WHIRLPOOL 7b39ad4e451fcd4ed2b58da709474983be9305c4e4b15ca42ea1c46aa5f4874edc7472cb5b6935dec6d356b3e693658168940f82645ff95396264eec72e904ac
+DIST botocore-1.4.11.tar.gz 2455881 SHA256 96295db1444e9a458a3018205187ec424213e0a69c937062347f88b7b7e078fb SHA512 b012c84095f86a0070846290daaca017a9af57c25c78d54e351e6cf8331a3650236c3fe92791e0f345ef91067084a00f9cea183cd4e208e6065a7e001ac793f4 WHIRLPOOL aec9b6a5e7038dac6216940351d5746f98d809ecd2dad6d2e988091bf1df805c62f92aabf39684666a5c3ffd9b1e62ead6a454790cfd1c4b0c8a4a19d1fdc4c2
diff --git a/dev-python/botocore/botocore-1.4.8.ebuild b/dev-python/botocore/botocore-1.4.11.ebuild
similarity index 100%
rename from dev-python/botocore/botocore-1.4.8.ebuild
rename to dev-python/botocore/botocore-1.4.11.ebuild
diff --git a/dev-python/pyqwt/metadata.xml b/dev-python/pyqwt/metadata.xml
index 73bd90d083a7..7f74fabb62c0 100644
--- a/dev-python/pyqwt/metadata.xml
+++ b/dev-python/pyqwt/metadata.xml
@@ -6,12 +6,12 @@
 		<name>Python</name>
 	</maintainer>
 	<longdescription lang="en">
-  PyQwt is a set of Python bindings for the Qwt  C++ class library which
-  extends the Qt framework with widgets for scientific and engineering
-  applications. It provides a widget to plot 2-dimensional data and
-  various widgets to display and control bounded or unbounded floating
-  point values.
-</longdescription>
+		PyQwt is a set of Python bindings for the Qwt C++ class library which
+		extends the Qt framework with widgets for scientific and engineering
+		applications. It provides a widget to plot 2-dimensional data and
+		various widgets to display and control bounded or unbounded floating
+		point values.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">pyqwt</remote-id>
 	</upstream>
diff --git a/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild b/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
index 57ee1d0f91af..fc2b162d34ac 100644
--- a/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
+++ b/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		local myonf=()
+		local myconf=()
 		use debug && myconf+=( --debug )
 
 		cd "${BUILD_DIR}" || die
diff --git a/dev-python/pysrt/Manifest b/dev-python/pysrt/Manifest
index 99bff7ed5984..e993f6c6c522 100644
--- a/dev-python/pysrt/Manifest
+++ b/dev-python/pysrt/Manifest
@@ -1,2 +1,3 @@
 DIST pysrt-1.0.1.tar.gz 11741 SHA256 5300a1584c8d15a1c49ef8880fa1ef7a4274ce3f24dde83ad581d12d875f6784 SHA512 cd03d40ebef953d7ea67073a114f10a87eb142670ece727d09a31b498835d8485ac0c125f4281b6ababdd6f0757f9549ce38cb05eda79b23ff17950ab891d0eb WHIRLPOOL f7629430ac7ee9b2a69d5618346e2f97f01a68683e8b9ef8c13519a87a7043852c142ba050b338ddccc992c4ada01bbae41b9d2bab2696cdb0fdc50761d7dd81
 DIST pysrt-1.1.0.tar.gz 12171 SHA256 7f5468b15b05341e7b6086b611a326588da8dd7f649b1482cbb63cce7ff88af6 SHA512 31d085ca255cc9a09fe0df8611067ad39db36789b9cce89638382b2bcd5c4cad93a4cf1b19d852eb5a954fff89e602ab6359d4846ba9c6ca05d4b7a3b27ffa24 WHIRLPOOL 535f8f46b801efc1a4addda196a05135e6bda26360c51f7a62f902047017a3458970c4fd8cf6b51cdb0a20bede69e96d9d175bb97ba9dfbefd5ea9351249c409
+DIST pysrt-1.1.1.tar.gz 104027 SHA256 fb4c10424549fc5a32d19cd5091f00316b875461fcd79a7809bb55056974d0aa SHA512 607f80c1f66702d36b6fa54b293f59c6a28415d812bf54d7210075d1c84a7547ce2776c0809910ed3d79c08a3c595ce74719976d8f2818820a3f4a306ffc1825 WHIRLPOOL 9f3e4e76286ad5f2b90bd81eee3165e29295372b2f3c112875ea7c90fa57c04c8985a94b1106ba886a5ed81a6200a938a94c634ef0b5d92c85793b7e36d9fa6f
diff --git a/dev-python/pysrt/metadata.xml b/dev-python/pysrt/metadata.xml
index 9950bf88affa..9cc7c5e27320 100644
--- a/dev-python/pysrt/metadata.xml
+++ b/dev-python/pysrt/metadata.xml
@@ -13,5 +13,6 @@
 	<upstream>
 		<remote-id type="pypi">pysrt</remote-id>
 		<remote-id type="github">byroot/pysrt</remote-id>
+		<bugs-to>https://github.com/byroot/pysrt/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pysrt/pysrt-1.1.1.ebuild b/dev-python/pysrt/pysrt-1.1.1.ebuild
new file mode 100644
index 000000000000..26bc3bb49abb
--- /dev/null
+++ b/dev-python/pysrt/pysrt-1.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library used to edit or create SubRip files"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt"
+SRC_URI="https://pypi.python.org/packages/f6/33/16ad65a8973cb8bcb494af09ee1b9ab5ffdd6ff300bce5d3ac7d3cb1f2cc/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[coverage(+),${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	nosetests --with-coverage --cover-package=pysrt \
+		|| die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/sip/sip-4.16.9.ebuild b/dev-python/sip/sip-4.16.9.ebuild
index cac8054b77c1..f7b320ab300c 100644
--- a/dev-python/sip/sip-4.16.9.ebuild
+++ b/dev-python/sip/sip-4.16.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/11"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/stormpath/Manifest b/dev-python/stormpath/Manifest
index 2bca960662a6..4411481cdb76 100644
--- a/dev-python/stormpath/Manifest
+++ b/dev-python/stormpath/Manifest
@@ -1,3 +1,3 @@
-DIST stormpath-2.1.4.tar.gz 4338169 SHA256 adbc595b243861be0268c2c71061de8ce6dc8f9a92d7398f92bf77a734315b2f SHA512 6834f1b8db731872208c96b9acb2ff66e5d7fcbb6ae0c1f1de541ce1597a786834f2b68c43d00c5adcb1018749c53b45444dde2a81a520fed79fd9b6f0f07ab0 WHIRLPOOL 6f50a1f6476d4486f43da55ae48c56942ef90820db4434c3b567222cb65d56aaa5649249dfc10add807f5ccba245d99b89efa031201af61bc888b902cf66b4ea
 DIST stormpath-2.1.5.tar.gz 4339093 SHA256 cea6810c5caa666c3a73ea0bbf14826687318aea2a82c51d93886679b786b94b SHA512 d373d36bd6dc647fcedad99722c6ff53447b4b11090ffbbf2e72a206d27e66804d7e756d0588b80b11110700297beebb894b4d5301df97a836a4204622ea83af WHIRLPOOL 14a580f934afc74f7f15b4ac897474bb00ab199470d94c671b3f39c625d460aa601329a18cf23b206f12ab2b0f9f25d5903c14f507f614e38953da47bdfc7a92
 DIST stormpath-2.1.6.tar.gz 4339678 SHA256 47649cf8edaf5ef48346f74558e62e0aaf28fb49bd7e3db99db9338739913d77 SHA512 2cc6ecd674ca6b5fcfbb6664f863cb4c6378748eb5ca2ceb5e0db3ac46c567a4b62a1bb595044b15c0294b5abe471c9ac675b93db49e5d2e146cd8954c8c7611 WHIRLPOOL c15085c2a1e5600ff93bc1e013439270c17472035a39fde52f31e21971b5508b4ff50a9a5f1472aa185282fefbfc9015a88eed0b5c641acf787abfaf9f72e06b
+DIST stormpath-2.3.1.tar.gz 4346382 SHA256 cf7e2e0784d62a1992b7708232a4af6a444a10523cb9f9e2893530d6b4cee8d0 SHA512 1e6308e45f41ff2094740063e8b2fc4dcb197bfa1fe617c89f95326410191670621defa7f8158b8dcc07b0e7a79a831c81cc9df22334c29d9f832691315076a9 WHIRLPOOL 91c17a5ed72679ba46c2311f6fec6f6fdd25209959bd8e58960289aef259ad7f8ff9335b668aeec471463b91fa8f6f6acf37a8f65870f3ab3c41d8af52a10c70
diff --git a/dev-python/stormpath/stormpath-2.1.4.ebuild b/dev-python/stormpath/stormpath-2.3.1.ebuild
similarity index 96%
rename from dev-python/stormpath/stormpath-2.1.4.ebuild
rename to dev-python/stormpath/stormpath-2.3.1.ebuild
index e6bdfe5b1541..8248d4ff13f6 100644
--- a/dev-python/stormpath/stormpath-2.1.4.ebuild
+++ b/dev-python/stormpath/stormpath-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.7.5.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.7.5.ebuild
index 9a69fa9bc3ef..db050929d7ee 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.7.5.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.7.5.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/untitaker/vdirsyncer"
+HOMEPAGE="https://github.com/pimutils/vdirsyncer"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.9.0.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.9.0.ebuild
index 9a69fa9bc3ef..3683e2687a4b 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.9.0.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.9.0.ebuild
@@ -4,12 +4,12 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python3_{3,4} )
 
 inherit distutils-r1
 
 DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/untitaker/vdirsyncer"
+HOMEPAGE="https://github.com/pimutils/vdirsyncer"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -25,7 +25,6 @@ RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]
 	!=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
 	=dev-python/lxml-3.4.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.5.0[${PYTHON_USEDEP}]
-	dev-python/atomicwrites[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]"
+	dev-python/atomicwrites[${PYTHON_USEDEP}]"
 
 DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.9.3.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.9.3.ebuild
index e93e3825e047..e7872606a231 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.9.3.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.9.3.ebuild
@@ -4,12 +4,12 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python3_{3,4} )
 
 inherit distutils-r1
 
 DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/untitaker/vdirsyncer"
+HOMEPAGE="https://github.com/pimutils/vdirsyncer"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -19,13 +19,12 @@ IUSE=""
 
 DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]
-	dev-python/click-log[${PYTHON_USEDEP}]
-	dev-python/click-threading[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.1.3[${PYTHON_USEDEP}]
+	>=dev-python/click-threading-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
 	!=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
 	=dev-python/lxml-3.4.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.5.0[${PYTHON_USEDEP}]
-	dev-python/atomicwrites[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]"
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]"
 
 DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index b4a4584a0a3c..c9c35cd2e4c2 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,5 +1,4 @@
 DIST websocket-client-0.21.0.tar.gz 190523 SHA256 0e279c371df0bc1b3a890a31e90631e03c11ea596e00fd53524f03a5fb972d3d SHA512 cd6ae58226890dd94e03d3d348a5ec83c1b7a5a0e8b353cf28db9b5a78131ecbc84755ba9925fe9c90a90388f03d6e9a535960a13c53536f6b4fe4effbbc736c WHIRLPOOL 4732ad6e839e14f68a0a2070171f724a912f00d2d76003cb23a6253560a2aab51a34525e0cf98ebd7e045e326052b8aa4c7497d384e807f493f99a125e323dd0
-DIST websocket-client-0.31.0.tar.gz 192146 SHA256 ddbba49fe9f185dec6a80a536831fa781e10e1d946eef20ebcccd75b943c6ea6 SHA512 899fb3534f76f044b5f550282a05df7d58423b1108cc3134a7b1701c03c673c5e036435218a2931330e800b3060e287f7ad87133e54b0735db1c1581e219f222 WHIRLPOOL d440db59c5f5290e81f614eb1d68d66843b3f06b7c4d7de45c61675143d26f8b507d89c8bd76923dac09f5a117c98ed8239a4acf9ee84a9e0955850c0afe5390
-DIST websocket-client-0.32.0.tar.gz 192180 SHA256 cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040 SHA512 648b5ea6bbf5b402004d0dcaa3d5242580efb7803a6cbadc20448fcdedb0097508d747c6ba67d4df9e289f3917ad6e09698b0fbf1330e073e14d369cfdb98bd3 WHIRLPOOL b24791a7c3eb2994f60c5743eb858dd0b02a0c3ea36a70b1c4a0434276a19a4a73893fcf1aac6cc05ea489469cdc6a9d4d4cd1be4e906817046b711e5c3d083e
 DIST websocket-client-0.34.0.tar.gz 193141 SHA256 682a6241ca953499f06ca506f69aa3ea26f0ed2a41fe7982732cb8449ae92ddf SHA512 db0d87d842884a326ceee1fb089012bb49476077977e3a3a7972f52acc9770431f14d6dcab8b15942230c65c9020336785bed3bf360b0ddc3dc40348fafb18d6 WHIRLPOOL e2851eab4c53c73f229692a9981229a20b9f4e66969cd6edcbed3bd557dde0b70365e543222308ee6f226e991404de23a3be7cc0d668dd18c0ebc75d8cebc6fc
 DIST websocket-client-0.35.0.tar.gz 193509 SHA256 5ac3ead091be17b680a0dda926aef1a697a2b6cf1e9ac0fbe4bffb14914c2116 SHA512 d2bfb27f1908882621db21badc9f665ed7b0c0164f47c29014fc87ae7aa52b81160c11b26dd8abd97ced5a3429a917034b1a94dfd8ecfa91637dec9d2857475a WHIRLPOOL 2d55f1dc51d94cab0724f2c48b2aed1862e00c60c5f54b369d41725bbc6ecfe45aee98f7a16338ff76950b11fc19ef477d0c1d5a98dbd0bba468720ce0e5849f
+DIST websocket-client-0.37.0.tar.gz 194246 SHA256 678b246d816b94018af5297e72915160e2feb042e0cde1a9397f502ac3a52f41 SHA512 b72f18c91d9a51a1943fc798601bcd9eac8b1ce807a2abb72b7cf897da30de808160645d9c7f3eaf2430e739cd0c6c01046c452f43c61af63afe7d31d801f9f7 WHIRLPOOL 71b370849f92ef2bb022a05de308cfba1273bd34a564363ce5167f1f21c422879dcaa1f896efaf2c9b17d33867311cb2bf7ac619acf7142a8c8eaedf443f84fe
diff --git a/dev-python/websocket-client/websocket-client-0.32.0.ebuild b/dev-python/websocket-client/websocket-client-0.32.0.ebuild
deleted file mode 100644
index de7e12040324..000000000000
--- a/dev-python/websocket-client/websocket-client-0.32.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN//-/_}
-
-DESCRIPTION="WebSocket client for python. hybi13 is supported"
-HOMEPAGE="https://github.com/liris/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2*' )
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-0.31.0.ebuild b/dev-python/websocket-client/websocket-client-0.37.0.ebuild
similarity index 80%
rename from dev-python/websocket-client/websocket-client-0.31.0.ebuild
rename to dev-python/websocket-client/websocket-client-0.37.0.ebuild
index de7e12040324..0078df108716 100644
--- a/dev-python/websocket-client/websocket-client-0.31.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.37.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
 
 inherit distutils-r1 vcs-snapshot
 
 MY_PN=${PN//-/_}
 
-DESCRIPTION="WebSocket client for python. hybi13 is supported"
+DESCRIPTION="WebSocket client for python with hybi13 support"
 HOMEPAGE="https://github.com/liris/websocket-client"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 7c39964e86af..8a22ee1d3f79 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,4 +1,4 @@
 DIST wrapt-1.10.5.tar.gz 119157 SHA256 4fd82193b23f60e1a39f3e10c81143c1e29e26cd5fc9afe1a7dc0f5e4b4a67d7 SHA512 450b32eea67774081d23c0e020ed7eea3c8ac458925a16cd606a4f95ee5b7631bda5ff00ceb914e9ccc28a5e0a7302534b6711bb23d637c77327a8a9d228cb55 WHIRLPOOL 7cfa9477f525e60f16a7b1689ba43b327192837bea34e96977442b9cd143a63fafdfa7d0b3895c93052b0e6f426e76fa439b155ee4e481dd5e922c529676691c
 DIST wrapt-1.10.6-r1.tar.gz 120259 SHA256 b540e23753d3f7017ec0d38f16daf77f9e9cf170d5040abc3d87573ba20fc4f3 SHA512 658c780971dddf444070b9d30a8ac7c08ee0088b8f4378bcc9c22126608e52b338dc00969b08828b0318070abcf0e875bc2b7c6228a71fbbca362033088b4314 WHIRLPOOL 7aed77677a1448d6b3795be7fb56989be98a691a7470096adf45002ca124a99b5cab3e42b319493b4c8300684e488a07cf96d1c5a01e9fc9f181f765a0542254
-DIST wrapt-1.10.6.tar.gz 25134 SHA256 9576869bb74a43cbb36ee39dc3584e6830b8e5c788e83edf0a397eba807734ab SHA512 d0c326fd401bc84656d69ec5da446b459f5596873a1ec01d616bebcc3d11237949eaafcfdf5de78e43f59927a0eaeee3da3f462975fa46fa22fd6c1593509e04 WHIRLPOOL 2d3c56d0a6e9e9af0a59708ce70190097da2459d80bdaa8d8f884a849905b44cdfb6bedb412ccd1e74be1e975492309a398e05d4b6c61a6852d3cd125230846a
 DIST wrapt-1.10.7.tar.gz 120316 SHA256 50ad31f01761410b192ce054aebcb61c54dbd493446440214356635874ecafca SHA512 ca694963860e22d6fe05fdd679f25c7d2fb01a3a635f9744dd2034c7468563f299442a3a60f4385e049b15f04bc86c7c0a6d0501bf274a87cdcd786fd46efeee WHIRLPOOL 659226504f1711749dae0228a9de07bebd04d2c4dd4b8696095eb7e76c6e1a7e991ea5a08188d93abe14c8a7e9b69b0d4ea04945fcf8349dd1f397870e39cab1
+DIST wrapt-1.10.8.tar.gz 120359 SHA256 096b47f44e3197934ccc335c53d2d21bf6ed9fd941b294726e26a1fd18fd4541 SHA512 2a37584b3c3a33a2d39d5cbe9f7e61a50131db55ffd5be7902b5ee84c347d8ff4d6094e5639d2f854fab274b2517a0e47420da9f543f11cf92973acd6d15d42e WHIRLPOOL 5f27b048b9f06c03c3e3acdd9c3a64308958585deb7e314c80158910cfc1eac154540a0e4a3c838718456d5ed38751d85f49645e634a7d2734cad916547a5bc7
diff --git a/dev-python/wrapt/wrapt-1.10.6.ebuild b/dev-python/wrapt/wrapt-1.10.8.ebuild
similarity index 73%
rename from dev-python/wrapt/wrapt-1.10.6.ebuild
rename to dev-python/wrapt/wrapt-1.10.8.ebuild
index f1e92f50aab4..22a84a37fd84 100644
--- a/dev-python/wrapt/wrapt-1.10.6.ebuild
+++ b/dev-python/wrapt/wrapt-1.10.8.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 pypy )
 
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Module for decorators, wrappers and monkey patching"
 HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc test"
 
 DEPEND="
@@ -26,9 +26,6 @@ DEPEND="
 "
 RDEPEND=""
 
-# https://github.com/GrahamDumpleton/wrapt/issues/58
-RESTRICT=test
-
 python_compile_all() {
 	use doc && emake -C docs html
 }
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.5.1-r1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.5.1-r1.ebuild
index 34e81f683189..2bdf6b098135 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.5.1-r1.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	~dev-qt/qtnetwork-${PV}
-	virtual/pkgconfig
 "
 
 src_prepare() {
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.6.0.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.6.0.ebuild
index 896218da7c73..f329a8ce9f85 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.6.0.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.6.0.ebuild
@@ -23,7 +23,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	~dev-qt/qtnetwork-${PV}
-	virtual/pkgconfig
 "
 
 src_prepare() {
diff --git a/dev-qt/qtcore/qtcore-5.6.0.ebuild b/dev-qt/qtcore/qtcore-5.6.0.ebuild
index 8e344ed25686..4f64f5bb2b29 100644
--- a/dev-qt/qtcore/qtcore-5.6.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.6.0.ebuild
@@ -16,7 +16,7 @@ IUSE="icu systemd"
 
 DEPEND="
 	dev-libs/glib:2
-	>=dev-libs/libpcre-8.35[pcre16]
+	>=dev-libs/libpcre-8.38[pcre16,unicode]
 	>=sys-libs/zlib-1.2.5
 	virtual/libiconv
 	icu? ( dev-libs/icu:= )
diff --git a/dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild b/dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild
index 7855af56079a..96c0e10b0dbc 100644
--- a/dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 QT5_MODULE="qttools"
 inherit qt5-build
 
-DESCRIPTION="Tool to query Qt path information"
+DESCRIPTION="Command line client to QStandardPaths"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="amd64 arm ~hppa ~ppc64 ~x86"
diff --git a/dev-qt/qtpaths/qtpaths-5.6.0.ebuild b/dev-qt/qtpaths/qtpaths-5.6.0.ebuild
index f697b055b73c..b5d7aec16eb3 100644
--- a/dev-qt/qtpaths/qtpaths-5.6.0.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.6.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 QT5_MODULE="qttools"
 inherit qt5-build
 
-DESCRIPTION="Tool to query Qt path information"
+DESCRIPTION="Command line client to QStandardPaths"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
new file mode 100644
index 000000000000..28138b912723
--- /dev/null
+++ b/dev-qt/qtplugininfo/Manifest
@@ -0,0 +1 @@
+DIST qttools-opensource-src-5.6.0.tar.xz 9817788 SHA256 0d244c61bbe5505cb94310e980b06ef13dd573511e80ccbdc060f71d5462219d SHA512 d1bee83715d336bc0257b114bbfc7f97cf11f7d5ad75b45376c9b4a55224fa74b82fdc4c6db60dd0917553eef76b0286dde1d3b46e0262ef17c9a3dbbc142400 WHIRLPOOL 96d7fadd39575bf30c23684311aa59c7c86d6e65f49992a71151dcc330840336ad0508a602783c475b55f7f4d5a60c38ffbf380cb91f0974e1a1b352d59e4c2a
diff --git a/dev-qt/qtplugininfo/metadata.xml b/dev-qt/qtplugininfo/metadata.xml
new file mode 100644
index 000000000000..08d85fc4c258
--- /dev/null
+++ b/dev-qt/qtplugininfo/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>http://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.6.0.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.6.0.ebuild
new file mode 100644
index 000000000000..edc1fd11927d
--- /dev/null
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt5 plugin metadata dumper"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtplugininfo
+)
diff --git a/dev-ruby/facter/facter-3.1.6.ebuild b/dev-ruby/facter/facter-3.1.6.ebuild
index c78fa06c1f2d..2475f6d465a5 100644
--- a/dev-ruby/facter/facter-3.1.6.ebuild
+++ b/dev-ruby/facter/facter-3.1.6.ebuild
@@ -58,10 +58,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
 src_install() {
 	cmake-utils_src_install
 	ruby-ng_src_install
diff --git a/dev-ruby/http_parser_rb/http_parser_rb-0.6.0-r1.ebuild b/dev-ruby/http_parser_rb/http_parser_rb-0.6.0-r1.ebuild
index 1679d511d47f..49faf241bfb6 100644
--- a/dev-ruby/http_parser_rb/http_parser_rb-0.6.0-r1.ebuild
+++ b/dev-ruby/http_parser_rb/http_parser_rb-0.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/tmm1/http_parser.rb"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 each_ruby_configure() {
diff --git a/dev-ruby/http_parser_rb/http_parser_rb-0.6.0.ebuild b/dev-ruby/http_parser_rb/http_parser_rb-0.6.0.ebuild
index 115a26d1ac95..703706dd74f8 100644
--- a/dev-ruby/http_parser_rb/http_parser_rb-0.6.0.ebuild
+++ b/dev-ruby/http_parser_rb/http_parser_rb-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 7b69fb8e047c..c74d8e7ba7b7 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,2 +1,3 @@
 DIST multi_json-1.11.2.tar.gz 24748 SHA256 656e92aa19d5e0fc08c1f30f30e328479631407d1dd893c058cac88dd0777313 SHA512 bb4b1835cd5d4355003dfc1085cbb71913766d6e8210dab93d8aed5e6612a29f60420efd550f566c63da5358e1ce2daf04049c1d635caf07244f117cff0f3794 WHIRLPOOL 8216b793687c0d1ec30eaaefce5320e6124468adb3bbd905455ecf0ae66e962d662f492f91854f00077e15d9ae9b15e43a58f10d79acc6469fc668462bcce59f
+DIST multi_json-1.11.3.tar.gz 24788 SHA256 3dc780a837b0ad85d0ffbfe876b04246ef7f544b22859262cce76a94a70ccdb3 SHA512 9afbcf30755b189c26e83f8a416115ab7c5b64875ca3508e5b4d4eff6636eba536896b2801e314187ce3ad44414934f6605fcbae4850d979d348952df0fd5e6e WHIRLPOOL ab843c487028ffa42b1b5786f93502b0f910ce8865f02e9ab205c090251a073b0635d1b97909e7589ee314a30b3e3852615027215cc4f407b1b8c2094390f552
 DIST multi_json-1.9.3.gem 30720 SHA256 631390d4b6c3d3753a3df0c28339c8e7840704083dfdcefb1323a22ab97b2281 SHA512 7f06747e760a63b6421dfda480522924f12bd00ad63f95414f6624173b9b9b255b139f9dc33d2d2a8d19b232f99a005033e00e3a0b223be992f73d142a55b8b5 WHIRLPOOL a96f1c1e53865e153bc83079fc70b69af6c941c4995f4215317ca53567532d1406adb174683fc8c5229fdc3563f5e8d3c2c662d77cf9d9d55367aab2df5b34f0
diff --git a/dev-ruby/multi_json/multi_json-1.11.3.ebuild b/dev-ruby/multi_json/multi_json-1.11.3.ebuild
new file mode 100644
index 000000000000..5b6038b57d7e
--- /dev/null
+++ b/dev-ruby/multi_json/multi_json-1.11.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A gem to provide swappable JSON backends"
+HOMEPAGE="https://github.com/intridea/multi_json"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-1.0 =dev-ruby/activesupport-3* )"
+
+ruby_add_bdepend "doc? ( dev-ruby/rspec:3 dev-ruby/yard )"
+
+ruby_add_bdepend "test? ( dev-ruby/json
+	dev-ruby/yajl-ruby )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler."
+
+	# Remove unimportant rspec options not supported by rspec 2.6.
+	rm .rspec || die
+
+	# Remove specs specific to oj since we don't package oj yet.
+	sed -i -e '/defaults to the best available gem/,/^  end/ s:^:#:' \
+		-e '/Oj does not create symbols on parse/,/^    end/ s:^:#:' \
+		-e '/with Oj.default_settings/,/^    end/ s:^:#:' \
+		-e '/using one-shot parser/,/^  end/ s:^:#:' \
+		spec/multi_json_spec.rb
+
+	# Avoid simplecov which only works with ruby 1.9
+	sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die
+
+	# Remove unpackaged and for our purposes unneeded coveralls
+	sed -i -e '/coveralls/d' spec/spec_helper.rb || die
+
+	# Avoid testing unpackaged adapters
+	rm spec/{gson,jr_jackson,oj}_adapter_spec.rb || die
+}
+
+each_ruby_test() {
+	for t in spec/*_spec.rb; do
+		${RUBY} -S rspec-3 ${t} || die
+	done
+}
diff --git a/dev-ruby/net-scp/net-scp-1.2.1.ebuild b/dev-ruby/net-scp/net-scp-1.2.1.ebuild
index 56acdb3a0f75..d760f18f7ecb 100644
--- a/dev-ruby/net-scp/net-scp-1.2.1.ebuild
+++ b/dev-ruby/net-scp/net-scp-1.2.1.ebuild
@@ -20,13 +20,17 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 IUSE=""
 
 ruby_add_bdepend "
-	doc? ( >=dev-ruby/net-ssh-2.6.5 )
+	doc? ( >=dev-ruby/net-ssh-2.6.5:2.6 )
 	test? (
-		>=dev-ruby/net-ssh-2.9.0
+		>=dev-ruby/net-ssh-2.9.0:2.6
 		dev-ruby/mocha
 	)"
 
-ruby_add_rdepend ">=dev-ruby/net-ssh-2.6.5"
+ruby_add_rdepend ">=dev-ruby/net-ssh-2.6.5:2.6"
+
+all_ruby_prepare() {
+	sed -i -e 's/>= 2.0.0/~> 2.0/' test/common.rb || die
+}
 
 each_ruby_test() {
 	${RUBY} -Ilib:test test/test_all.rb || die
diff --git a/dev-ruby/net-ssh/net-ssh-2.10.0.ebuild b/dev-ruby/net-ssh/net-ssh-2.10.0.ebuild
index dec8d5a18d52..887fed4470a4 100644
--- a/dev-ruby/net-ssh/net-ssh-2.10.0.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-2.10.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-2.2.3-r1.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-2.2.3-r1.ebuild
index ebeb8e26fd2e..ec6aa67d534b 100644
--- a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-2.2.3-r1.ebuild
+++ b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-2.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_NAME="gdk_pixbuf2"
 
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-2.2.3.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-2.2.3.ebuild
index 58bb22793eff..9a9802c8f3f0 100644
--- a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-2.2.3.ebuild
+++ b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-2.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_NAME="gdk_pixbuf2"
 
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-2.2.5.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-2.2.5.ebuild
index ebeb8e26fd2e..ec6aa67d534b 100644
--- a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-2.2.5.ebuild
+++ b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-2.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_NAME="gdk_pixbuf2"
 
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-2.2.3-r1.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-2.2.3-r1.ebuild
index 3f4221559b7b..b1acd5950db8 100644
--- a/dev-ruby/ruby-gtk3/ruby-gtk3-2.2.3-r1.ebuild
+++ b/dev-ruby/ruby-gtk3/ruby-gtk3-2.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-2.2.3.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-2.2.3.ebuild
index 306eb0339049..f97581348819 100644
--- a/dev-ruby/ruby-gtk3/ruby-gtk3-2.2.3.ebuild
+++ b/dev-ruby/ruby-gtk3/ruby-gtk3-2.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-2.2.5.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-2.2.5.ebuild
index 8c3452d8c72a..fed2b93b9c2e 100644
--- a/dev-ruby/ruby-gtk3/ruby-gtk3-2.2.5.ebuild
+++ b/dev-ruby/ruby-gtk3/ruby-gtk3-2.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 inherit virtualx ruby-ng-gnome2
 
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.1.7-r1.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.1.7-r1.ebuild
index e33ea5ff53b5..ef13ff51990a 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.1.7-r1.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.1.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.1.7.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.1.7.ebuild
index 9f1ff025b0c2..c039b351db9f 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.1.7.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild
index ffa3df40e0e3..3e84b0b51fd9 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.1.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.1.ebuild
index bf9bfefa0db9..fe0b9155917a 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.2.1.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/ruby-opengl/ruby-opengl-0.8.0.ebuild b/dev-ruby/ruby-opengl/ruby-opengl-0.8.0.ebuild
index 9787b2332caa..aef5ba63c8b1 100644
--- a/dev-ruby/ruby-opengl/ruby-opengl-0.8.0.ebuild
+++ b/dev-ruby/ruby-opengl/ruby-opengl-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/ruby-opengl/ruby-opengl-0.9.2.ebuild b/dev-ruby/ruby-opengl/ruby-opengl-0.9.2.ebuild
index c07573fb8324..79f79d97ee99 100644
--- a/dev-ruby/ruby-opengl/ruby-opengl-0.9.2.ebuild
+++ b/dev-ruby/ruby-opengl/ruby-opengl-0.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/ruby-vte3/ruby-vte3-2.2.3-r1.ebuild b/dev-ruby/ruby-vte3/ruby-vte3-2.2.3-r1.ebuild
index d913d29f6408..01a4cd815dc8 100644
--- a/dev-ruby/ruby-vte3/ruby-vte3-2.2.3-r1.ebuild
+++ b/dev-ruby/ruby-vte3/ruby-vte3-2.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/ruby-vte3/ruby-vte3-2.2.3.ebuild b/dev-ruby/ruby-vte3/ruby-vte3-2.2.3.ebuild
index 3c491fa859dc..6e41726cc2f8 100644
--- a/dev-ruby/ruby-vte3/ruby-vte3-2.2.3.ebuild
+++ b/dev-ruby/ruby-vte3/ruby-vte3-2.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/ruby-vte3/ruby-vte3-2.2.5.ebuild b/dev-ruby/ruby-vte3/ruby-vte3-2.2.5.ebuild
index d913d29f6408..01a4cd815dc8 100644
--- a/dev-ruby/ruby-vte3/ruby-vte3-2.2.5.ebuild
+++ b/dev-ruby/ruby-vte3/ruby-vte3-2.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/simple_oauth/simple_oauth-0.2.0-r1.ebuild b/dev-ruby/simple_oauth/simple_oauth-0.2.0-r1.ebuild
index 8d4b937a4890..4ec36f384e72 100644
--- a/dev-ruby/simple_oauth/simple_oauth-0.2.0-r1.ebuild
+++ b/dev-ruby/simple_oauth/simple_oauth-0.2.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/simple_oauth/simple_oauth-0.3.0.ebuild b/dev-ruby/simple_oauth/simple_oauth-0.3.0.ebuild
index 52bb5544fdbb..992edf2f35ed 100644
--- a/dev-ruby/simple_oauth/simple_oauth-0.3.0.ebuild
+++ b/dev-ruby/simple_oauth/simple_oauth-0.3.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/simple_oauth/simple_oauth-0.3.1.ebuild b/dev-ruby/simple_oauth/simple_oauth-0.3.1.ebuild
index e294ce9bc669..b15cf7a2e7d8 100644
--- a/dev-ruby/simple_oauth/simple_oauth-0.3.1.ebuild
+++ b/dev-ruby/simple_oauth/simple_oauth-0.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index caca8a9a904c..e04d46bdf723 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,2 +1,3 @@
+DIST sshkit-1.10.0.gem 144896 SHA256 52be5c07361644f7ab461e14ffd2455a3ee5a7df01b03428bfa3716c830344a4 SHA512 e89a91acd073ccfc73e15eff5c163273c80ef086bfe97e3df3af7b6ee3ce6b425b2bc4d0031526092cb709ec84a4643d3c8719b1341c5e406455dcac5f9e8c91 WHIRLPOOL eb389dd4103df89d1614826cbca0d6a93bc8f8594a264a0cd5916d4097cded107cb61ac180727f9fbda384d3bc0136d466e81af64ea4bc2ce186cc96969b0fea
 DIST sshkit-1.8.1.gem 139264 SHA256 ff272ca4d54fcdfab2874c70de3d4e26846762e091f83d2bbfaa96ecaa8c0617 SHA512 59fcc3f24d6ca6c7acf8f753959aee993dbbcd452477f3124d5444f7e19a9885efde9d5ea5803ffc366b9f6638a4d93472cc51b343a6d7a39a708528def6e9e9 WHIRLPOOL 48c35a2dbd3b820dccb69b366903e803ff4eb62d250aa5a2c985d510f245529e049933501ed51d0f6e23926d7b3fd5c526c61c932dcc6f1840ec911e82469dbb
 DIST sshkit-1.9.0.gem 142336 SHA256 7e3d840aeb81a282075c8c63276c9788b57914ab22281b8ba428a69d54ad8703 SHA512 f4883e5f369a14253a9e5ed7929c0528030635687b50d64aecf845ccd0194816893c638c8a185c0a1c6c6ab6a01b42d4fd9209f1e87f296556ef1c8bc591e6dd WHIRLPOOL 8571ef46dbd2f8c12fd26c4e7e9219f0fc62b88698602f33eae89a0eca314c874ab173298028e29e03ffd52d193812fb26ccab84c9923d4816de07c98f7ec1c2
diff --git a/dev-ruby/sshkit/sshkit-1.10.0.ebuild b/dev-ruby/sshkit/sshkit-1.10.0.ebuild
new file mode 100644
index 000000000000..c8ee20de483f
--- /dev/null
+++ b/dev-ruby/sshkit/sshkit-1.10.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+# There are functional tests that require vagrant boxes to be set up.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
+HOMEPAGE="https://github.com/capistrano/sshkit"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/net-ssh-2.8.0:*
+	>=dev-ruby/net-scp-1.1.2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
+	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
+		-e '1irequire "set"' test/helper.rb || die
+
+	# Fix assumption about parent directory name
+	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
+}
+
+each_ruby_test() {
+	# Run tests directly to avoid dependencies in the Rakefile
+	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest
index cfdc80c91ddf..a8e5341c3fca 100644
--- a/dev-util/spec-cleaner/Manifest
+++ b/dev-util/spec-cleaner/Manifest
@@ -1 +1 @@
-DIST spec-cleaner-0.7.8.tar.gz 89125 SHA256 d9ed8aeefac4836182a4c0a8bcaaaedaf4acad88bc601b2576f3adfad5436528 SHA512 2937c2480b4a24343c5ea8a665f2820e37da3f2816c22e6bc82ebba66711754a59f5e68fb903258750cac3118206a9e02fc5a87051c0bcb4e8396ab658e844d3 WHIRLPOOL 6559460eb869c8428b17611e4005edd59abd24ec105467768191825c6cd232f776e40ce7e5762fcecf9adad6bdfbf24c1790b8fd3d992deeb07a67b44c1665ac
+DIST spec-cleaner-0.8.1.tar.gz 94428 SHA256 e84a54299ecb2b42d035760075d15b132a969c451b9463b36186d7e473c2c254 SHA512 00fcdd161786f6d19e55a1b16c3825f641bb1757606f8840cfe04e15cc168d5afed9f89889bb55603ac4de5794bc42ac1631a78e3eb3be19bdca760ba9211e3a WHIRLPOOL 026965d449ff34943283d94f5592985cd39d6f566ae3284149887ba6f93780697ec6afa0dda70fdfaf05c3d7d14ff1a4247d0674d8ed69ae0b6f4db771c66959
diff --git a/dev-util/spec-cleaner/spec-cleaner-0.7.8.ebuild b/dev-util/spec-cleaner/spec-cleaner-0.8.1.ebuild
similarity index 95%
rename from dev-util/spec-cleaner/spec-cleaner-0.7.8.ebuild
rename to dev-util/spec-cleaner/spec-cleaner-0.8.1.ebuild
index 20592dcd5458..00dca1d97650 100644
--- a/dev-util/spec-cleaner/spec-cleaner-0.7.8.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-0.8.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
 inherit distutils-r1
 [[ ${PV} == 9999 ]] && inherit git-r3
diff --git a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
index 20592dcd5458..00dca1d97650 100644
--- a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
 inherit distutils-r1
 [[ ${PV} == 9999 ]] && inherit git-r3
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index c880cee9b568..3b454efe4874 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -392,7 +392,7 @@ kde5_src_prepare() {
 	fi
 
 	# drop translations when nls is not wanted
-	if [[ -d po ]] && ! use_if_isue nls ; then
+	if [[ -d po ]] && ! use_if_iuse nls ; then
 		rm -rf po || die
 	fi
 
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.3-r1.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.3-r1.ebuild
deleted file mode 100644
index e9139ea3bc9a..000000000000
--- a/games-rpg/eternal-lands/eternal-lands-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit eutils flag-o-matic gnome2-utils games
-
-DESCRIPTION="An online MMORPG written in C and SDL"
-HOMEPAGE="http://www.eternal-lands.com"
-SRC_URI="mirror://gentoo/elc_1.9.3-20120213.tar.bz2
-	https://dev.gentoo.org/~rich0/distfiles/eternal-lands.png"
-
-LICENSE="eternal_lands"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="debug doc kernel_linux"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	virtual/opengl
-	virtual/glu
-	media-libs/libsdl[X]
-	media-libs/sdl-net
-	media-libs/sdl-image
-	media-libs/openal
-	media-libs/freealut
-	media-libs/libvorbis
-	dev-libs/libxml2
-	media-libs/cal3d[-16bit-indices]
-	media-libs/libpng
-	>=games-rpg/eternal-lands-data-1.9.3"
-
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-opengl-1.0.6-r1
-	app-arch/unzip
-	doc? ( app-doc/doxygen
-		media-gfx/graphviz )"
-
-#ECVS_SERVER="cvs.elc.berlios.de:/cvsroot/elc"
-#ECVS_MODULE="elc"
-#ECVS_USER="anonymous"
-#ECVS_LOCALNAME="elc"
-#ECVS_PASS=""
-#ECVS_CVS_OPTIONS="-dP -z3"
-#ECVS_BRANCH="elc_1_8_0"
-
-#S="${WORKDIR}/${ECVS_MODULE}"
-S="${WORKDIR}/elc"
-
-src_unpack() {
-#	cvs_src_unpack
-	OPTIONS="-DDATA_DIR="\\\\\"${GAMES_DATADIR}/${PN}/\\\\\"""
-	S_CLIENT="${WORKDIR}/elc"
-	BROWSER="firefox"
-	unpack ${A}
-	cd "${S}"
-}
-
-src_prepare() {
-	# Add debugging options
-	if use debug ; then
-		OPTIONS="${OPTIONS} -DMEMORY_DEBUG"
-		append-flags -ggdb
-	fi
-
-	# Clean compile flags (make Gentoo friendly)
-	sed -i \
-		-e "s@CFLAGS=\$(PLATFORM) \$(CWARN) -O0 -ggdb -pipe@CFLAGS = ${CFLAGS} ${OPTIONS} @g" \
-		-e "s@CXXFLAGS=\$(PLATFORM) \$(CXXWARN) -O0 -ggdb -pipe@CXXFLAGS = ${CXXFLAGS} ${OPTIONS} @g" \
-		-e 's/lopenal/lopenal -l alut/' \
-		Makefile.linux || die "sed failed"
-
-	sed -i \
-		-e 's/#browser/browser/g' \
-		-e "s/browser = mozilla/#browser = ${BROWSER}/g" \
-		-e "s@#data_dir = /usr/local/games/el/@#data_dir = ${GAMES_DATADIR}/${PN}/@g" \
-		el.ini || die "sed failed"
-
-	# Support BSD in the Linux makefile - it's easier
-	use kernel_linux || sed -i \
-		-e 's/^CFLAGS=.*/& -DBSD/' \
-		Makefile.linux || die "sed failed"
-
-	# Clean up library flag order for --as-needed
-#	sed -i -e 's/@$(LINK) $(CFLAGS) $(LDFLAGS) -o $(EXE) $(OBJS)/@$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)/' Makefile.linux
-
-	# Finally, update the server
-	sed -i -e '/#server_address =/ s/.*/#server_address = game.eternal-lands.com/' \
-		el.ini || die "sed failed"
-
-	sed -i -e 's:FEATURES:EL_FEATURES:' make.defaults
-	sed -i -e 's:FEATURES:EL_FEATURES:' Makefile.linux
-
-	if use debug; then
-		sed -i -e 's/#\(EL_FEATURES += MEMORY_DEBUG\)/\1/' make.defaults
-		sed -i -e 's/#\(EL_FEATURES += MEMORY_DEBUG\)/\1/' Makefile.linux
-	fi
-
-	cp Makefile.linux Makefile
-
-	epatch "${FILESDIR}/${PN}-1.9.2-glext.patch"
-#	epatch "${FILESDIR}/${PN}-1.9.1-libpng.patch"
-
-# Fix for Gentoo zlib OF redefine
-
-	sed -i '1i#define OF(x) x' `find -name "*.c"` || die "sed failed"
-}
-
-src_compile() {
-	emake || die "make failed"
-
-	if use doc; then
-		emake docs || die "Failed to create documentation, try with USE=-doc"
-		mv ./docs/html/ ../client || die "Failed to move documentation directory"
-	fi
-}
-
-src_install() {
-	newicon -s 64 "${DISTDIR}/eternal-lands.png" ${PN}.png
-
-	newgamesbin el.x86.linux.bin el \
-		|| die "newgamesbin failed"
-	make_desktop_entry el "Eternal Lands" \
-		|| die "make_desktop_entry failed"
-	insopts -m 0660
-	insinto "${GAMES_DATADIR}/${PN}"
-
-	doins -r *.ini *.txt commands.lst \
-		|| die "doins failed"
-
-	if use doc ; then
-		dohtml -r client/*
-	fi
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-	elog "Auto Update is now enabled in Eternal Lands"
-	elog "If an update occurs then the client will suddenly exit"
-	elog "Updates only happen when the game first loads"
-	elog "Please don't report this behaviour as a bug"
-
-	# Ensure that the files are writable by the game group for auto
-	# updating.
-	chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${PN}"
-
-	# Make sure new files stay in games group
-	find "${ROOT}/${GAMES_DATADIR}/${PN}" -type d -exec chmod g+sx {} \;
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0-r2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0-r2.ebuild
deleted file mode 100644
index bf91585b28a8..000000000000
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="Sub-meta package for the applications of GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+games +share +shotwell +tracker"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~amd64 ~x86"
-
-# Note to developers:
-# This is a wrapper for the extra apps integrated with GNOME 3
-# New package
-#
-# cantarell upstream relies on noto, unifont and symbola fonts for
-# the fonts they cannot handle due to lack of enough manpower:
-# https://bugzilla.gnome.org/show_bug.cgi?id=762890
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}
-
-	>=app-admin/gnome-system-log-3.9.90
-	>=app-arch/file-roller-3.16.4
-	>=app-dicts/gnome-dictionary-${PV}
-	>=gnome-base/dconf-editor-${PV}
-	>=gnome-extra/gconf-editor-3
-	>=gnome-extra/gnome-calculator-${PV}
-	>=gnome-extra/gnome-calendar-${PV}
-	>=gnome-extra/gnome-characters-${PV}
-	>=gnome-extra/gnome-power-manager-${PV}
-	>=gnome-extra/gnome-search-tool-3.6
-	>=gnome-extra/gnome-system-monitor-${PV}
-	>=gnome-extra/gnome-tweak-tool-${PV}
-	>=gnome-extra/gnome-weather-${PV}
-	>=gnome-extra/gucharmap-${PV}:2.90
-	>=gnome-extra/nautilus-sendto-3.8.2
-	>=gnome-extra/sushi-${PV}
-	>=mail-client/evolution-${PV}
-	>=media-gfx/gnome-font-viewer-3.16.2
-	>=media-gfx/gnome-screenshot-${PV}
-	>=media-sound/sound-juicer-${PV}
-	>=media-video/cheese-${PV}
-	>=net-analyzer/gnome-nettool-3.8
-	>=net-misc/vinagre-${PV}
-	>=net-misc/vino-${PV}
-	>=sys-apps/baobab-${PV}
-	>=sys-apps/gnome-disk-utility-${PV}
-	>=www-client/epiphany-${PV}
-
-	>=media-fonts/noto-20160305
-	>=media-fonts/symbola-8.00
-	>=media-fonts/unifont-8.0.01
-
-	games? (
-		>=games-arcade/gnome-nibbles-${PV}
-		>=games-arcade/gnome-robots-${PV}
-		>=games-board/four-in-a-row-${PV}
-		>=games-board/gnome-chess-${PV}
-		>=games-board/gnome-mahjongg-${PV}
-		>=games-board/gnome-mines-${PV}
-		>=games-board/iagno-${PV}
-		>=games-board/tali-${PV}
-		>=games-puzzle/five-or-more-${PV}
-		>=games-puzzle/gnome-klotski-${PV}
-		>=games-puzzle/gnome-sudoku-${PV}
-		>=games-puzzle/gnome-taquin-${PV}
-		>=games-puzzle/gnome-tetravex-${PV}
-		>=games-puzzle/hitori-3.16.2
-		>=games-puzzle/lightsoff-${PV}
-		>=games-puzzle/quadrapassel-${PV}
-		>=games-puzzle/swell-foop-${PV} )
-	share? ( >=gnome-extra/gnome-user-share-${PV} )
-	shotwell? ( >=media-gfx/shotwell-0.22 )
-	tracker? (
-		>=app-misc/tracker-1.6
-		>=gnome-extra/gnome-documents-${PV}
-		>=media-gfx/gnome-photos-${PV}
-		>=media-sound/gnome-music-${PV} )
-"
-DEPEND=""
-S=${WORKDIR}
diff --git a/mail-client/mailx/files/mailx-8.1.2.20050715-musl.patch b/mail-client/mailx/files/mailx-8.1.2.20050715-musl.patch
new file mode 100644
index 000000000000..a2e03ec9753f
--- /dev/null
+++ b/mail-client/mailx/files/mailx-8.1.2.20050715-musl.patch
@@ -0,0 +1,19 @@
+--- a/mailx-8.1.2-0.20050715cvs.orig/EXT/vis.h
++++ b/mailx-8.1.2-0.20050715cvs.orig/EXT/vis.h
+@@ -70,9 +70,6 @@
+  */
+ #define	UNVIS_END	1	/* no more characters */
+ 
+-#include <sys/cdefs.h>
+-
+-__BEGIN_DECLS
+ char	*vis(char *, int, int, int);
+ int	strvis(char *, const char *, int);
+ int	strnvis(char *, const char *, size_t, int)
+@@ -84,6 +81,4 @@ int	unvis(char *, char, int *, int);
+ ssize_t strnunvis(char *, const char *, size_t)
+ /*		__attribute__ ((__bounded__(__string__,1,3)))*/;
+ 
+-__END_DECLS
+-
+ #endif /* !_VIS_H_ */
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r7.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r7.ebuild
new file mode 100644
index 000000000000..639f6f64e0f2
--- /dev/null
+++ b/mail-client/mailx/mailx-8.1.2.20050715-r7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+MX_MAJ_VER=${PV%.*}
+MX_MIN_VER=${PV##*.}
+MY_PV=${MX_MAJ_VER}-0.${MX_MIN_VER}cvs
+S=${WORKDIR}/${PN}-${MY_PV}.orig
+debian_patch=${PN}_${MY_PV}-1.diff.gz
+
+DESCRIPTION="The /bin/mail program, which is used to send mail via shell scripts"
+HOMEPAGE="http://www.debian.org/"
+SRC_URI="mirror://gentoo/mailx_${MY_PV}.orig.tar.gz
+	mirror://gentoo/${debian_patch}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=">=net-libs/liblockfile-1.03
+	virtual/mta
+	mail-client/mailx-support"
+
+RDEPEND="${DEPEND}
+	!mail-client/nail
+	!net-mail/mailutils"
+
+src_prepare() {
+	epatch "${DISTDIR}/${debian_patch}"
+	epatch "${FILESDIR}/${P}-musl.patch"
+	epatch "${FILESDIR}/${P}-nostrip.patch"
+	sed -i -e "s: -O2: \$(EXTRAFLAGS):g" Makefile || die
+	epatch "${FILESDIR}/${P}-offsetof.patch"
+	eapply_user
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) EXTRAFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin mail
+
+	doman mail.1
+
+	dosym mail /usr/bin/Mail
+	dosym mail /usr/bin/mailx
+	dosym mail.1 /usr/share/man/man1/Mail.1
+
+	insinto /usr/share/mailx/
+	doins misc/mail.help misc/mail.tildehelp
+	insinto /etc
+	doins misc/mail.rc
+}
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
index 3370d6725d58..f864a8382f09 100644
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
@@ -1,6 +1,6 @@
 === modified file 'Makefile'
---- Makefile	2011-08-09 15:19:01 +0000
-+++ Makefile	2011-08-09 15:19:43 +0000
+--- a/Makefile	2011-08-09 15:19:01 +0000
++++ b/Makefile	2011-08-09 15:19:43 +0000
 @@ -871,7 +871,7 @@
  		$(ARCH_LIBS)
  	@echo
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
index 25e80cd2a488..2970eac15516 100644
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
@@ -1,8 +1,8 @@
 http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829
 No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433)
 
---- src/tuxpaint.c	2011/07/29 21:27:39	1.828
-+++ src/tuxpaint.c	2011/08/08 17:59:12	1.829
+--- a/src/tuxpaint.c	2011/07/29 21:27:39	1.828
++++ b/src/tuxpaint.c	2011/08/08 17:59:12	1.829
 @@ -13425,12 +13425,7 @@
        {
  	png_init_io(png_ptr, fi);
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
new file mode 100644
index 000000000000..794261697e48
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit gnome2-utils multilib toolchain-funcs
+
+DESCRIPTION="Drawing program designed for young children"
+HOMEPAGE="http://www.tuxpaint.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="nls"
+
+RDEPEND="
+	app-text/libpaper
+	dev-libs/fribidi
+	gnome-base/librsvg:2
+	>=media-libs/libpng-1.2:0=
+	>=media-libs/freetype-2:2
+	media-libs/libsdl
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+	media-libs/sdl-pango
+	media-libs/sdl-ttf
+	x11-libs/cairo
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	# Sanitize the Makefile and correct a few other issues
+	"${FILESDIR}/${PN}-0.9.20-gentoo.patch"
+	"${FILESDIR}/${P}-libpng1.5.patch" #378199
+	"${FILESDIR}/${P}-LDFLAGS.patch" #334571
+	"${FILESDIR}/${P}-underlinking.patch" #484434
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
+		-e "s:/lib/:/$(get_libdir)/:" \
+		-e "s:/share/doc/tuxpaint.*:/share/doc/${PF}:g" \
+		Makefile || die
+}
+
+src_compile() {
+	# parallel build may break things
+	emake -j1 CC="$(tc-getCC)" \
+		$(use nls && echo ENABLE_GETTEXT=1)
+}
+
+src_install () {
+	emake -j1 PKG_ROOT="${D}" \
+		$(use nls && echo ENABLE_GETTEXT=1) install
+
+	rm -f docs/COPYING.txt docs/INSTALL.txt
+	dodoc docs/*.txt
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! has_version "${CATEGORY}/${PN}"; then
+		elog ""
+		elog "For additional graphic stamps, you can emerge the"
+		elog "media-gfx/tuxpaint-stamps package."
+		elog ""
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild
index 6d575e7e6661..62ed2b74b888 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild
@@ -9,7 +9,7 @@ MY_P=${MY_PN}-${PV}
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.9.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.9.0.ebuild
index 3344bdab20ef..99b49669760a 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.9.0.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.9.0.ebuild
@@ -9,7 +9,7 @@ MY_P="${MY_PN}-${PV}"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/phonon/phonon-4.9.0.ebuild b/media-libs/phonon/phonon-4.9.0.ebuild
index 89d287e51137..07e637c8ad41 100644
--- a/media-libs/phonon/phonon-4.9.0.ebuild
+++ b/media-libs/phonon/phonon-4.9.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
@@ -49,6 +49,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	qt5? ( kde-frameworks/extra-cmake-modules:5 )
 "
 PDEPEND="
 	aqua? ( media-libs/phonon-qt7 )
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index 89d287e51137..07e637c8ad41 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
@@ -49,6 +49,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	qt5? ( kde-frameworks/extra-cmake-modules:5 )
 "
 PDEPEND="
 	aqua? ( media-libs/phonon-qt7 )
diff --git a/media-sound/pympd/pympd-0.08.1-r1.ebuild b/media-sound/pympd/pympd-0.08.1-r1.ebuild
new file mode 100644
index 000000000000..108c5dc6faf7
--- /dev/null
+++ b/media-sound/pympd/pympd-0.08.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="a Rhythmbox-like PyGTK+ client for Music Player Daemon"
+HOMEPAGE="http://sourceforge.net/projects/pympd"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}]
+	gnome-base/libglade:2.0
+	x11-libs/gdk-pixbuf:2[jpeg]
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-desktop-entry.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	python_fix_shebang .
+	sed -i -e 's:FLAGS =:FLAGS +=:' src/modules/tray/Makefile || die
+	sed -i -e 's:\..\/py:/usr/share/pympd/py:g' src/glade/pympd.glade || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr DESTDIR="${D}"
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8fff9292388a..edfad772e241 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 24 Apr 2016 05:38:58 +0000
+Mon, 25 Apr 2016 07:09:00 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8fff9292388a..b6ea9c920a3f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 24 Apr 2016 05:38:58 +0000
+Mon, 25 Apr 2016 07:09:01 +0000
diff --git a/metadata/md5-cache/app-admin/calamares-2.2.1 b/metadata/md5-cache/app-admin/calamares-2.2.1
index dd6df3f6fbbe..9cfb0357187f 100644
--- a/metadata/md5-cache/app-admin/calamares-2.2.1
+++ b/metadata/md5-cache/app-admin/calamares-2.2.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/v2.2.1/calamares-2.2.1.tar.gz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1f7946cd70fe07d5d25c26240767b382
diff --git a/metadata/md5-cache/app-admin/systemrescuecd-x86-4.7.2 b/metadata/md5-cache/app-admin/systemrescuecd-x86-4.7.2
new file mode 100644
index 000000000000..eee14c746fa8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/systemrescuecd-x86-4.7.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
+EAPI=5
+HOMEPAGE=http://www.sysresccd.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RESTRICT=mirror
+SLOT=4.7.2
+SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.7.2/systemrescuecd-x86-4.7.2.iso
+_md5_=a8a1f25992dd192475678157e41cb419
diff --git a/metadata/md5-cache/app-backup/kfoldersync-3.1.5 b/metadata/md5-cache/app-backup/kfoldersync-3.1.5
index 1c60ed397937..b65b36b24165 100644
--- a/metadata/md5-cache/app-backup/kfoldersync-3.1.5
+++ b/metadata/md5-cache/app-backup/kfoldersync-3.1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtconcurrent-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=http://kde-apps.org/CONTENT/content-files/164092-kfoldersync-3.1.5.tar.xz -> kfoldersync-3.1.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e5314109ee6f3649eed3e2b295748a60
diff --git a/metadata/md5-cache/app-doc/linuxfromscratch-7.4 b/metadata/md5-cache/app-doc/linuxfromscratch-7.4
index b420860a6fcb..44a5e57f67a7 100644
--- a/metadata/md5-cache/app-doc/linuxfromscratch-7.4
+++ b/metadata/md5-cache/app-doc/linuxfromscratch-7.4
@@ -3,8 +3,8 @@ DESCRIPTION=LFS documents building a Linux system entirely from source
 EAPI=5
 HOMEPAGE=http://www.linuxfromscratch.org/lfs
 IUSE=htmlsingle pdf
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=CC-BY-NC-SA-2.5 MIT
 SLOT=0
 SRC_URI=http://www.linuxfromscratch.org/lfs/downloads/7.4/LFS-BOOK-7.4.tar.bz2 http://www.linuxfromscratch.org/lfs/downloads/7.4/lfs-bootscripts-20130821.tar.bz2 htmlsingle? ( http://www.linuxfromscratch.org/lfs/downloads/7.4/LFS-BOOK-7.4-NOCHUNKS.html ) pdf? ( http://www.linuxfromscratch.org/lfs/downloads/7.4/LFS-BOOK-7.4.pdf )
-_md5_=185b99ecd12d3ee5dd7eb4719f63a8a8
+_md5_=30a7e1b1b72e6bcdc1b6e4800cc3137a
diff --git a/metadata/md5-cache/app-doc/linuxfromscratch-7.7 b/metadata/md5-cache/app-doc/linuxfromscratch-7.7
index d2a4142c423f..d33434612870 100644
--- a/metadata/md5-cache/app-doc/linuxfromscratch-7.7
+++ b/metadata/md5-cache/app-doc/linuxfromscratch-7.7
@@ -3,8 +3,8 @@ DESCRIPTION=LFS documents building a Linux system entirely from source
 EAPI=5
 HOMEPAGE=http://www.linuxfromscratch.org/lfs
 IUSE=htmlsingle pdf
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=CC-BY-NC-SA-2.5 MIT
 SLOT=0
 SRC_URI=http://www.linuxfromscratch.org/lfs/downloads/7.7/LFS-BOOK-7.7.tar.bz2 http://www.linuxfromscratch.org/lfs/downloads/7.7/lfs-bootscripts-20150222.tar.bz2 htmlsingle? ( http://www.linuxfromscratch.org/lfs/downloads/7.7/LFS-BOOK-7.7-NOCHUNKS.html ) pdf? ( http://www.linuxfromscratch.org/lfs/downloads/7.7/LFS-BOOK-7.7.pdf )
-_md5_=6bf7163ae1dae4af4d7f84a0bbf4a346
+_md5_=55dbaa3842e4877c450e4ec7bf7dee84
diff --git a/metadata/md5-cache/app-doc/linuxfromscratch-7.9 b/metadata/md5-cache/app-doc/linuxfromscratch-7.9
new file mode 100644
index 000000000000..795e95fc3c1e
--- /dev/null
+++ b/metadata/md5-cache/app-doc/linuxfromscratch-7.9
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=LFS documents building a Linux system entirely from source
+EAPI=5
+HOMEPAGE=http://www.linuxfromscratch.org/lfs
+IUSE=htmlsingle pdf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=CC-BY-NC-SA-2.5 MIT
+SLOT=0
+SRC_URI=http://www.linuxfromscratch.org/lfs/downloads/7.9/LFS-BOOK-7.9.tar.bz2 http://www.linuxfromscratch.org/lfs/downloads/7.9/lfs-bootscripts-20150222.tar.bz2 htmlsingle? ( http://www.linuxfromscratch.org/lfs/downloads/7.9/LFS-BOOK-7.9-NOCHUNKS.html ) pdf? ( http://www.linuxfromscratch.org/lfs/downloads/7.9/LFS-BOOK-7.9.pdf )
+_md5_=29be8990bec4d3e092149388b04811ff
diff --git a/metadata/md5-cache/app-i18n/imhangul-2.1.0 b/metadata/md5-cache/app-i18n/imhangul-2.1.0
index c499c6f3f2f2..a9ebb996aaa8 100644
--- a/metadata/md5-cache/app-i18n/imhangul-2.1.0
+++ b/metadata/md5-cache/app-i18n/imhangul-2.1.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm prepare
 DEPEND=>=app-i18n/libhangul-0.0.12 >=x11-libs/gtk+-2.2:2 virtual/libintl virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
 DESCRIPTION=Gtk+-2.0 Hangul Input Modules
-EAPI=3
+EAPI=6
 HOMEPAGE=https://code.google.com/p/imhangul/
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-i18n/libhangul-0.0.12 >=x11-libs/gtk+-2.2:2 virtual/libintl
 SLOT=0
 SRC_URI=https://imhangul.googlecode.com/files/imhangul-2.1.0.tar.bz2
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f9b850dbb3eb264b717e82d2bfb50919
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=29044460c11db6a8dee3fe707a1ec7a9
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.0 b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.0
index 87ab57c28e52..5aafca3a3545 100644
--- a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.0
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 sys-devel/gettext x11-libs/libxkbfile >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.5.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8567d14ff4e4f8650f6eb01ef65477b6
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.2 b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.2
index 7ebffca47965..014f51ca30b6 100644
--- a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.2
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 sys-devel/gettext x11-libs/libxkbfile >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.5.2.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8567d14ff4e4f8650f6eb01ef65477b6
diff --git a/metadata/md5-cache/app-i18n/poedit-1.8.7 b/metadata/md5-cache/app-i18n/poedit-1.8.7
new file mode 100644
index 000000000000..f21cf50e79c9
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/poedit-1.8.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=app-text/gtkspell:3 dev-cpp/lucene++ dev-libs/boost:=[nls] dev-libs/expat dev-libs/icu:= || ( =sys-libs/db-5*:=[cxx] =sys-libs/db-4*:=[cxx] ) x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X] virtual/pkgconfig
+DESCRIPTION=GUI editor for gettext translations files
+EAPI=6
+HOMEPAGE=https://poedit.net
+IUSE=linguas_af linguas_am linguas_an linguas_ar linguas_ast linguas_az linguas_be linguas_be@latin linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_ckb linguas_co linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fur linguas_fy_NL linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kab linguas_kk linguas_ko linguas_ky linguas_lt linguas_lv linguas_mk linguas_mn linguas_mr linguas_ms linguas_nb linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_sl linguas_sq linguas_sr linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_tt linguas_ug linguas_uk linguas_ur linguas_uz linguas_vi linguas_wa linguas_zh_CN linguas_zh_TW
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=app-text/gtkspell:3 dev-cpp/lucene++ dev-libs/boost:=[nls] dev-libs/expat dev-libs/icu:= || ( =sys-libs/db-5*:=[cxx] =sys-libs/db-4*:=[cxx] ) x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X]
+SLOT=0
+SRC_URI=https://github.com/vslavik/poedit/releases/download/v1.8.7-oss/poedit-1.8.7.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	l10n	714aaf78929eade946da5eaff7d2001a	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
+_md5_=d571125343afb2d2f083f63e0e14db55
diff --git a/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3 b/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3
new file mode 100644
index 000000000000..e40bc2d1fa0e
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=>=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 >=x11-libs/pango-1.1 ) virtual/pkgconfig dev-util/intltool doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=Yet another IM-client of SCIM
+EAPI=6
+HOMEPAGE=http://www.scim-im.org/projects/scim_bridge
+IUSE=doc gtk qt4
+KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 >=x11-libs/pango-1.1 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/scim/scim-bridge-0.4.16.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=ddbc7f876982a56bb01164e9d75706ac
diff --git a/metadata/md5-cache/app-office/lyx-1.6.10 b/metadata/md5-cache/app-office/lyx-1.6.10
deleted file mode 100644
index 9f82c4f66944..000000000000
--- a/metadata/md5-cache/app-office/lyx-1.6.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 x11-libs/libXrandr x11-libs/libXcursor x11-libs/libXrender x11-libs/libXfixes x11-libs/libXext x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp dev-libs/libxml2 app-text/aiksaurus app-text/aspell media-libs/fontconfig media-libs/freetype >=dev-libs/boost-1.34 x11-proto/xproto virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 X? ( x11-apps/mkfontdir media-fonts/encodings ) =dev-lang/python-2*
-DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc.
-EAPI=2
-HOMEPAGE=http://www.lyx.org/
-IUSE=cups debug nls latex monolithic-build html rtf dot docbook dia subversion rcs svg linguas_ar linguas_ca linguas_cs linguas_de linguas_el linguas_en linguas_es linguas_eu linguas_fi linguas_fr linguas_gl linguas_he linguas_hu linguas_id linguas_it linguas_ja linguas_nb linguas_nn linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW X
-KEYWORDS=alpha amd64 hppa ~ia64 ~ppc ~ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 x11-libs/libXrandr x11-libs/libXcursor x11-libs/libXrender x11-libs/libXfixes x11-libs/libXext x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp dev-libs/libxml2 app-text/aiksaurus app-text/aspell media-libs/fontconfig media-libs/freetype >=dev-libs/boost-1.34 dev-texlive/texlive-fontsextra || ( media-gfx/imagemagick media-gfx/graphicsmagick ) cups? ( net-print/cups ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/noweb dev-tex/dvipost dev-tex/chktex app-text/ps2eps dev-texlive/texlive-latexextra dev-texlive/texlive-pictures dev-texlive/texlive-science || ( dev-tex/latex2html dev-tex/tth dev-tex/hevea dev-tex/tex4ht ) ) html? ( dev-tex/html2latex ) rtf? ( dev-tex/latex2rtf app-text/unrtf dev-tex/html2latex ) linguas_he? ( dev-tex/culmus-latex ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) dia? ( app-office/dia ) subversion? ( <dev-vcs/subversion-1.7.0 ) rcs? ( dev-vcs/rcs ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) =dev-lang/python-2*
-SLOT=0
-SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/lyx-1.6.10.tar.bz2
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	font	cd7790315ca5b8c505e1e0513df6acce	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	python	efc1c55fc44c5b7272fc2ffba73c3e6f	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8e1ec429efebd7b9a4dd9bb502e313fa
diff --git a/metadata/md5-cache/app-office/skrooge-2.3.0 b/metadata/md5-cache/app-office/skrooge-2.3.0
index 17523fee6990..04c8fc2842dc 100644
--- a/metadata/md5-cache/app-office/skrooge-2.3.0
+++ b/metadata/md5-cache/app-office/skrooge-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.3.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d71e2f90231bc3c38393000d26daf0a2
diff --git a/metadata/md5-cache/app-text/calibre-2.55.0 b/metadata/md5-cache/app-text/calibre-2.55.0
new file mode 100644
index 000000000000..f160abf76cc7
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-2.55.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=app-text/podofo-0.8.2:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2 >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.1.11[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] media-libs/fontconfig >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.5:= >=media-libs/libwmf-0.2.8 sys-libs/zlib virtual/libusb:1= virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( virtual/libudev ) >=dev-python/setuptools-0.6_rc5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=virtual/podofo-build-0.8.2 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=5
+HOMEPAGE=http://calibre-ebook.com/
+IUSE=+udisks python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2 unRAR
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=app-text/podofo-0.8.2:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2 >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.1.11[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] media-libs/fontconfig >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.5:= >=media-libs/libwmf-0.2.8 sys-libs/zlib virtual/libusb:1= virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://download.calibre-ebook.com/2.55.0/calibre-2.55.0.tar.xz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=03900a5082b655f0c24116991b047040
diff --git a/metadata/md5-cache/app-text/nfoview-1.10 b/metadata/md5-cache/app-text/nfoview-1.10
deleted file mode 100644
index 7b07168d0742..000000000000
--- a/metadata/md5-cache/app-text/nfoview-1.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=dev-python/pygobject:3 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* ) >=sys-apps/sed-4
-DESCRIPTION=simple viewer for NFO files, which are ASCII art in the CP437 codepage
-EAPI=3
-HOMEPAGE=http://home.gna.org/nfoview/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-python/pygobject:3 media-fonts/terminus-font || ( =dev-lang/python-3.3* =dev-lang/python-3.2* )
-SLOT=0
-SRC_URI=http://download.gna.org/nfoview/1.10/nfoview-1.10.tar.gz
-_eclasses_=distutils	ad9e4720eb3e69090dd968b152fc611b	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b7e605fdcccc2c5617ce94444cb50922
diff --git a/metadata/md5-cache/app-text/xchm-1.23-r2 b/metadata/md5-cache/app-text/xchm-1.23-r2
new file mode 100644
index 000000000000..2b400cde995c
--- /dev/null
+++ b/metadata/md5-cache/app-text/xchm-1.23-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0-gtk3[X]
+DESCRIPTION=Utility for viewing Compiled HTML Help (CHM) files
+EAPI=6
+HOMEPAGE=http://xchm.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0-gtk3[X]
+SLOT=0
+SRC_URI=mirror://sourceforge/xchm/xchm-1.23.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
+_md5_=256023acce5eb1e9353910e4b4c4e358
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.8.1.2 b/metadata/md5-cache/dev-db/aerospike-server-community-3.8.1.2
new file mode 100644
index 000000000000..6a47a789b5af
--- /dev/null
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-3.8.1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=app-crypt/gcr
+DESCRIPTION=Flash-optimized, in-memory, nosql database
+EAPI=5
+HOMEPAGE=http://www.aerospike.com
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-crypt/gcr
+SLOT=0
+SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.8.1.2/aerospike-server-community-3.8.1.2-debian7.tgz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=04b9fabb343450a2ea9d858ca92cd624
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.6.5-r1 b/metadata/md5-cache/dev-java/icedtea-7.2.6.6
similarity index 84%
rename from metadata/md5-cache/dev-java/icedtea-7.2.6.5-r1
rename to metadata/md5-cache/dev-java/icedtea-7.2.6.6
index 5b95155c680d..a6253632d6e4 100644
--- a/metadata/md5-cache/dev-java/icedtea-7.2.6.5-r1
+++ b/metadata/md5-cache/dev-java/icedtea-7.2.6.6
@@ -11,6 +11,6 @@ RDEPEND=>=dev-libs/glib-2.26:2 >=dev-util/systemtap-1 media-libs/fontconfig >=me
 REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=test
 SLOT=7
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.6.5.tar.xz http://icedtea.classpath.org/download/drops/icedtea7/2.6.5/openjdk.tar.bz2 -> icedtea-2.6-openjdk-8e728c41fec5.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.5/corba.tar.bz2 -> icedtea-2.6-corba-389551542e13.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.5/jaxp.tar.bz2 -> icedtea-2.6-jaxp-8a56658cb829.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.5/jaxws.tar.bz2 -> icedtea-2.6-jaxws-9c049d7f5adc.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.5/jdk.tar.bz2 -> icedtea-2.6-jdk-e727fe32654c.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.5/hotspot.tar.bz2 -> icedtea-2.6-hotspot-04d7046d2d41.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.5/langtools.tar.bz2 -> icedtea-2.6-langtools-f6593c32cc46.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.6.tar.xz http://icedtea.classpath.org/download/drops/icedtea7/2.6.6/openjdk.tar.bz2 -> icedtea-2.6-openjdk-882cfee70fe8.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.6/corba.tar.bz2 -> icedtea-2.6-corba-ca3e3c4c5a61.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.6/jaxp.tar.bz2 -> icedtea-2.6-jaxp-683427778edf.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.6/jaxws.tar.bz2 -> icedtea-2.6-jaxws-63f7bf7ed2d4.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.6/jdk.tar.bz2 -> icedtea-2.6-jdk-55c38c1ace75.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.6/hotspot.tar.bz2 -> icedtea-2.6-hotspot-3022a3d80efd.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.6/langtools.tar.bz2 -> icedtea-2.6-langtools-e42dd50480d3.tar.bz2 http://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.gz -> icedtea-cacao-c182f119eaad.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	java-vm-2	5d8b5c70734a82c2e321f300d15bbe2e	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=81a002d5cc75f76327e33d3335da2f5d
+_md5_=df3b4d0effb119bc8ce42e3874b2f7f2
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.6 b/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.6
new file mode 100644
index 000000000000..774499b93065
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.6
@@ -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
+DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
+EAPI=5
+HOMEPAGE=http://icedtea.classpath.org
+IUSE=+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source +webstart
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2-with-linking-exception
+PDEPEND=webstart? ( dev-java/icedtea-web:0[icedtea7(+)] ) nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
+RDEPEND=>=dev-libs/glib-2.42:2 >=dev-libs/nss-3.16.1-r1 >=dev-libs/nspr-4.10 >=gnome-base/gsettings-desktop-schemas-3.12.2 media-fonts/dejavu >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.6:2 >=sys-devel/gcc-4.9.3 >=sys-libs/glibc-2.21 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) !headless-awt? ( >=media-libs/giflib-4.1.6-r1 media-libs/libpng:0/16 >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.16.0 >=x11-libs/cairo-1.14.2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 app-eselect/eselect-java
+REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
+RESTRICT=preserve-libs strip
+SLOT=7
+SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-7.2.6.6.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-7.2.6.6.tar.xz ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.6-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.6-amd64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.6-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.6-x86.tar.xz ) )
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	5d8b5c70734a82c2e321f300d15bbe2e	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=53cb93489a0af67792b6a7bda62bf852
diff --git a/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608 b/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608
deleted file mode 100644
index 840dba4c7cbd..000000000000
--- a/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=CUP Parser Generator for Java
-EAPI=0
-HOMEPAGE=http://www2.cs.tum.edu/projects/cup/
-IUSE=userland_BSD elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/javacup-0.11a_beta20060608.tar.bz2
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=18d4683c3f56368ff50513cf863cea15
diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001
index 5bdd80cb4d62..17443554aaee 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001
+++ b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001
@@ -4,10 +4,10 @@ DESCRIPTION=CUP Parser Generator for Java
 EAPI=5
 HOMEPAGE=http://www2.cs.tum.edu/projects/cup/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20151001.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1371bf5c0db5b70759fac3467c40b739
+_md5_=b9a23fc12a7e1744fa1be2beb9c52a90
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.0-r2 b/metadata/md5-cache/dev-java/jflex-1.6.0-r2
deleted file mode 100644
index ee788964cdf9..000000000000
--- a/metadata/md5-cache/dev-java/jflex-1.6.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/ant-core:0 =dev-java/javacup-0.11a_beta20060608:0 dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JFlex is a lexical analyzer generator for Java
-EAPI=5
-HOMEPAGE=http://www.jflex.de/
-IUSE=doc source examples source vim-syntax elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-java/ant-core:0 =dev-java/javacup-0.11a_beta20060608:0 dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://jflex.de/jflex-1.6.0.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fafa9807c128c10b38be32ebbc41f0da
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1 b/metadata/md5-cache/dev-java/jflex-1.6.1
index 5e6bd5699a1d..023a4155eee8 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=JFlex is a lexical analyzer generator for Java
 EAPI=5
 HOMEPAGE=http://www.jflex.de/
 IUSE=examples test vim-syntax elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 PDEPEND=>=dev-java/javacup-0.11b_p20151001:0
 RDEPEND=>=virtual/jre-1.6 vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jflex.de/jflex-1.6.1.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8cacbbc583ba7c463cb22374391ca168
+_md5_=f916a9437ce7186c8c0cdac6bcb3fe28
diff --git a/metadata/md5-cache/dev-java/jump-0.5 b/metadata/md5-cache/dev-java/jump-0.5
deleted file mode 100644
index db58f44b59bc..000000000000
--- a/metadata/md5-cache/dev-java/jump-0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/ant-junit =dev-java/junit-3* ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JUMP Ultimate Math Package (JUMP) is a Java-based extensible high-precision math package
-EAPI=0
-HOMEPAGE=http://jump-math.sourceforge.net/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jump-math/jump-0.5.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d34c450c0d79c567bde401a7e85eeeb8
diff --git a/metadata/md5-cache/dev-java/jump-0.5-r1 b/metadata/md5-cache/dev-java/jump-0.5-r1
index 360c0f8e170b..246fa91664e7 100644
--- a/metadata/md5-cache/dev-java/jump-0.5-r1
+++ b/metadata/md5-cache/dev-java/jump-0.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Java-based extensible high-precision math library
 EAPI=5
 HOMEPAGE=http://jump-math.sourceforge.net/
 IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jump-math/jump-0.5.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0f8c2ccc5dce8b24fc4a5d7686aef33b
+_md5_=416a269dbd0033e5a7d2c6b14b378173
diff --git a/metadata/md5-cache/dev-java/qdox-1.12-r1 b/metadata/md5-cache/dev-java/qdox-1.12-r1
deleted file mode 100644
index 46f2022f0a91..000000000000
--- a/metadata/md5-cache/dev-java/qdox-1.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip:0 dev-java/byaccj:0 >=dev-java/jflex-1.4.3:0 dev-java/jmock:1.0 test? ( dev-java/junit:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Parser for extracting class/interface/method definitions
-EAPI=5
-HOMEPAGE=https://github.com/codehaus/qdox
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.12
-SRC_URI=http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=233d5ba6ace0c6c6105e50dae5f6c266
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r1 b/metadata/md5-cache/dev-java/qdox-1.12.1-r1
index 60b37c4beb6b..5361802a8e3a 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r1
+++ b/metadata/md5-cache/dev-java/qdox-1.12.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Parser for extracting class/interface/method definitions
 EAPI=5
 HOMEPAGE=https://github.com/codehaus/qdox
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.12
 SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a7029821876f086a071f42f47f3ebd78
+_md5_=be844aa21e61bb387ae2ef62db06cd0a
diff --git a/metadata/md5-cache/dev-libs/double-conversion-2.0.1 b/metadata/md5-cache/dev-libs/double-conversion-2.0.1
index 5eea66f57533..eed57ff0d447 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-2.0.1
+++ b/metadata/md5-cache/dev-libs/double-conversion-2.0.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare test
 DEPEND=dev-util/scons
-DESCRIPTION=Binary-decimal and decimal-binary routines forIEEE doubles
+DESCRIPTION=Binary-decimal and decimal-binary conversion routines for IEEE doubles
 EAPI=5
 HOMEPAGE=https://github.com/google/double-conversion
 IUSE=static-libs
@@ -9,4 +9,4 @@ LICENSE=BSD
 SLOT=0/1
 SRC_URI=https://double-conversion.googlecode.com/files/double-conversion-2.0.1.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	scons-utils	6a35944612b7ecb18a3803359554badc	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=8da9647cc630b883e1b8f442016cb3af
+_md5_=3cc902c0f2854b17ee9b7bd1ccef119b
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.0.2-r1 b/metadata/md5-cache/dev-libs/protobuf-c-1.0.2-r1
index ac7769a86247..3b67df0b0126 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.0.2-r1
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.0.2-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/protobuf-2.5.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?]
-DESCRIPTION=code generator and runtime libraries to use Protocol Buffers (protobuf) from pure C
+DESCRIPTION=Protocol Buffers implementation in C
 EAPI=5
 HOMEPAGE=https://github.com/protobuf-c/protobuf-c/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/protobuf-2.5.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 SLOT=0
 SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.0.2/protobuf-c-1.0.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=73139265275f626d06706c832620576a
+_md5_=ae22bf17fc90feaf7ddd86d48984f624
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.1.1 b/metadata/md5-cache/dev-libs/protobuf-c-1.1.1
index b0623b5fc6db..a572841a48eb 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.1.1
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.1.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/protobuf-2.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(-)?] test? ( !<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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=code generator and runtime libraries to use Protocol Buffers (protobuf) from pure C
+DESCRIPTION=Protocol Buffers implementation in C
 EAPI=5
 HOMEPAGE=https://github.com/protobuf-c/protobuf-c/
 IUSE=static-libs 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
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/protobuf-2.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 SLOT=0
 SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.1.1/protobuf-c-1.1.1.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=d09fbb3c0c026f9d53a413503383bac7
+_md5_=0d5868145f5ee0bc1539debbb561e57e
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.2.1 b/metadata/md5-cache/dev-libs/protobuf-c-1.2.1
deleted file mode 100644
index 76271eb57d37..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/protobuf-2.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(-)?] test? ( !<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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=code generator and runtime libraries to use Protocol Buffers (protobuf) from pure C
-EAPI=6
-HOMEPAGE=https://github.com/protobuf-c/protobuf-c/
-IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-libs/protobuf-2.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(-)?]
-SLOT=0
-SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.2.1/protobuf-c-1.2.1.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=4a7a0b0cf317342c2a6d9227abfa2ffd
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.2.1-r1 b/metadata/md5-cache/dev-libs/protobuf-c-1.2.1-r1
new file mode 100644
index 000000000000..252e90c562f7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.2.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/protobuf-2.6.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( !<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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Protocol Buffers implementation in C
+EAPI=6
+HOMEPAGE=https://github.com/protobuf-c/protobuf-c/
+IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-libs/protobuf-2.6.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/1.0.0
+SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.2.1/protobuf-c-1.2.1.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=66e3dbdde7294bba95ad939bdc95b25e
diff --git a/metadata/md5-cache/dev-libs/purpose-1.0 b/metadata/md5-cache/dev-libs/purpose-1.0
index c64384d2f03d..5e9c08f66675 100644
--- a/metadata/md5-cache/dev-libs/purpose-1.0
+++ b/metadata/md5-cache/dev-libs/purpose-1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-apps/kaccounts-integration-14.12.0:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 net-libs/accounts-qt >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/purpose/purpose-1.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0cb394e0dd96a34f26c2d8c30e03103c
diff --git a/metadata/md5-cache/dev-python/botocore-1.4.8 b/metadata/md5-cache/dev-python/botocore-1.4.11
similarity index 98%
rename from metadata/md5-cache/dev-python/botocore-1.4.8
rename to metadata/md5-cache/dev-python/botocore-1.4.11
index 6c4da0271c27..6b607811d181 100644
--- a/metadata/md5-cache/dev-python/botocore-1.4.8
+++ b/metadata/md5-cache/dev-python/botocore-1.4.11
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/docutils-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/jmespath-0.7.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/jmespath-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/python-dateutil-3.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.4.8.tar.gz
+SRC_URI=mirror://pypi/b/botocore/botocore-1.4.11.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=eff502152c96bb78be4c58404918e2e9
diff --git a/metadata/md5-cache/dev-python/pyqwt-5.2.0-r1 b/metadata/md5-cache/dev-python/pyqwt-5.2.0-r1
index f9a95cba8389..ddabf6ec2185 100644
--- a/metadata/md5-cache/dev-python/pyqwt-5.2.0-r1
+++ b/metadata/md5-cache/dev-python/pyqwt-5.2.0-r1
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/qwt:5[svg?] dev-python/PyQt4[python_targets_python2_7(-)?,-pyth
 SLOT=5
 SRC_URI=mirror://sourceforge/pyqwt/PyQwt-5.2.0.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=a339d589201545b81d8a195ba051768e
+_md5_=7ea7c6ad5ab7bb2882215c9bbb0647ca
diff --git a/metadata/md5-cache/dev-python/pysrt-1.1.1 b/metadata/md5-cache/dev-python/pysrt-1.1.1
new file mode 100644
index 000000000000..ae924c36a841
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pysrt-1.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[coverage(+),python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python library used to edit or create SubRip files
+EAPI=6
+HOMEPAGE=https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://pypi.python.org/packages/f6/33/16ad65a8973cb8bcb494af09ee1b9ab5ffdd6ff300bce5d3ac7d3cb1f2cc/pysrt-1.1.1.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=bbdf10b242cf0b5dfc6019f747279d5f
diff --git a/metadata/md5-cache/dev-python/sip-4.16.9 b/metadata/md5-cache/dev-python/sip-4.16.9
index f586c91be93f..1096679ad69e 100644
--- a/metadata/md5-cache/dev-python/sip-4.16.9
+++ b/metadata/md5-cache/dev-python/sip-4.16.9
@@ -4,11 +4,11 @@ DESCRIPTION=Python extension module generator for C and C++ libraries
 EAPI=5
 HOMEPAGE=http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP
 IUSE=debug doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( GPL-2 GPL-3 SIP )
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0/11
 SRC_URI=mirror://sourceforge/pyqt/sip-4.16.9.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=6795a2155912a3d05a24ed3895ac4794
+_md5_=77c1c4385c0df48b01eb06f8a2f04ed8
diff --git a/metadata/md5-cache/dev-python/stormpath-2.1.4 b/metadata/md5-cache/dev-python/stormpath-2.3.1
similarity index 98%
rename from metadata/md5-cache/dev-python/stormpath-2.1.4
rename to metadata/md5-cache/dev-python/stormpath-2.3.1
index 7d2225bdcf2a..28398fdbdd26 100644
--- a/metadata/md5-cache/dev-python/stormpath-2.1.4
+++ b/metadata/md5-cache/dev-python/stormpath-2.3.1
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/isodate-0.5.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oauthlib-0.6.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pydispatcher-2.0.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyjwt-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.4.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
-SRC_URI=https://github.com/stormpath/stormpath-sdk-python/archive/2.1.4.tar.gz -> stormpath-2.1.4.tar.gz
+SRC_URI=https://github.com/stormpath/stormpath-sdk-python/archive/2.3.1.tar.gz -> stormpath-2.3.1.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
-_md5_=2425b90b4859ad449e9876cbcf9eb65f
+_md5_=fa5af47455b6dd552625f05a30d0f794
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.7.5 b/metadata/md5-cache/dev-python/vdirsyncer-0.7.5
index 7db12f76345c..0752f440188c 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.7.5
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.7.5
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Synchronize calendars and contacts
 EAPI=5
-HOMEPAGE=https://github.com/untitaker/vdirsyncer
+HOMEPAGE=https://github.com/pimutils/vdirsyncer
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.7.5.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=9839ea18be7aec9ed4368a047e2478a6
+_md5_=675a108fddcaacba14b964c55d010370
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.9.0 b/metadata/md5-cache/dev-python/vdirsyncer-0.9.0
index 720697d8ce10..a52725e46b8b 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.9.0
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.9.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/setuptools_scm[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Synchronize calendars and contacts
 EAPI=5
-HOMEPAGE=https://github.com/untitaker/vdirsyncer
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+HOMEPAGE=https://github.com/pimutils/vdirsyncer
+IUSE=python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/click-5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/click-log[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/click-threading[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !=dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] =dev-python/lxml-3.4.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-toolbelt-0.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/atomicwrites[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/keyring[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RDEPEND=>=dev-python/click-5.0[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/click-log[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/click-threading[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/requests[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !=dev-python/requests-2.9.0[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] =dev-python/lxml-3.4.4[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-toolbelt-0.5.0[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/atomicwrites[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.9.0.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=9839ea18be7aec9ed4368a047e2478a6
+_md5_=d72faef4b3fab793004a1d941bd90d33
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.9.3 b/metadata/md5-cache/dev-python/vdirsyncer-0.9.3
index 03f4d003344c..08d93aea2cb6 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.9.3
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.9.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/setuptools_scm[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Synchronize calendars and contacts
 EAPI=6
-HOMEPAGE=https://github.com/untitaker/vdirsyncer
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+HOMEPAGE=https://github.com/pimutils/vdirsyncer
+IUSE=python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/click-5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/click-log[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/click-threading[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !=dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] =dev-python/lxml-3.4.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-toolbelt-0.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/atomicwrites[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/keyring[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RDEPEND=>=dev-python/click-5.0[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/click-log-0.1.3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/click-threading-0.1.2[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.4.1[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !=dev-python/requests-2.9.0[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] =dev-python/lxml-3.4.4[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-toolbelt-0.5.0[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/atomicwrites-0.1.7[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.9.3.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=8e1d3b456d4402f6054c2e182e8b2999
+_md5_=84bb2968d941ac0d0cfcd35f49f93424
diff --git a/metadata/md5-cache/dev-python/websocket-client-0.31.0 b/metadata/md5-cache/dev-python/websocket-client-0.31.0
deleted file mode 100644
index bd25a945d000..000000000000
--- a/metadata/md5-cache/dev-python/websocket-client-0.31.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=WebSocket client for python. hybi13 is supported
-EAPI=5
-HOMEPAGE=https://github.com/liris/websocket-client
-IUSE=examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/w/websocket-client/websocket_client-0.31.0.tar.gz -> websocket-client-0.31.0.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
-_md5_=d3a27d3ec5825bfd8d6d4402acc0d04d
diff --git a/metadata/md5-cache/dev-python/websocket-client-0.32.0 b/metadata/md5-cache/dev-python/websocket-client-0.32.0
deleted file mode 100644
index 8cad7dcd112b..000000000000
--- a/metadata/md5-cache/dev-python/websocket-client-0.32.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=WebSocket client for python. hybi13 is supported
-EAPI=5
-HOMEPAGE=https://github.com/liris/websocket-client
-IUSE=examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/w/websocket-client/websocket_client-0.32.0.tar.gz -> websocket-client-0.32.0.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
-_md5_=d3a27d3ec5825bfd8d6d4402acc0d04d
diff --git a/metadata/md5-cache/dev-python/websocket-client-0.37.0 b/metadata/md5-cache/dev-python/websocket-client-0.37.0
new file mode 100644
index 000000000000..bb7c0fc75dfb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/websocket-client-0.37.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=WebSocket client for python with hybi13 support
+EAPI=5
+HOMEPAGE=https://github.com/liris/websocket-client
+IUSE=examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/w/websocket-client/websocket_client-0.37.0.tar.gz -> websocket-client-0.37.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
+_md5_=1bcfa83569e297fb7ae94cbb3687bb79
diff --git a/metadata/md5-cache/dev-python/wrapt-1.10.6 b/metadata/md5-cache/dev-python/wrapt-1.10.8
similarity index 94%
rename from metadata/md5-cache/dev-python/wrapt-1.10.6
rename to metadata/md5-cache/dev-python/wrapt-1.10.8
index d9ea010bb78a..a2a9feacfb89 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.10.6
+++ b/metadata/md5-cache/dev-python/wrapt-1.10.8
@@ -4,12 +4,11 @@ DESCRIPTION=Module for decorators, wrappers and monkey patching
 EAPI=5
 HOMEPAGE=https://github.com/GrahamDumpleton/wrapt
 IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
 SLOT=0
-SRC_URI=mirror://pypi/w/wrapt/wrapt-1.10.6.tar.gz
+SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.10.8.tar.gz -> wrapt-1.10.8.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
-_md5_=cfc7db4fcc16d5b4baaa53c5b5531667
+_md5_=38354e5dd9e2e8ccb42a72f12fe0291b
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtbluetooth-5.5.1-r1
index 57873fdffce8..245cd4175e43 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.5.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.5.1 ~dev-qt/qtcore-5.5.1 ~dev-qt/qtdbus-5.5.1 >=net-wireless/bluez-5 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) ~dev-qt/qtnetwork-5.5.1 virtual/pkgconfig dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
+DEPEND=~dev-qt/qtconcurrent-5.5.1 ~dev-qt/qtcore-5.5.1 ~dev-qt/qtdbus-5.5.1 >=net-wireless/bluez-5 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) ~dev-qt/qtnetwork-5.5.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
 DESCRIPTION=Bluetooth support library for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtconnectivity-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=7994942b2c4c7bbf73b81f72ab1cc217
+_md5_=b53167322a2185db8fe58873e84460f7
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.6.0 b/metadata/md5-cache/dev-qt/qtbluetooth-5.6.0
index 1687b5362097..0daa1db733c8 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.6.0
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.6.0 ~dev-qt/qtcore-5.6.0 ~dev-qt/qtdbus-5.6.0 >=net-wireless/bluez-5 qml? ( ~dev-qt/qtdeclarative-5.6.0 ) ~dev-qt/qtnetwork-5.6.0 virtual/pkgconfig dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.6.0 )
+DEPEND=~dev-qt/qtconcurrent-5.6.0 ~dev-qt/qtcore-5.6.0 ~dev-qt/qtdbus-5.6.0 >=net-wireless/bluez-5 qml? ( ~dev-qt/qtdeclarative-5.6.0 ) ~dev-qt/qtnetwork-5.6.0 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.6.0 )
 DESCRIPTION=Bluetooth support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5/5.6
 SRC_URI=https://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtconnectivity-opensource-src-5.6.0.tar.xz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=59688aaa623e5416b0c72c7aae170f1a
+_md5_=0329752f8eed84edec19742328acb6e6
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.6.0 b/metadata/md5-cache/dev-qt/qtcore-5.6.0
index 06f75628a048..d6b4d64abafd 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.6.0
+++ b/metadata/md5-cache/dev-qt/qtcore-5.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 >=dev-libs/libpcre-8.35[pcre16] >=sys-libs/zlib-1.2.5 virtual/libiconv icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.6.0 )
+DEPEND=dev-libs/glib:2 >=dev-libs/libpcre-8.38[pcre16,unicode] >=sys-libs/zlib-1.2.5 virtual/libiconv icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.6.0 )
 DESCRIPTION=Cross-platform application development framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=icu systemd debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/glib:2 >=dev-libs/libpcre-8.35[pcre16] >=sys-libs/zlib-1.2.5 virtual/libiconv icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd ) dev-qt/qtchooser
+RDEPEND=dev-libs/glib:2 >=dev-libs/libpcre-8.38[pcre16,unicode] >=sys-libs/zlib-1.2.5 virtual/libiconv icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.6
 SRC_URI=https://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtbase-opensource-src-5.6.0.tar.xz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=1fff4305586ef7b58171a8b2485a5863
+_md5_=7ebbf2809742ce09215afca2a3a2128a
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtpaths-5.5.1-r1
index 0651f96e8f2a..e02089ab0bf0 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.5.1-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=~dev-qt/qtcore-5.5.1 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
-DESCRIPTION=Tool to query Qt path information
+DESCRIPTION=Command line client to QStandardPaths
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=da30d46423884a57471efd381967e5c1
+_md5_=30f482f89fcebcdde43f616b2d486fc7
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.6.0 b/metadata/md5-cache/dev-qt/qtpaths-5.6.0
index 9983a23ec1f5..abfec87f80c1 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.6.0
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.6.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=~dev-qt/qtcore-5.6.0 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.6.0 )
-DESCRIPTION=Tool to query Qt path information
+DESCRIPTION=Command line client to QStandardPaths
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5/5.6
 SRC_URI=https://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qttools-opensource-src-5.6.0.tar.xz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=5b1767795ee15b079c2606227107df8d
+_md5_=72ecfdf49549db210858839e5f6e2c5a
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.6.0 b/metadata/md5-cache/dev-qt/qtplugininfo-5.6.0
new file mode 100644
index 000000000000..1b5117ed7db7
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.6.0 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.6.0 )
+DESCRIPTION=Qt5 plugin metadata dumper
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.6.0 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.6
+SRC_URI=https://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qttools-opensource-src-5.6.0.tar.xz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_md5_=079456f02d85c230245edc6c37dbcc5e
diff --git a/metadata/md5-cache/dev-ruby/facter-3.1.6 b/metadata/md5-cache/dev-ruby/facter-3.1.6
index a1a0e0798c15..0cd4c19701cd 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.1.6
+++ b/metadata/md5-cache/dev-ruby/facter-3.1.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.1.6.tar.gz -> facter-3.1.6.tar.gz
 _eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dcaafbd44c711ea53ae8ee8f45468df6
+_md5_=a84cc405ed2dd19621fd46478a21bc29
diff --git a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0 b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0
index e53c7c6e3ef4..0e1f549f8b06 100644
--- a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0
+++ b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Simple callback-based HTTP request/response parser
 EAPI=5
 HOMEPAGE=https://github.com/tmm1/http_parser.rb
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/http_parser.rb-0.6.0.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a5b0e95d4032e62b885c90a0cdf01498
+_md5_=3dc22b8ea64be5683fe2f5b45cbb9a0a
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 bb7a25645231..06a98517c651 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
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Simple callback-based HTTP request/response parser
 EAPI=5
 HOMEPAGE=https://github.com/tmm1/http_parser.rb
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/http_parser.rb-0.6.0.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=430d353e15dac8811a88908d89d90b24
+_md5_=dd3e4962deac537cc01d7bd8ce7cb641
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.11.3 b/metadata/md5-cache/dev-ruby/multi_json-1.11.3
new file mode 100644
index 000000000000..82475e2e37ff
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.11.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby20] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby20] =dev-ruby/activesupport-3*[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby21] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby21] =dev-ruby/activesupport-3*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby22] =dev-ruby/activesupport-3*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] =dev-ruby/activesupport-3*[ruby_targets_ruby23] ) ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby20] dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/json[ruby_targets_ruby20] dev-ruby/yajl-ruby[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/yajl-ruby[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/yajl-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/yajl-ruby[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=A gem to provide swappable JSON backends
+EAPI=5
+HOMEPAGE=https://github.com/intridea/multi_json
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby20] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby20] =dev-ruby/activesupport-3*[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby21] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby21] =dev-ruby/activesupport-3*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby22] =dev-ruby/activesupport-3*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] =dev-ruby/activesupport-3*[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=https://github.com/intridea/multi_json/archive/v1.11.3.tar.gz -> multi_json-1.11.3.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3d3cb30eb751691e08bdb216cacfa363
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 723ef793c275..c2acb9ed7d62 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-1.2.1
+++ b/metadata/md5-cache/dev-ruby/net-scp-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( doc? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby20] ) test? ( >=dev-ruby/net-ssh-2.9.0[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) test? ( >=dev-ruby/net-ssh-2.9.0[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) test? ( >=dev-ruby/net-ssh-2.9.0[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( doc? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby20] ) test? ( >=dev-ruby/net-ssh-2.9.0:2.6[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby21] ) test? ( >=dev-ruby/net-ssh-2.9.0:2.6[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby22] ) test? ( >=dev-ruby/net-ssh-2.9.0:2.6[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A pure Ruby implementation of the SCP client protocol
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/net-scp
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-scp-1.2.1.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=502da21ac443e185609ff217b5e40df9
+_md5_=52c374742063b94251401e4a65a35bbc
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 4a41c117a16a..01f27bb89c90 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.10.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.10.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] >=dev-ruby/mocha-0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] >=dev-ruby/mocha-0.13[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] >=dev-ruby/mocha-0.13[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Non-interactive SSH processing in pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/net-ssh
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=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_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=01cfc8bd5cd7550e3c8f6ff33c9608e4
+_md5_=113fe9d67d63c6666cc747cf98974135
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3
index df943f3e4e70..88c01e0c624b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
 DESCRIPTION=Ruby GdkPixbuf2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 test
 KEYWORDS=amd64 ~ppc x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=28f4084a15d4279f2452efadeee61835
+_md5_=0e3b866c549f6e1ffaca9d71bce1e898
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3-r1
index c647cd16f787..7caf1229ad3d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
 DESCRIPTION=Ruby GdkPixbuf2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=12a1b5a9d42de751f27365bd50530a58
+_md5_=ce1eac9274596bc049f1633a35551500
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.5
index ee26ce6eba2f..e2b5f0939b89 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
 DESCRIPTION=Ruby GdkPixbuf2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.5.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=12a1b5a9d42de751f27365bd50530a58
+_md5_=ce1eac9274596bc049f1633a35551500
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3
index 8dc7a4ab5b6e..d1255d120f5c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
+DEPEND=x11-libs/gtk+:3 ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
 DESCRIPTION=Ruby Gtk3 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 test
 KEYWORDS=amd64 ~ppc x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=83becbbb05ff443aea17397b52c90a11
+_md5_=5d0bf44a633cda6c69f92252f322add9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3-r1
index 5798813b61aa..ac28767d3bf9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DEPEND=x11-libs/gtk+:3 ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
 DESCRIPTION=Ruby Gtk3 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a8f3e6455a8b80f523b2e49c5a185dbb
+_md5_=0192c31dca2d1087a4f1fa426af5b94a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.5
index 27f8176263e0..89aab9273827 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby22] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DEPEND=x11-libs/gtk+:3 ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby22] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
 DESCRIPTION=Ruby Gtk3 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.5.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=f75ee977aa40247b30b3833161e4a1ff
+_md5_=97f8e275269eba5d3c6d1856a2ca28e6
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7
index c33caab06091..92015b02a7a7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A Ruby library for Oracle OCI8
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 doc test test
 KEYWORDS=amd64 x86
 LICENSE=Ruby
-RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.1.7.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=efbafed1f79e29d70d770cad595ac79f
+_md5_=1469fd6713c48f141f2dd975b265915e
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7-r1 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7-r1
index 84864da2081d..70d378bdf231 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Ruby library for Oracle OCI8
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Ruby
-RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.1.7.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=67ae6660013b4d057332ec882be3fd53
+_md5_=fbe50f9ce5191bfc27959dcbb628cd3d
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 347a602c72a4..8411b61821e6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Ruby library for Oracle OCI8
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~x86
 LICENSE=Ruby
-RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.1.8.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8cfa4e8c6aa38d5ef8a90117ab68bdf6
+_md5_=9ed7dbab8ce9a03ef969c1ec60f96420
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 1876c344264f..69326a663612 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.1
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Ruby library for Oracle OCI8
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Ruby
-RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.2.1.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=01bc9c64263e52145fbb00b8d783998c
+_md5_=79403c92a46f8893e86b95c7ea0183e4
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.8.0 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.8.0
index f50eb8cabd63..5a84ba78904b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.8.0
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=OpenGL / GLUT bindings for ruby
 EAPI=5
 HOMEPAGE=http://ruby-opengl.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 test
 KEYWORDS=amd64 hppa ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/opengl-0.8.0.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=501d586916147aee703febf478828334
+_md5_=67ad0b117f24a26dc5f3cfc022a03b83
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 e71d03fef406..f324218dba5c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=OpenGL / GLUT bindings for ruby
 EAPI=5
 HOMEPAGE=https://github.com/larskanis/opengl
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/opengl-0.9.2.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b6bdc438a8ebde31c26bb55dd87a788c
+_md5_=49577cf63b1bfd1d75b93d92a28f9eb5
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3
index 59d5bf7d0658..c353ae6dbe5c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
+DEPEND=x11-libs/vte:2.90 ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
 DESCRIPTION=Ruby VTE bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 test
 KEYWORDS=amd64 ~ppc x86
 LICENSE=Ruby
-RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=781d172b15726e0e82bad5c508736aa2
+_md5_=55fb2439a1e057d11492a8dc08bbe19f
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3-r1
index bbc9efbb82a2..5905a48b3ace 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DEPEND=x11-libs/vte:2.90 ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
 DESCRIPTION=Ruby VTE bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c1ff6a60ce34cefe765fb0d6627cda59
+_md5_=5d9793c71c926647290cd15af6096b15
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.5
index c64fcb2d2998..d9b800886da0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DEPEND=x11-libs/vte:2.90 ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
 DESCRIPTION=Ruby VTE bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.5.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c1ff6a60ce34cefe765fb0d6627cda59
+_md5_=5d9793c71c926647290cd15af6096b15
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1 b/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
index 05509626ff55..2f05ba9ccdde 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=Simply builds and verifies OAuth headers
 EAPI=5
 HOMEPAGE=https://github.com/laserlemon/simple_oauth
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/simple_oauth-0.2.0.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3b9f11c0a16378453ca32a77616c6fc4
+_md5_=d412fb0d6def528682514e9cc472e68c
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.0 b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.0
index 197ecc949400..cafa56c93bd4 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.0
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=Simply builds and verifies OAuth headers
 EAPI=5
 HOMEPAGE=https://github.com/laserlemon/simple_oauth
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/simple_oauth-0.3.0.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1b69076e7fa2c91b3dbd570536579846
+_md5_=63b1c785736d4c1c50d54552ca0418cf
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 e70a827ff9aa..e866d458c84d 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Simply builds and verifies OAuth headers
 EAPI=5
 HOMEPAGE=https://github.com/laserlemon/simple_oauth
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/laserlemon/simple_oauth/archive/v0.3.1.tar.gz -> simple_oauth-0.3.1.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4e0ed7158d687f0d82660d9ee3013a7a
+_md5_=09d778bfdc6962b00b8166761d52297e
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.10.0 b/metadata/md5-cache/dev-ruby/sshkit-1.10.0
new file mode 100644
index 000000000000..7ffc1c9dd122
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in Ruby
+EAPI=5
+HOMEPAGE=https://github.com/capistrano/sshkit
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://rubygems/sshkit-1.10.0.gem
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9e28057f28d9dbd057aa04aacd786b94	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6dc6a17c75379a73284031b48884e4dc
diff --git a/metadata/md5-cache/dev-util/spec-cleaner-0.7.8 b/metadata/md5-cache/dev-util/spec-cleaner-0.7.8
deleted file mode 100644
index cad29febc8a5..000000000000
--- a/metadata/md5-cache/dev-util/spec-cleaner-0.7.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[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=SUSE spec file cleaner and formatter
-EAPI=5
-HOMEPAGE=https://github.com/openSUSE/spec-cleaner
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-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(-)] 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=https://github.com/openSUSE/spec-cleaner/archive/spec-cleaner-0.7.8.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=e056f4dbff7a55e54faf07ea7d53b282
diff --git a/metadata/md5-cache/dev-util/spec-cleaner-0.8.1 b/metadata/md5-cache/dev-util/spec-cleaner-0.8.1
new file mode 100644
index 000000000000..54e6c6deefdf
--- /dev/null
+++ b/metadata/md5-cache/dev-util/spec-cleaner-0.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/mock[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/nose[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=SUSE spec file cleaner and formatter
+EAPI=5
+HOMEPAGE=https://github.com/openSUSE/spec-cleaner
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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/openSUSE/spec-cleaner/archive/spec-cleaner-0.8.1.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=db2b2726bb997df6ad19b7038d73cc9e
diff --git a/metadata/md5-cache/dev-util/spec-cleaner-9999 b/metadata/md5-cache/dev-util/spec-cleaner-9999
index 88dd3a7a9481..248ee492880e 100644
--- a/metadata/md5-cache/dev-util/spec-cleaner-9999
+++ b/metadata/md5-cache/dev-util/spec-cleaner-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[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(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=test? ( dev-python/mock[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/nose[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(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=SUSE spec file cleaner and formatter
 EAPI=5
 HOMEPAGE=https://github.com/openSUSE/spec-cleaner
-IUSE=test python_targets_python2_7 python_targets_python3_4
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 LICENSE=BSD
-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(-)] 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 ) >=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(-)] 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
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	ef66dfc3db09f327af21cf32f140fb2b	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=e056f4dbff7a55e54faf07ea7d53b282
+_md5_=db2b2726bb997df6ad19b7038d73cc9e
diff --git a/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r1 b/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r1
deleted file mode 100644
index 3a5af6ade8e1..000000000000
--- a/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.3 >=app-eselect/eselect-opengl-1.0.6-r1 app-arch/unzip doc? ( app-doc/doxygen media-gfx/graphviz ) >=sys-apps/sed-4
-DESCRIPTION=An online MMORPG written in C and SDL
-EAPI=2
-HOMEPAGE=http://www.eternal-lands.com
-IUSE=debug doc kernel_linux
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=eternal_lands
-RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.3 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://gentoo/elc_1.9.3-20120213.tar.bz2 https://dev.gentoo.org/~rich0/distfiles/eternal-lands.png
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bf306e0bb0e7206db887c3908db62f86
diff --git a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.18.0-r2 b/metadata/md5-cache/gnome-base/gnome-extra-apps-3.18.0-r2
deleted file mode 100644
index 7b5ece25a1f4..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.18.0-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Sub-meta package for the applications of GNOME 3
-EAPI=5
-HOMEPAGE=https://www.gnome.org/
-IUSE=+games +share +shotwell +tracker
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=gnome-base/gnome-core-libs-3.18.0 >=app-admin/gnome-system-log-3.9.90 >=app-arch/file-roller-3.16.4 >=app-dicts/gnome-dictionary-3.18.0 >=gnome-base/dconf-editor-3.18.0 >=gnome-extra/gconf-editor-3 >=gnome-extra/gnome-calculator-3.18.0 >=gnome-extra/gnome-calendar-3.18.0 >=gnome-extra/gnome-characters-3.18.0 >=gnome-extra/gnome-power-manager-3.18.0 >=gnome-extra/gnome-search-tool-3.6 >=gnome-extra/gnome-system-monitor-3.18.0 >=gnome-extra/gnome-tweak-tool-3.18.0 >=gnome-extra/gnome-weather-3.18.0 >=gnome-extra/gucharmap-3.18.0:2.90 >=gnome-extra/nautilus-sendto-3.8.2 >=gnome-extra/sushi-3.18.0 >=mail-client/evolution-3.18.0 >=media-gfx/gnome-font-viewer-3.16.2 >=media-gfx/gnome-screenshot-3.18.0 >=media-sound/sound-juicer-3.18.0 >=media-video/cheese-3.18.0 >=net-analyzer/gnome-nettool-3.8 >=net-misc/vinagre-3.18.0 >=net-misc/vino-3.18.0 >=sys-apps/baobab-3.18.0 >=sys-apps/gnome-disk-utility-3.18.0 >=www-client/epiphany-3.18.0 >=media-fonts/noto-20160305 >=media-fonts/symbola-8.00 >=media-fonts/unifont-8.0.01 games? ( >=games-arcade/gnome-nibbles-3.18.0 >=games-arcade/gnome-robots-3.18.0 >=games-board/four-in-a-row-3.18.0 >=games-board/gnome-chess-3.18.0 >=games-board/gnome-mahjongg-3.18.0 >=games-board/gnome-mines-3.18.0 >=games-board/iagno-3.18.0 >=games-board/tali-3.18.0 >=games-puzzle/five-or-more-3.18.0 >=games-puzzle/gnome-klotski-3.18.0 >=games-puzzle/gnome-sudoku-3.18.0 >=games-puzzle/gnome-taquin-3.18.0 >=games-puzzle/gnome-tetravex-3.18.0 >=games-puzzle/hitori-3.16.2 >=games-puzzle/lightsoff-3.18.0 >=games-puzzle/quadrapassel-3.18.0 >=games-puzzle/swell-foop-3.18.0 ) share? ( >=gnome-extra/gnome-user-share-3.18.0 ) shotwell? ( >=media-gfx/shotwell-0.22 ) tracker? ( >=app-misc/tracker-1.6 >=gnome-extra/gnome-documents-3.18.0 >=media-gfx/gnome-photos-3.18.0 >=media-sound/gnome-music-3.18.0 )
-SLOT=3.0
-_md5_=49a08ffb34d49f562a48c799b5d0bf50
diff --git a/metadata/md5-cache/kde-apps/analitza-15.12.3 b/metadata/md5-cache/kde-apps/analitza-15.12.3
index 06b42e12ac66..39817bfc4a91 100644
--- a/metadata/md5-cache/kde-apps/analitza-15.12.3
+++ b/metadata/md5-cache/kde-apps/analitza-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 eigen? ( dev-cpp/eigen:3 ) opengl? ( >=dev-qt/qtopengl-5.5.1:5 virtual/opengl ) >=kde-frameworks/kf-env-3 !kde-apps/analitza:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/analitza-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fe2e6de52956dc6c96e8d450bf81a83f
diff --git a/metadata/md5-cache/kde-apps/ark-15.12.3 b/metadata/md5-cache/kde-apps/ark-15.12.3
index b42dc48b252f..a56928be6caa 100644
--- a/metadata/md5-cache/kde-apps/ark-15.12.3
+++ b/metadata/md5-cache/kde-apps/ark-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kjobwidgets-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kpty-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=app-arch/libarchive-3.0.0[bzip2?,lzma?,zlib?] >=kde-frameworks/kf-env-3 !kde-apps/ark:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ark-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=50cff6cbf51695410b1cf5eb15b61729
diff --git a/metadata/md5-cache/kde-apps/artikulate-15.12.3 b/metadata/md5-cache/kde-apps/artikulate-15.12.3
index c9d64549b452..8ecc409ecd88 100644
--- a/metadata/md5-cache/kde-apps/artikulate-15.12.3
+++ b/metadata/md5-cache/kde-apps/artikulate-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsql-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=dev-qt/qtxmlpatterns-5.5.1:5 >=media-libs/qt-gstreamer-1.2.0[qt5] >=kde-frameworks/kf-env-3 !kde-apps/artikulate:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/artikulate-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=46ea422c24f3c9ee0937516d929ceb09
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-15.12.3 b/metadata/md5-cache/kde-apps/baloo-widgets-15.12.3
index ab607b7dd6d0..9e5ad88a7c85 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-15.12.3
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/baloo-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kfilemetadata-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !kde-base/baloo-widgets >=kde-frameworks/kf-env-3 !kde-apps/baloo-widgets:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/baloo-widgets-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b895d36c7e8a0a887324505829a92e02
diff --git a/metadata/md5-cache/kde-apps/blinken-15.12.3 b/metadata/md5-cache/kde-apps/blinken-15.12.3
index 3c96845e21df..f34b1fc4c1ae 100644
--- a/metadata/md5-cache/kde-apps/blinken-15.12.3
+++ b/metadata/md5-cache/kde-apps/blinken-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/blinken:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/blinken-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=df0f4f3d6cfd0000bf9f26b197dbdbf3
diff --git a/metadata/md5-cache/kde-apps/bomber-15.12.3 b/metadata/md5-cache/kde-apps/bomber-15.12.3
index b3f01c31b82c..7a617e34a6cc 100644
--- a/metadata/md5-cache/kde-apps/bomber-15.12.3
+++ b/metadata/md5-cache/kde-apps/bomber-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/bomber:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/bomber-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c215966d730b2517d02c24289082a130
diff --git a/metadata/md5-cache/kde-apps/bovo-15.12.3 b/metadata/md5-cache/kde-apps/bovo-15.12.3
index 69f324020138..08de7ce3c1dd 100644
--- a/metadata/md5-cache/kde-apps/bovo-15.12.3
+++ b/metadata/md5-cache/kde-apps/bovo-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtconcurrent-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/bovo:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/bovo-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e6409f900be4a51d309a1254140919e9
diff --git a/metadata/md5-cache/kde-apps/cantor-15.12.3-r1 b/metadata/md5-cache/kde-apps/cantor-15.12.3-r1
index 1d04288e706f..9cc1b90a78e0 100644
--- a/metadata/md5-cache/kde-apps/cantor-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/cantor-15.12.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/cantor-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=88b8420c1e3768cac6fd51e0c0d33d66
diff --git a/metadata/md5-cache/kde-apps/dolphin-15.12.3-r1 b/metadata/md5-cache/kde-apps/dolphin-15.12.3-r1
index f96394537423..069b909cacd5 100644
--- a/metadata/md5-cache/kde-apps/dolphin-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/dolphin-15.12.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/dolphin-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=42120f7fdfddb2e708fec8fba92f51b4
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-15.12.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-15.12.3
index 369c6a3430f0..460eec7b0bbe 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-15.12.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/dolphin-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 git? ( >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktexteditor-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 ) >=kde-apps/kompare-15.12.3:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-3 !kde-apps/dolphin-plugins:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/dolphin-plugins-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=08baca321eb3a7a2310ecf640f8b1a12
diff --git a/metadata/md5-cache/kde-apps/dragon-15.12.3 b/metadata/md5-cache/kde-apps/dragon-15.12.3
index defb0a5695ed..153f599de27b 100644
--- a/metadata/md5-cache/kde-apps/dragon-15.12.3
+++ b/metadata/md5-cache/kde-apps/dragon-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kjobwidgets-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/solid-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/dragon:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/dragon-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=611dfe31388dce58eaee80bbd1ecd609
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-15.12.3 b/metadata/md5-cache/kde-apps/ffmpegthumbs-15.12.3
index 1187fda01fb5..6240e3ef9fed 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-15.12.3
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kio-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ffmpegthumbs-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5de4021eab0175cc30ec90191928b796
diff --git a/metadata/md5-cache/kde-apps/filelight-15.12.3 b/metadata/md5-cache/kde-apps/filelight-15.12.3
index 93b0ce3010e5..c17fe7c5f6cf 100644
--- a/metadata/md5-cache/kde-apps/filelight-15.12.3
+++ b/metadata/md5-cache/kde-apps/filelight-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/solid-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/filelight:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/filelight-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=989d54d3419681d856943364d1e39bb3
diff --git a/metadata/md5-cache/kde-apps/gpgmepp-15.08.3 b/metadata/md5-cache/kde-apps/gpgmepp-15.08.3
index ad198f873ad0..a1e2cc1a382a 100644
--- a/metadata/md5-cache/kde-apps/gpgmepp-15.08.3
+++ b/metadata/md5-cache/kde-apps/gpgmepp-15.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=app-crypt/gpgme:= >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/gpgmepp-15.08.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=357fa24620bf4fb8f2cb8c8c1977a41c
diff --git a/metadata/md5-cache/kde-apps/gpgmepp-15.12.3 b/metadata/md5-cache/kde-apps/gpgmepp-15.12.3
index 896f7fe4124c..5bef81720a30 100644
--- a/metadata/md5-cache/kde-apps/gpgmepp-15.12.3
+++ b/metadata/md5-cache/kde-apps/gpgmepp-15.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=app-crypt/gpgme:= >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/gpgmepp-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e73b68ff998d5956d601eee3ac7dd2ca
diff --git a/metadata/md5-cache/kde-apps/granatier-15.12.3 b/metadata/md5-cache/kde-apps/granatier-15.12.3
index aac57576e50e..eca9f13d0e93 100644
--- a/metadata/md5-cache/kde-apps/granatier-15.12.3
+++ b/metadata/md5-cache/kde-apps/granatier-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/granatier:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/granatier-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=902a255d93de95864adc0cf6d6eb46d3
diff --git a/metadata/md5-cache/kde-apps/gwenview-15.12.3 b/metadata/md5-cache/kde-apps/gwenview-15.12.3
index b8126a9df57f..4f9f786c1786 100644
--- a/metadata/md5-cache/kde-apps/gwenview-15.12.3
+++ b/metadata/md5-cache/kde-apps/gwenview-15.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.18.0:5 >=kde-frameworks/kcompletion-5.18.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/gwenview-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8e58073265dc447e98ca2eed321f9a82
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-15.12.3 b/metadata/md5-cache/kde-apps/kaccounts-integration-15.12.3
index 2cd682156c77..c2c84cf4862d 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-15.12.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-15.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kaccounts-integration-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3f17c178c1d25a93bf473390be02a0de
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-15.12.3 b/metadata/md5-cache/kde-apps/kaccounts-providers-15.12.3
index 3436b39aabf5..dccf93614a2d 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-15.12.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-15.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kpackage-5.18.0:5 >=kde-apps/kaccounts-integration-15.12.3:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 net-im/telepathy-connection-managers[xmpp] net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-3 !kde-apps/kaccounts-providers:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kaccounts-providers-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a15d8996b49e0fca7c79dd3bfb731870
diff --git a/metadata/md5-cache/kde-apps/kalgebra-15.12.3 b/metadata/md5-cache/kde-apps/kalgebra-15.12.3
index 30d3a6de0d6e..53c31f0aa516 100644
--- a/metadata/md5-cache/kde-apps/kalgebra-15.12.3
+++ b/metadata/md5-cache/kde-apps/kalgebra-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/analitza-15.12.3:5[opengl?] >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwebkit-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 opengl? ( >=dev-qt/qtopengl-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 virtual/glu ) readline? ( sys-libs/readline:0= ) !kde-apps/analitza:4 >=kde-frameworks/kf-env-3 !kde-apps/kalgebra:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kalgebra-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b94116fa7f7d1c51833ef8df66a6045c
diff --git a/metadata/md5-cache/kde-apps/kamera-15.12.3 b/metadata/md5-cache/kde-apps/kamera-15.12.3
index 0ebc41aa2d91..3c46d9015596 100644
--- a/metadata/md5-cache/kde-apps/kamera-15.12.3
+++ b/metadata/md5-cache/kde-apps/kamera-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-3 !kde-apps/kamera:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kamera-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7cafd1fddd9bd946e9ddf4e527283f7c
diff --git a/metadata/md5-cache/kde-apps/kanagram-15.12.3 b/metadata/md5-cache/kde-apps/kanagram-15.12.3
index 619d3a8006af..c48d4f3ff75c 100644
--- a/metadata/md5-cache/kde-apps/kanagram-15.12.3
+++ b/metadata/md5-cache/kde-apps/kanagram-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/sonnet-5.18.0:5 >=kde-apps/libkeduvocdocument-15.12.3:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 media-libs/phonon[qt5] >=kde-apps/kdeedu-data-15.12.3:5 >=dev-qt/qtmultimedia-5.5.1:5[qml] >=dev-qt/qtquickcontrols-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kanagram:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kanagram-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8924ecc0f22394a1a061e1bbe2efdbe0
diff --git a/metadata/md5-cache/kde-apps/kapman-15.12.3 b/metadata/md5-cache/kde-apps/kapman-15.12.3
index 0f8bc41b88e3..39ae0e5c4980 100644
--- a/metadata/md5-cache/kde-apps/kapman-15.12.3
+++ b/metadata/md5-cache/kde-apps/kapman-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kapman:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kapman-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=28bd75fad8aed58c1bba57032c16196b
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-15.12.3 b/metadata/md5-cache/kde-apps/kapptemplate-15.12.3
index 3e0f47289dd6..e7193a30e2fe 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-15.12.3
+++ b/metadata/md5-cache/kde-apps/kapptemplate-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kapptemplate:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kapptemplate-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0ed72744e3497731930cc1aa0a0854d6
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-15.12.3-r1 b/metadata/md5-cache/kde-apps/kapptemplate-15.12.3-r1
index 9c9355660789..c8a5dd24711c 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kapptemplate-15.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/krunner-5.21.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kapptemplate:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kapptemplate-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=89cfded4b6627983dc2503421b164aab
diff --git a/metadata/md5-cache/kde-apps/kate-15.12.3 b/metadata/md5-cache/kde-apps/kate-15.12.3
index f03d0589fa4a..15cc1a652694 100644
--- a/metadata/md5-cache/kde-apps/kate-15.12.3
+++ b/metadata/md5-cache/kde-apps/kate-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.18.0:5 >=kde-frameworks/kcodecs-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemmodels-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/kjobwidgets-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktexteditor-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtscript-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 addons? ( >=kde-frameworks/kbookmarks-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kwallet-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=kde-frameworks/threadweaver-5.18.0:5 >=dev-qt/qtsql-5.5.1:5 >=dev-libs/libgit2-0.22.0:= ) >=kde-frameworks/kf-env-3 !kde-apps/kate:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kate-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d1438569e5c9fe6853ce711464fb9ca0
diff --git a/metadata/md5-cache/kde-apps/katomic-15.12.3 b/metadata/md5-cache/kde-apps/katomic-15.12.3
index d816a112d365..d8ef74d6d4c2 100644
--- a/metadata/md5-cache/kde-apps/katomic-15.12.3
+++ b/metadata/md5-cache/kde-apps/katomic-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/katomic:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/katomic-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3f4a7f27c9dcbae3ba36287cb7ca75c1
diff --git a/metadata/md5-cache/kde-apps/kblackbox-15.12.3 b/metadata/md5-cache/kde-apps/kblackbox-15.12.3
index bcdf654816a7..aeeffcf04710 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-15.12.3
+++ b/metadata/md5-cache/kde-apps/kblackbox-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kblackbox:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kblackbox-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=296fabce9fe7bb0d0f80f1a134dfee41
diff --git a/metadata/md5-cache/kde-apps/kblocks-15.12.3-r1 b/metadata/md5-cache/kde-apps/kblocks-15.12.3-r1
index 42575f02900a..d4a211c47b79 100644
--- a/metadata/md5-cache/kde-apps/kblocks-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kblocks-15.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/kblocks:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kblocks-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=23fe065ea0d9f122293f70f4532c2881
diff --git a/metadata/md5-cache/kde-apps/kbounce-15.12.3 b/metadata/md5-cache/kde-apps/kbounce-15.12.3
index 30381de8b962..0dad2375635c 100644
--- a/metadata/md5-cache/kde-apps/kbounce-15.12.3
+++ b/metadata/md5-cache/kde-apps/kbounce-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kbounce:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kbounce-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e60518811e4666b0135c2cbd7732f124
diff --git a/metadata/md5-cache/kde-apps/kbreakout-15.12.3 b/metadata/md5-cache/kde-apps/kbreakout-15.12.3
index 504c0eaf3c2c..b882fb86c57f 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-15.12.3
+++ b/metadata/md5-cache/kde-apps/kbreakout-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kbreakout:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kbreakout-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5edb5e2a1904e02dd697ca4c786cbb2e
diff --git a/metadata/md5-cache/kde-apps/kbruch-15.12.3-r1 b/metadata/md5-cache/kde-apps/kbruch-15.12.3-r1
index 13db0db541a7..00748994867a 100644
--- a/metadata/md5-cache/kde-apps/kbruch-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kbruch-15.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kbruch:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kbruch-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9b12f6dad29efce5bb794a009ccedbdf
diff --git a/metadata/md5-cache/kde-apps/kcalc-15.12.3 b/metadata/md5-cache/kde-apps/kcalc-15.12.3
index 6a9260e885cc..e42a0a03be32 100644
--- a/metadata/md5-cache/kde-apps/kcalc-15.12.3
+++ b/metadata/md5-cache/kde-apps/kcalc-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 dev-libs/gmp:0= >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kcalc:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kcalc-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=053b1ee8e25c4c3d726ea1e45b14df6e
diff --git a/metadata/md5-cache/kde-apps/kcalc-15.12.3-r1 b/metadata/md5-cache/kde-apps/kcalc-15.12.3-r1
index b50feda5f19c..dc02facda9c0 100644
--- a/metadata/md5-cache/kde-apps/kcalc-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kcalc-15.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 dev-libs/gmp:0= >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kcalc:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kcalc-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f0df0aa3a0086943ebce3c61f991c2ed
diff --git a/metadata/md5-cache/kde-apps/kcharselect-15.12.3 b/metadata/md5-cache/kde-apps/kcharselect-15.12.3
index 0465f583b965..abf83eb50cfe 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-15.12.3
+++ b/metadata/md5-cache/kde-apps/kcharselect-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kcharselect:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kcharselect-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dfa26c55ceab0004df66831687d744a5
diff --git a/metadata/md5-cache/kde-apps/kcron-15.12.3 b/metadata/md5-cache/kde-apps/kcron-15.12.3
index 06b3606b5475..383397a80932 100644
--- a/metadata/md5-cache/kde-apps/kcron-15.12.3
+++ b/metadata/md5-cache/kde-apps/kcron-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-3 !kde-apps/kcron:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kcron-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=777c56807b0e88441ed338a778460cb3
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-15.12.3 b/metadata/md5-cache/kde-apps/kde-dev-scripts-15.12.3
index 6f444322722e..56dc1d0ffae0 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-15.12.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-3 !kde-apps/kde-dev-scripts:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kde-dev-scripts-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b6715b5d526ec699ca0784eb13c75079
diff --git a/metadata/md5-cache/kde-apps/kde-l10n-15.12.3-r1 b/metadata/md5-cache/kde-apps/kde-l10n-15.12.3-r1
index ae741de4cdb3..bb855302b6c9 100644
--- a/metadata/md5-cache/kde-apps/kde-l10n-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kde-l10n-15.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde4-l10n-15.12.3 !kde-apps/kde4-l10n[-minimal] !<kde-apps/kdepim-l10n-15.12.3:5 !<kde-apps/khelpcenter-5.5.5-r1 !=kde-apps/khelpcenter-5.6.2 !<kde-apps/ktp-l10n-15.12.3 >=kde-frameworks/kf-env-3 !kde-apps/kde-l10n:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.2/khelpcenter-5.6.2.tar.xz linguas_ar? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ar-15.12.3.tar.xz ) linguas_bg? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-bg-15.12.3.tar.xz ) linguas_bs? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-bs-15.12.3.tar.xz ) linguas_ca? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ca-15.12.3.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ca@valencia-15.12.3.tar.xz ) linguas_cs? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-cs-15.12.3.tar.xz ) linguas_da? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-da-15.12.3.tar.xz ) linguas_de? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-de-15.12.3.tar.xz ) linguas_el? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-el-15.12.3.tar.xz ) linguas_en_GB? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-en_GB-15.12.3.tar.xz ) linguas_eo? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-eo-15.12.3.tar.xz ) linguas_es? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-es-15.12.3.tar.xz ) linguas_et? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-et-15.12.3.tar.xz ) linguas_eu? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-eu-15.12.3.tar.xz ) linguas_fa? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fa-15.12.3.tar.xz ) linguas_fi? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fi-15.12.3.tar.xz ) linguas_fr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fr-15.12.3.tar.xz ) linguas_ga? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ga-15.12.3.tar.xz ) linguas_gl? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-gl-15.12.3.tar.xz ) linguas_he? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-he-15.12.3.tar.xz ) linguas_hi? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hi-15.12.3.tar.xz ) linguas_hr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hr-15.12.3.tar.xz ) linguas_hu? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hu-15.12.3.tar.xz ) linguas_ia? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ia-15.12.3.tar.xz ) linguas_id? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-id-15.12.3.tar.xz ) linguas_is? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-is-15.12.3.tar.xz ) linguas_it? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-it-15.12.3.tar.xz ) linguas_ja? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ja-15.12.3.tar.xz ) linguas_kk? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-kk-15.12.3.tar.xz ) linguas_km? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-km-15.12.3.tar.xz ) linguas_ko? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ko-15.12.3.tar.xz ) linguas_lt? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-lt-15.12.3.tar.xz ) linguas_lv? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-lv-15.12.3.tar.xz ) linguas_mr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-mr-15.12.3.tar.xz ) linguas_nb? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nb-15.12.3.tar.xz ) linguas_nds? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nds-15.12.3.tar.xz ) linguas_nl? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nl-15.12.3.tar.xz ) linguas_nn? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nn-15.12.3.tar.xz ) linguas_pa? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pa-15.12.3.tar.xz ) linguas_pl? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pl-15.12.3.tar.xz ) linguas_pt? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pt-15.12.3.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pt_BR-15.12.3.tar.xz ) linguas_ro? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ro-15.12.3.tar.xz ) linguas_ru? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ru-15.12.3.tar.xz ) linguas_sk? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sk-15.12.3.tar.xz ) linguas_sl? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sl-15.12.3.tar.xz ) linguas_sr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sr-15.12.3.tar.xz ) linguas_sv? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sv-15.12.3.tar.xz ) linguas_tr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-tr-15.12.3.tar.xz ) linguas_ug? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ug-15.12.3.tar.xz ) linguas_uk? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-uk-15.12.3.tar.xz ) linguas_wa? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-wa-15.12.3.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-zh_CN-15.12.3.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-zh_TW-15.12.3.tar.xz )
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=73fe53cf84f2d77199bf47fd67f97d42
diff --git a/metadata/md5-cache/kde-apps/kde-wallpapers-15.08.3-r2 b/metadata/md5-cache/kde-apps/kde-wallpapers-15.08.3-r2
index ea0f5216e51d..f946a948f215 100644
--- a/metadata/md5-cache/kde-apps/kde-wallpapers-15.08.3-r2
+++ b/metadata/md5-cache/kde-apps/kde-wallpapers-15.08.3-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-apps/kde-wallpapers:4
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kde-wallpapers-15.08.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=05776798749648796d2bc71bbc4d48c8
diff --git a/metadata/md5-cache/kde-apps/kdeartwork-wallpapers-15.08.3-r2 b/metadata/md5-cache/kde-apps/kdeartwork-wallpapers-15.08.3-r2
index 48a255e0c872..5750e56ea3db 100644
--- a/metadata/md5-cache/kde-apps/kdeartwork-wallpapers-15.08.3-r2
+++ b/metadata/md5-cache/kde-apps/kdeartwork-wallpapers-15.08.3-r2
@@ -9,5 +9,5 @@ RDEPEND=!kde-apps/kdeartwork-wallpapers:4
 RESTRICT=binchecks strip
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kdeartwork-15.08.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=88188318aed6b644d521c7bf25f5946e
diff --git a/metadata/md5-cache/kde-apps/kdeartwork-weatherwallpapers-15.08.3-r2 b/metadata/md5-cache/kde-apps/kdeartwork-weatherwallpapers-15.08.3-r2
index 6cfcdef66261..71549cc726b8 100644
--- a/metadata/md5-cache/kde-apps/kdeartwork-weatherwallpapers-15.08.3-r2
+++ b/metadata/md5-cache/kde-apps/kdeartwork-weatherwallpapers-15.08.3-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdeartwork-wallpapers-15.08.3:5 !kde-apps/kdeartwork-weatherwallpapers:4
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kdeartwork-15.08.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d11f6794a43cc7f99f35a1723a9d8d25
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-15.12.3 b/metadata/md5-cache/kde-apps/kdebugsettings-15.12.3
index 939142b7db83..29c80804c32c 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-15.12.3
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-15.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kdebugsettings-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ad7e60faaf5fa020625b3bbab9c738b2
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-15.12.3-r1 b/metadata/md5-cache/kde-apps/kdeedu-data-15.12.3-r1
index 053d45d7a7ed..75edca378dc3 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-15.12.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-apps/libkdeedu:4
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kdeedu-data-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=df0cae5e966068b66a16888dadd12520
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-15.12.3 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-15.12.3
index b1057117b6aa..7cdc7840f4eb 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-15.12.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kdenetwork-filesharing:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kdenetwork-filesharing-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7cbbabd030711cc3e72ecc6b24458a44
diff --git a/metadata/md5-cache/kde-apps/kdenlive-15.12.3 b/metadata/md5-cache/kde-apps/kdenlive-15.12.3
index 28e01ccc1eed..887baedbb56c 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-15.12.3
+++ b/metadata/md5-cache/kde-apps/kdenlive-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kbookmarks-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/kjobwidgets-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/kplotting-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/solid-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5[gles2=] >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtscript-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=media-libs/mlt-0.9.8-r1[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-3 !kde-apps/kdenlive:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kdenlive-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ff3d68cabe1d1a534a66363badf8bd47
diff --git a/metadata/md5-cache/kde-apps/kdepim-l10n-15.12.3 b/metadata/md5-cache/kde-apps/kdepim-l10n-15.12.3
index 3058485a3195..15d8b72264a0 100644
--- a/metadata/md5-cache/kde-apps/kdepim-l10n-15.12.3
+++ b/metadata/md5-cache/kde-apps/kdepim-l10n-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-l10n-15.08.0-r1 !<kde-apps/kde4-l10n-4.14.3-r1 !kde-base/kdepim-l10n >=kde-frameworks/kf-env-3 !kde-apps/kdepim-l10n:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=linguas_ar? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ar-15.12.3.tar.xz ) linguas_bg? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-bg-15.12.3.tar.xz ) linguas_bs? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-bs-15.12.3.tar.xz ) linguas_ca? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ca-15.12.3.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ca@valencia-15.12.3.tar.xz ) linguas_cs? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-cs-15.12.3.tar.xz ) linguas_da? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-da-15.12.3.tar.xz ) linguas_de? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-de-15.12.3.tar.xz ) linguas_el? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-el-15.12.3.tar.xz ) linguas_en_GB? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-en_GB-15.12.3.tar.xz ) linguas_eo? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-eo-15.12.3.tar.xz ) linguas_es? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-es-15.12.3.tar.xz ) linguas_et? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-et-15.12.3.tar.xz ) linguas_eu? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-eu-15.12.3.tar.xz ) linguas_fa? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fa-15.12.3.tar.xz ) linguas_fi? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fi-15.12.3.tar.xz ) linguas_fr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fr-15.12.3.tar.xz ) linguas_ga? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ga-15.12.3.tar.xz ) linguas_gl? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-gl-15.12.3.tar.xz ) linguas_he? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-he-15.12.3.tar.xz ) linguas_hi? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hi-15.12.3.tar.xz ) linguas_hr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hr-15.12.3.tar.xz ) linguas_hu? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hu-15.12.3.tar.xz ) linguas_ia? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ia-15.12.3.tar.xz ) linguas_id? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-id-15.12.3.tar.xz ) linguas_is? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-is-15.12.3.tar.xz ) linguas_it? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-it-15.12.3.tar.xz ) linguas_ja? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ja-15.12.3.tar.xz ) linguas_kk? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-kk-15.12.3.tar.xz ) linguas_km? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-km-15.12.3.tar.xz ) linguas_ko? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ko-15.12.3.tar.xz ) linguas_lt? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-lt-15.12.3.tar.xz ) linguas_lv? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-lv-15.12.3.tar.xz ) linguas_mr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-mr-15.12.3.tar.xz ) linguas_nb? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nb-15.12.3.tar.xz ) linguas_nds? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nds-15.12.3.tar.xz ) linguas_nl? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nl-15.12.3.tar.xz ) linguas_nn? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nn-15.12.3.tar.xz ) linguas_pa? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pa-15.12.3.tar.xz ) linguas_pl? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pl-15.12.3.tar.xz ) linguas_pt? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pt-15.12.3.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pt_BR-15.12.3.tar.xz ) linguas_ro? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ro-15.12.3.tar.xz ) linguas_ru? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ru-15.12.3.tar.xz ) linguas_sk? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sk-15.12.3.tar.xz ) linguas_sl? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sl-15.12.3.tar.xz ) linguas_sr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sr-15.12.3.tar.xz ) linguas_sv? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sv-15.12.3.tar.xz ) linguas_tr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-tr-15.12.3.tar.xz ) linguas_ug? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ug-15.12.3.tar.xz ) linguas_uk? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-uk-15.12.3.tar.xz ) linguas_wa? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-wa-15.12.3.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-zh_CN-15.12.3.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-zh_TW-15.12.3.tar.xz )
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=742c3dc98cf80eed87a28952a5074abb
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-15.12.3 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-15.12.3
index 28cb91fd6e39..362199036ccb 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-15.12.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 sys-devel/gettext >=kde-frameworks/kf-env-3 !kde-apps/kdesdk-thumbnailers:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kdesdk-thumbnailers-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a323c60693148c0937354045791021de
diff --git a/metadata/md5-cache/kde-apps/kdiamond-15.12.3 b/metadata/md5-cache/kde-apps/kdiamond-15.12.3
index c80f0c17e470..33fff1fbee73 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-15.12.3
+++ b/metadata/md5-cache/kde-apps/kdiamond-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kdiamond:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kdiamond-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3e5ffe5cb0801e85077f69e34f26e4df
diff --git a/metadata/md5-cache/kde-apps/kfourinline-15.12.3-r1 b/metadata/md5-cache/kde-apps/kfourinline-15.12.3-r1
index daf322b4766a..9b4ec790535b 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kfourinline-15.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/kdnssd-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kfourinline:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kfourinline-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a6226102c07be105540d647895206908
diff --git a/metadata/md5-cache/kde-apps/kgeography-15.12.3 b/metadata/md5-cache/kde-apps/kgeography-15.12.3
index 3f98fbdb147b..c545ab209fc3 100644
--- a/metadata/md5-cache/kde-apps/kgeography-15.12.3
+++ b/metadata/md5-cache/kde-apps/kgeography-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kgeography:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kgeography-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=73c8d7015224dbc2068c25324e8e91cd
diff --git a/metadata/md5-cache/kde-apps/khangman-15.12.3 b/metadata/md5-cache/kde-apps/khangman-15.12.3
index a9230db499fa..6f0a7bf990dd 100644
--- a/metadata/md5-cache/kde-apps/khangman-15.12.3
+++ b/metadata/md5-cache/kde-apps/khangman-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkeduvocdocument-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 media-libs/phonon[qt5] >=kde-apps/kdeedu-data-15.12.3:5 >=kde-frameworks/kf-env-3 !kde-apps/khangman:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/khangman-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fbfaefa2ffc1cf47c319e1fe4db7809a
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-5.5.5 b/metadata/md5-cache/kde-apps/khelpcenter-5.5.5
index 8ef25d7407be..27e03fd76e26 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-5.5.5
+++ b/metadata/md5-cache/kde-apps/khelpcenter-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcodecs-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/khtml-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kinit-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-plasma/kde-cli-tools-5.4.1:5 >=kde-frameworks/kf-env-3 !kde-apps/khelpcenter:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/khelpcenter-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6bb37cb310efba24a672faea1945662b
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-5.5.5-r1 b/metadata/md5-cache/kde-apps/khelpcenter-5.5.5-r1
index 51379db508ae..dc3275f154f9 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-5.5.5-r1
+++ b/metadata/md5-cache/kde-apps/khelpcenter-5.5.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcodecs-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/khtml-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kinit-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-plasma/kde-cli-tools-5.4.1:5 >=kde-frameworks/kf-env-3 !kde-apps/khelpcenter:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/khelpcenter-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4661c705af5b3d9eb5521e7a85a15195
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-5.6.2-r1 b/metadata/md5-cache/kde-apps/khelpcenter-5.6.2-r1
index 2d0fd168f54e..15ab5e434753 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-5.6.2-r1
+++ b/metadata/md5-cache/kde-apps/khelpcenter-5.6.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcodecs-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/khtml-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kinit-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-plasma/kde-cli-tools-5.4.1:5 >=kde-frameworks/kf-env-3 !kde-apps/khelpcenter:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.2/khelpcenter-5.6.2.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ecddc9fa9016945de908eb4e4f2512c3
diff --git a/metadata/md5-cache/kde-apps/kig-15.12.3 b/metadata/md5-cache/kde-apps/kig-15.12.3
index 540ae0dbeb9f..e86f41a66d0e 100644
--- a/metadata/md5-cache/kde-apps/kig-15.12.3
+++ b/metadata/md5-cache/kde-apps/kig-15.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kig-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=305b11d870fe2ff6d96c7922ce8d749a
diff --git a/metadata/md5-cache/kde-apps/killbots-15.12.3 b/metadata/md5-cache/kde-apps/killbots-15.12.3
index b9436e2b77cb..989d458b5ec5 100644
--- a/metadata/md5-cache/kde-apps/killbots-15.12.3
+++ b/metadata/md5-cache/kde-apps/killbots-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/killbots:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/killbots-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ecbd33096a9f20de9b76b41051edbe6c
diff --git a/metadata/md5-cache/kde-apps/kio-extras-15.08.3 b/metadata/md5-cache/kde-apps/kio-extras-15.08.3
index 2cea03edac9c..cf3781ea6b6a 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-15.08.3
+++ b/metadata/md5-cache/kde-apps/kio-extras-15.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.18.0:5[bzip2,lzma] >=kde-frameworks/kbookmar
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kio-extras-15.08.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=163ad8b16ee2e517141f19ab890fb7c8
diff --git a/metadata/md5-cache/kde-apps/kio-extras-15.12.3 b/metadata/md5-cache/kde-apps/kio-extras-15.12.3
index f5602b59f64a..d8b9f6ff6a79 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-15.12.3
+++ b/metadata/md5-cache/kde-apps/kio-extras-15.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.18.0:5[bzip2,lzma] >=kde-frameworks/kbookmar
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kio-extras-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4ba8f653e63e518a59f235e959531444
diff --git a/metadata/md5-cache/kde-apps/kiriki-15.12.3 b/metadata/md5-cache/kde-apps/kiriki-15.12.3
index 3c1a69e53d41..53231d7680be 100644
--- a/metadata/md5-cache/kde-apps/kiriki-15.12.3
+++ b/metadata/md5-cache/kde-apps/kiriki-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kiriki:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kiriki-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b1d219b9a31ca6c94cebe88da91a24d7
diff --git a/metadata/md5-cache/kde-apps/kiten-15.12.3 b/metadata/md5-cache/kde-apps/kiten-15.12.3
index 3dafc571d3cf..93aef9808a02 100644
--- a/metadata/md5-cache/kde-apps/kiten-15.12.3
+++ b/metadata/md5-cache/kde-apps/kiten-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/khtml-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kiten:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kiten-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5dceb5af6c9ca9e566f6a702e141b794
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-15.12.3-r1 b/metadata/md5-cache/kde-apps/kjumpingcube-15.12.3-r1
index ffad33f9730a..aa52a193b75e 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-15.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kjumpingcube:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kjumpingcube-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=244c10ea881fe45c6cb444d1bbcf49bd
diff --git a/metadata/md5-cache/kde-apps/klettres-15.12.3 b/metadata/md5-cache/kde-apps/klettres-15.12.3
index 5745afae1349..0a4933d70751 100644
--- a/metadata/md5-cache/kde-apps/klettres-15.12.3
+++ b/metadata/md5-cache/kde-apps/klettres-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/klettres:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/klettres-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9771bef72273bb7363a96ddca708ac36
diff --git a/metadata/md5-cache/kde-apps/klickety-15.12.3 b/metadata/md5-cache/kde-apps/klickety-15.12.3
index 25c185f43727..43d03733ecab 100644
--- a/metadata/md5-cache/kde-apps/klickety-15.12.3
+++ b/metadata/md5-cache/kde-apps/klickety-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/klickety:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/klickety-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=95b151b842d3dc21109e2f3794c8b4de
diff --git a/metadata/md5-cache/kde-apps/klines-15.12.3 b/metadata/md5-cache/kde-apps/klines-15.12.3
index ed018e4eb404..64af8097e61f 100644
--- a/metadata/md5-cache/kde-apps/klines-15.12.3
+++ b/metadata/md5-cache/kde-apps/klines-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/klines:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/klines-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3792920ab4dc5ec81514a6d18f650122
diff --git a/metadata/md5-cache/kde-apps/kmines-15.12.3-r1 b/metadata/md5-cache/kde-apps/kmines-15.12.3-r1
index 00944deada6f..a658fe34657a 100644
--- a/metadata/md5-cache/kde-apps/kmines-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kmines-15.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kmines:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kmines-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7ca52322a080894f0c42d15b2a3d00fe
diff --git a/metadata/md5-cache/kde-apps/kmix-15.12.3 b/metadata/md5-cache/kde-apps/kmix-15.12.3
index ae9de3646205..ad4ad491e334 100644
--- a/metadata/md5-cache/kde-apps/kmix-15.12.3
+++ b/metadata/md5-cache/kde-apps/kmix-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.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-3 !kde-apps/kmix:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kmix-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5e8b83fb2d356980a8dd1bb355644c81
diff --git a/metadata/md5-cache/kde-apps/kmplot-15.12.3 b/metadata/md5-cache/kde-apps/kmplot-15.12.3
index b0109ed0c6c6..8054e17d345c 100644
--- a/metadata/md5-cache/kde-apps/kmplot-15.12.3
+++ b/metadata/md5-cache/kde-apps/kmplot-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kmplot:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kmplot-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b1fe416742fa6b2077c0010d1b4b5ba6
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-15.12.3 b/metadata/md5-cache/kde-apps/knavalbattle-15.12.3
index f2df7e615828..a6a653bdbff5 100644
--- a/metadata/md5-cache/kde-apps/knavalbattle-15.12.3
+++ b/metadata/md5-cache/kde-apps/knavalbattle-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdnssd-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/knavalbattle:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/knavalbattle-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f3182f1c37dee0568c9c757639091e45
diff --git a/metadata/md5-cache/kde-apps/knetwalk-15.12.3-r1 b/metadata/md5-cache/kde-apps/knetwalk-15.12.3-r1
index 9da383279283..e3dda86d53f2 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/knetwalk-15.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/knetwalk:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/knetwalk-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e3e28cfe50c48320d2923d352601ff4b
diff --git a/metadata/md5-cache/kde-apps/kollision-15.12.3-r1 b/metadata/md5-cache/kde-apps/kollision-15.12.3-r1
index a350ff2433c2..345997cc6834 100644
--- a/metadata/md5-cache/kde-apps/kollision-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kollision-15.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kollision:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kollision-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0a512d60dd259d53b8aca7d1b3baff76
diff --git a/metadata/md5-cache/kde-apps/kompare-15.12.3 b/metadata/md5-cache/kde-apps/kompare-15.12.3
index adcbf46b630b..ba1949c76b19 100644
--- a/metadata/md5-cache/kde-apps/kompare-15.12.3
+++ b/metadata/md5-cache/kde-apps/kompare-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kcodecs-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kjobwidgets-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktexteditor-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkomparediff2-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kompare:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kompare-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5f462c55cf4d845883c813356918a469
diff --git a/metadata/md5-cache/kde-apps/konsole-15.12.3 b/metadata/md5-cache/kde-apps/konsole-15.12.3
index b0b5d9d86560..4d6981801054 100644
--- a/metadata/md5-cache/kde-apps/konsole-15.12.3
+++ b/metadata/md5-cache/kde-apps/konsole-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/kjobwidgets-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kinit-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kpty-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtscript-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-3 !kde-apps/konsole:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/konsole-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fe3ef3e064fdaacf1c04073dbb1458e8
diff --git a/metadata/md5-cache/kde-apps/kpat-15.12.3-r1 b/metadata/md5-cache/kde-apps/kpat-15.12.3-r1
index 505c27ed85ab..e5a14c8ee235 100644
--- a/metadata/md5-cache/kde-apps/kpat-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kpat-15.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-3 !kde-apps/kpat:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kpat-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a38a749091a627e25e74329d11e8b313
diff --git a/metadata/md5-cache/kde-apps/krfb-15.12.3 b/metadata/md5-cache/kde-apps/krfb-15.12.3
index c8e9f0a4503b..bafa32f6b37d 100644
--- a/metadata/md5-cache/kde-apps/krfb-15.12.3
+++ b/metadata/md5-cache/kde-apps/krfb-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdnssd-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwallet-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.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-3 !kde-apps/krfb:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/krfb-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=943593d6852dc0ac8fd5760254f274c1
diff --git a/metadata/md5-cache/kde-apps/kruler-15.12.3 b/metadata/md5-cache/kde-apps/kruler-15.12.3
index 6527bd032b77..aa22c4adc7ff 100644
--- a/metadata/md5-cache/kde-apps/kruler-15.12.3
+++ b/metadata/md5-cache/kde-apps/kruler-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 X? ( >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-3 !kde-apps/kruler:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kruler-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b6df010eec6c9139d081b490a6506e3e
diff --git a/metadata/md5-cache/kde-apps/kshisen-15.12.3 b/metadata/md5-cache/kde-apps/kshisen-15.12.3
index 9ba140a49029..1b729b35bf7c 100644
--- a/metadata/md5-cache/kde-apps/kshisen-15.12.3
+++ b/metadata/md5-cache/kde-apps/kshisen-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=kde-apps/libkmahjongg-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kshisen:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kshisen-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a9ab3118d0b5461905019270822506a6
diff --git a/metadata/md5-cache/kde-apps/ksquares-15.12.3 b/metadata/md5-cache/kde-apps/ksquares-15.12.3
index f13f52b1bf02..87a9960864cd 100644
--- a/metadata/md5-cache/kde-apps/ksquares-15.12.3
+++ b/metadata/md5-cache/kde-apps/ksquares-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/ksquares:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ksquares-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=002852abcb6e6d88718733873e916751
diff --git a/metadata/md5-cache/kde-apps/kstars-15.12.3 b/metadata/md5-cache/kde-apps/kstars-15.12.3
index cf42c71df5cd..4a397b0f49ea 100644
--- a/metadata/md5-cache/kde-apps/kstars-15.12.3
+++ b/metadata/md5-cache/kde-apps/kstars-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kinit-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kplotting-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=sci-libs/cfitsio-0.390 sys-libs/zlib indi? ( >=kde-frameworks/knotifications-5.18.0:5 >=sci-libs/indilib-1.0.0 ) wcs? ( sci-astronomy/wcslib ) xplanet? ( x11-misc/xplanet ) >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=kde-frameworks/kf-env-3 !kde-apps/kstars:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kstars-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ba5428095cdfa3a3fa9b0a3798d13de4
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-15.12.3 b/metadata/md5-cache/kde-apps/ksystemlog-15.12.3
index 0b733e17107e..dfe0f24204d8 100644
--- a/metadata/md5-cache/kde-apps/ksystemlog-15.12.3
+++ b/metadata/md5-cache/kde-apps/ksystemlog-15.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ksystemlog-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fba85510525731ff59bee43aa43a82a9
diff --git a/metadata/md5-cache/kde-apps/kteatime-15.12.3 b/metadata/md5-cache/kde-apps/kteatime-15.12.3
index 62d50adc8e6d..aa282df8bd86 100644
--- a/metadata/md5-cache/kde-apps/kteatime-15.12.3
+++ b/metadata/md5-cache/kde-apps/kteatime-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kteatime:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kteatime-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3b0e499ee143dec5ff3542e0954cb32f
diff --git a/metadata/md5-cache/kde-apps/ktimer-15.12.3 b/metadata/md5-cache/kde-apps/ktimer-15.12.3
index 87287b7be566..c602fa5d1eae 100644
--- a/metadata/md5-cache/kde-apps/ktimer-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktimer-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/ktimer:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktimer-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4af0372749cec50d3d09758bf4c50c35
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-15.12.3 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-15.12.3
index 5339b92183e1..b4e29d96c959 100644
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-15.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcodecs-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-apps/kaccounts-integration-15.12.3:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5] >=kde-apps/kaccounts-providers-15.12.3:5 net-im/telepathy-connection-managers !kde-apps/ktp-accounts-kcm:4 >=kde-frameworks/kf-env-3 !kde-apps/ktp-accounts-kcm:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktp-accounts-kcm-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=00e060c44ee1946cd7836f5761ddf1e4
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-15.12.3 b/metadata/md5-cache/kde-apps/ktp-approver-15.12.3
index 9f1a132f8d34..828423888c53 100644
--- a/metadata/md5-cache/kde-apps/ktp-approver-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-approver-15.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 net-libs/telepathy-qt[qt5] >=kde-apps/ktp-contact-list-15.12.3:5 !kde-apps/ktp-approver:4 >=kde-frameworks/kf-env-3 !kde-apps/ktp-approver:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktp-approver-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b982c0099b58fc75a1f59bdc13977d0b
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-15.12.3 b/metadata/md5-cache/kde-apps/ktp-auth-handler-15.12.3
index 04530f11e568..f9263d68f9ca 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-15.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwallet-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-apps/kaccounts-integration-15.12.3:5 >=kde-apps/ktp-common-internals-15.12.3:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5] app-crypt/qca:2[openssl] !kde-apps/ktp-auth-handler:4 >=kde-frameworks/kf-env-3 !kde-apps/ktp-auth-handler:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktp-auth-handler-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2b01971604ae43262ce949bb707c893d
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-15.12.3 b/metadata/md5-cache/kde-apps/ktp-common-internals-15.12.3
index fbe75655e465..37112e1bf761 100644
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-15.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kpeople-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktexteditor-5.18.0:5 >=kde-frameworks/kwallet-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsql-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.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-15.12.3:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) !kde-apps/ktp-common-internals:4 >=kde-frameworks/kf-env-3 !kde-apps/ktp-common-internals:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktp-common-internals-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0dd06aa14c30e9aeeb16236df2b424e7
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-15.12.3 b/metadata/md5-cache/kde-apps/ktp-contact-list-15.12.3
index b226eda3172a..47a852de86bc 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kpeople-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/ktp-common-internals-15.12.3:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 net-libs/telepathy-qt[qt5] !kde-apps/ktp-contact-list:4 >=kde-frameworks/kf-env-3 !kde-apps/ktp-contact-list:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktp-contact-list-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1e3a95566f361d5f746f4af43712ec49
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-15.12.3 b/metadata/md5-cache/kde-apps/ktp-contact-runner-15.12.3
index 63b1e49e919e..ece784d6f70a 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-15.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/krunner-5.18.0:5 >=kde-apps/ktp-common-internals-15.12.3:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 net-libs/telepathy-qt[qt5] !kde-apps/ktp-contact-runner:4 >=kde-frameworks/kf-env-3 !kde-apps/ktp-contact-runner:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktp-contact-runner-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=139efb112171f7da47d9ce876a3e33d8
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-15.12.3 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-15.12.3
index 5587ead39da2..73e321fc16e8 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-15.12.3
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdeclarative-5.5.1:5 !kde-apps/ktp-desktop-applets:4 >=kde-frameworks/kf-env-3 !kde-apps/ktp-desktop-applets:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktp-desktop-applets-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b6fb761af0e5e12f53f81b605fcbc6f0
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-15.12.3 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-15.12.3
index 5bad05fbbdb9..2b78ad79eae0 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-apps/ktp-common-internals-15.12.3:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 net-libs/telepathy-qt[qt5] !kde-apps/ktp-filetransfer-handler:4 >=kde-frameworks/kf-env-3 !kde-apps/ktp-filetransfer-handler:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktp-filetransfer-handler-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=43440c4cb63b922a32f340d8a20e8c3b
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-15.12.3 b/metadata/md5-cache/kde-apps/ktp-kded-module-15.12.3
index 72c2afdf5c6e..89440d8d863c 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-15.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kidletime-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-apps/ktp-common-internals-15.12.3:5 >=dev-qt/qtconcurrent-5.5.1:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtsql-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 net-libs/telepathy-qt[qt5] >=kde-apps/signon-kwallet-extension-15.12.3:5 !kde-apps/ktp-kded-module:4 >=kde-frameworks/kf-env-3 !kde-apps/ktp-kded-module:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktp-kded-module-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6a2d95dccc2aaf900d49013169d7ce80
diff --git a/metadata/md5-cache/kde-apps/ktp-l10n-15.12.3 b/metadata/md5-cache/kde-apps/ktp-l10n-15.12.3
index d2bfb75fdcde..a1bca09862af 100644
--- a/metadata/md5-cache/kde-apps/ktp-l10n-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-l10n-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-l10n-15.08.0-r1 !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-send-file:4 !kde-apps/ktp-text-ui:4 >=kde-frameworks/kf-env-3 !kde-apps/ktp-l10n:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=linguas_ar? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ar-15.12.3.tar.xz ) linguas_bg? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-bg-15.12.3.tar.xz ) linguas_bs? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-bs-15.12.3.tar.xz ) linguas_ca? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ca-15.12.3.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ca@valencia-15.12.3.tar.xz ) linguas_cs? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-cs-15.12.3.tar.xz ) linguas_da? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-da-15.12.3.tar.xz ) linguas_de? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-de-15.12.3.tar.xz ) linguas_el? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-el-15.12.3.tar.xz ) linguas_en_GB? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-en_GB-15.12.3.tar.xz ) linguas_eo? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-eo-15.12.3.tar.xz ) linguas_es? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-es-15.12.3.tar.xz ) linguas_et? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-et-15.12.3.tar.xz ) linguas_eu? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-eu-15.12.3.tar.xz ) linguas_fa? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fa-15.12.3.tar.xz ) linguas_fi? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fi-15.12.3.tar.xz ) linguas_fr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fr-15.12.3.tar.xz ) linguas_ga? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ga-15.12.3.tar.xz ) linguas_gl? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-gl-15.12.3.tar.xz ) linguas_he? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-he-15.12.3.tar.xz ) linguas_hi? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hi-15.12.3.tar.xz ) linguas_hr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hr-15.12.3.tar.xz ) linguas_hu? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hu-15.12.3.tar.xz ) linguas_ia? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ia-15.12.3.tar.xz ) linguas_id? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-id-15.12.3.tar.xz ) linguas_is? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-is-15.12.3.tar.xz ) linguas_it? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-it-15.12.3.tar.xz ) linguas_ja? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ja-15.12.3.tar.xz ) linguas_kk? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-kk-15.12.3.tar.xz ) linguas_km? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-km-15.12.3.tar.xz ) linguas_ko? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ko-15.12.3.tar.xz ) linguas_lt? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-lt-15.12.3.tar.xz ) linguas_lv? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-lv-15.12.3.tar.xz ) linguas_mr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-mr-15.12.3.tar.xz ) linguas_nb? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nb-15.12.3.tar.xz ) linguas_nds? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nds-15.12.3.tar.xz ) linguas_nl? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nl-15.12.3.tar.xz ) linguas_nn? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nn-15.12.3.tar.xz ) linguas_pa? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pa-15.12.3.tar.xz ) linguas_pl? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pl-15.12.3.tar.xz ) linguas_pt? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pt-15.12.3.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pt_BR-15.12.3.tar.xz ) linguas_ro? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ro-15.12.3.tar.xz ) linguas_ru? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ru-15.12.3.tar.xz ) linguas_sk? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sk-15.12.3.tar.xz ) linguas_sl? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sl-15.12.3.tar.xz ) linguas_sr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sr-15.12.3.tar.xz ) linguas_sv? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sv-15.12.3.tar.xz ) linguas_tr? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-tr-15.12.3.tar.xz ) linguas_ug? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ug-15.12.3.tar.xz ) linguas_uk? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-uk-15.12.3.tar.xz ) linguas_wa? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-wa-15.12.3.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-zh_CN-15.12.3.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/applications/15.12.3/src/kde-l10n/kde-l10n-zh_TW-15.12.3.tar.xz )
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a005fd2fac3ad964a9b9e7bbef6672ac
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-15.12.3 b/metadata/md5-cache/kde-apps/ktp-send-file-15.12.3
index d01c532dafb1..57a9af2d6ed8 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-15.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-apps/ktp-common-internals-15.12.3:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 net-libs/telepathy-qt[qt5] >=kde-apps/ktp-contact-list-15.12.3:5 >=kde-apps/ktp-filetransfer-handler-15.12.3:5 !kde-apps/ktp-send-file:4 >=kde-frameworks/kf-env-3 !kde-apps/ktp-send-file:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktp-send-file-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7f8e4473adaa3fd8b0d7d7aa232de69e
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-15.12.3 b/metadata/md5-cache/kde-apps/ktp-text-ui-15.12.3
index 1e9752394df0..04290eefc769 100644
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-15.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.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdewebkit-5.18.0:5 >=kde-frameworks/kemoticons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/kpeople-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/sonnet-5.18.0:5 >=kde-apps/ktp-common-internals-15.12.3:5[otr] >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwebkit-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 net-libs/telepathy-qt[qt5] speech? ( >=dev-qt/qtspeech-5.5.1:5 ) >=kde-apps/ktp-contact-list-15.12.3:5 !kde-apps/ktp-text-ui:4 >=kde-frameworks/kf-env-3 !kde-apps/ktp-text-ui:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktp-text-ui-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f0c84ea5164c7f197595de2c22dbc132
diff --git a/metadata/md5-cache/kde-apps/ktuberling-15.12.3 b/metadata/md5-cache/kde-apps/ktuberling-15.12.3
index a35a01006240..bfb6337210e7 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktuberling-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/ktuberling:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktuberling-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=32db97f5d23dc81311ef1363b6760263
diff --git a/metadata/md5-cache/kde-apps/kturtle-15.12.3 b/metadata/md5-cache/kde-apps/kturtle-15.12.3
index 3330b413b123..cce47e6a046b 100644
--- a/metadata/md5-cache/kde-apps/kturtle-15.12.3
+++ b/metadata/md5-cache/kde-apps/kturtle-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kturtle:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kturtle-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dc35dabf24ec7dc620d7b55a815be976
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-15.12.3 b/metadata/md5-cache/kde-apps/kwalletmanager-15.12.3
index e52d32d83027..303d9d5313cc 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-15.12.3
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kauth-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcodecs-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwallet-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 !kde-apps/kwalletmanager:4[-minimal(-)] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kwalletmanager-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1183026170f07c53db3ef53dddeee549
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-15.12.3-r1 b/metadata/md5-cache/kde-apps/kwordquiz-15.12.3-r1
index af6f7d519873..4249d5e28601 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-15.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kwordquiz-15.12.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkeduvocdocument-15.12.3:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/kwordquiz:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kwordquiz-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5d07cc6022a3b5b2cefc73c2df2ec518
diff --git a/metadata/md5-cache/kde-apps/kwrite-15.12.3 b/metadata/md5-cache/kde-apps/kwrite-15.12.3
index 70308773e738..ee05a9b3901a 100644
--- a/metadata/md5-cache/kde-apps/kwrite-15.12.3
+++ b/metadata/md5-cache/kde-apps/kwrite-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kjobwidgets-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/ktexteditor-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kwrite:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kate-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=902e2f9e0d15b375bea97ad4521e3ce3
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-15.12.3 b/metadata/md5-cache/kde-apps/libkdcraw-15.12.3
index d38882dec1be..71f432eaf68e 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-15.12.3
+++ b/metadata/md5-cache/kde-apps/libkdcraw-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.5.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/libkdcraw-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9e2d7776dc0470febe1c0c1af120124e
diff --git a/metadata/md5-cache/kde-apps/libkdegames-15.12.3 b/metadata/md5-cache/kde-apps/libkdegames-15.12.3
index 9617abc5e96e..7f47ad7f3826 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-15.12.3
+++ b/metadata/md5-cache/kde-apps/libkdegames-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kbookmarks-5.18.0:5 >=kde-frameworks/kcodecs-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/kdnssd-5.18.0:5 >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/kjobwidgets-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdeclarative-5.5.1:5[widgets] >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/libkdegames-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=74a3b0c43a347f4371a74b9fc8e095ef
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-15.12.3 b/metadata/md5-cache/kde-apps/libkeduvocdocument-15.12.3
index 36e776365369..e48138598f96 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-15.12.3
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/libkeduvocdocument:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/libkeduvocdocument-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dc6b91be9652677cc76aeecccd5d38d1
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-15.12.3 b/metadata/md5-cache/kde-apps/libkexiv2-15.12.3
index e74f49885fe3..8a449b688b87 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-15.12.3
+++ b/metadata/md5-cache/kde-apps/libkexiv2-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.5.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/libkexiv2-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ca23066ba569a0c0b426f18454e10c17
diff --git a/metadata/md5-cache/kde-apps/libkface-15.12.3 b/metadata/md5-cache/kde-apps/libkface-15.12.3
index 4350da8d3aba..b9813a676825 100644
--- a/metadata/md5-cache/kde-apps/libkface-15.12.3
+++ b/metadata/md5-cache/kde-apps/libkface-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsql-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=media-libs/opencv-3:=[contrib] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/libkface-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=75cf515fe9795b0214dcaaeed2b87530
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-15.12.3 b/metadata/md5-cache/kde-apps/libkgeomap-15.12.3
index f5f9f159cf9d..ce84ff755494 100644
--- a/metadata/md5-cache/kde-apps/libkgeomap-15.12.3
+++ b/metadata/md5-cache/kde-apps/libkgeomap-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-apps/marble-15.12.3:5=[kde] >=dev-qt/qtconcurrent-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwebkit-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/libkgeomap:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/libkgeomap-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3f57e200d58579cb19df3443018a9a51
diff --git a/metadata/md5-cache/kde-apps/libkipi-15.12.3 b/metadata/md5-cache/kde-apps/libkipi-15.12.3
index 8887cfda6273..79c23db2c212 100644
--- a/metadata/md5-cache/kde-apps/libkipi-15.12.3
+++ b/metadata/md5-cache/kde-apps/libkipi-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 !kde-apps/libkipi:4[-minimal(-)] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/libkipi-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=65860aba6e21e3e457f47a5e80707bab
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-15.12.3 b/metadata/md5-cache/kde-apps/libkmahjongg-15.12.3
index 9f7cef28b38e..d4ffb362ae75 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-15.12.3
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/libkmahjongg-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5f2f4e6a84c398588f2767b1ee7da719
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-15.12.3 b/metadata/md5-cache/kde-apps/libkomparediff2-15.12.3
index d588810f17b0..14b91b25fc5a 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-15.12.3
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcodecs-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/libkomparediff2:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/libkomparediff2-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c5e72ddf837187d3475c4b4d5e80f573
diff --git a/metadata/md5-cache/kde-apps/libksane-15.12.3 b/metadata/md5-cache/kde-apps/libksane-15.12.3
index 5bdb1ba4d837..efaa25fb9f72 100644
--- a/metadata/md5-cache/kde-apps/libksane-15.12.3
+++ b/metadata/md5-cache/kde-apps/libksane-15.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwallet-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 media-gfx/sane-backends >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/libksane-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=60058b911cfec25ffecfb2516f59f17c
diff --git a/metadata/md5-cache/kde-apps/lokalize-15.12.3 b/metadata/md5-cache/kde-apps/lokalize-15.12.3
index 1f3a103aa023..0308c2786780 100644
--- a/metadata/md5-cache/kde-apps/lokalize-15.12.3
+++ b/metadata/md5-cache/kde-apps/lokalize-15.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/lokalize-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=beff6bb31df4613e89829d36b34d269c
diff --git a/metadata/md5-cache/kde-apps/marble-15.12.3 b/metadata/md5-cache/kde-apps/marble-15.12.3
index e750e9300703..11d87cb5cde8 100644
--- a/metadata/md5-cache/kde-apps/marble-15.12.3
+++ b/metadata/md5-cache/kde-apps/marble-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.5.1:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtopengl-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtscript-5.5.1:5 >=dev-qt/qtsql-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwebkit-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 gps? ( >=sci-geosciences/gpsd-2.95 ) kde? ( >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/krunner-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwallet-5.18.0:5 ) phonon? ( media-libs/phonon[qt5] ) shapefile? ( sci-libs/shapelib ) >=kde-frameworks/kf-env-3 !kde-apps/marble:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/marble-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dafda72ba4ddff9eb9acd0c34ca1867a
diff --git a/metadata/md5-cache/kde-apps/okteta-15.12.3 b/metadata/md5-cache/kde-apps/okteta-15.12.3
index 720c589a3f22..faece3a259fb 100644
--- a/metadata/md5-cache/kde-apps/okteta-15.12.3
+++ b/metadata/md5-cache/kde-apps/okteta-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcodecs-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kjobwidgets-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/designer-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtscript-5.5.1:5[scripttools] >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 crypt? ( app-crypt/qca:2[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/okteta:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/okteta-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=438a4f0d318ed5706beef666ca8590f8
diff --git a/metadata/md5-cache/kde-apps/parley-15.12.3 b/metadata/md5-cache/kde-apps/parley-15.12.3
index ff8d2bdc6832..472bdb3665e9 100644
--- a/metadata/md5-cache/kde-apps/parley-15.12.3
+++ b/metadata/md5-cache/kde-apps/parley-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkeduvocdocument-15.12.3:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/khtml-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kross-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/sonnet-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtconcurrent-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtmultimedia-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-15.12.3:5 >=kde-frameworks/kf-env-3 !kde-apps/parley:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/parley-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=804062bb02e29c13a1fdd7edb0f2cebd
diff --git a/metadata/md5-cache/kde-apps/picmi-15.12.3 b/metadata/md5-cache/kde-apps/picmi-15.12.3
index d2df3bce0a04..43e3f4299721 100644
--- a/metadata/md5-cache/kde-apps/picmi-15.12.3
+++ b/metadata/md5-cache/kde-apps/picmi-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libkdegames-15.12.3:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/picmi:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/picmi-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2aebc997dab97a48708f00c587c18bfb
diff --git a/metadata/md5-cache/kde-apps/poxml-15.12.3 b/metadata/md5-cache/kde-apps/poxml-15.12.3
index 71e892d9fb6f..767d41ed9c2a 100644
--- a/metadata/md5-cache/kde-apps/poxml-15.12.3
+++ b/metadata/md5-cache/kde-apps/poxml-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.5.1:5 sys-devel/gettext >=kde-frameworks/kf-env-3 !kde-apps/poxml:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/poxml-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b14f041a34b073973f1d98aecb863197
diff --git a/metadata/md5-cache/kde-apps/print-manager-15.12.3 b/metadata/md5-cache/kde-apps/print-manager-15.12.3
index 79de9ccac307..36d27c6cc541 100644
--- a/metadata/md5-cache/kde-apps/print-manager-15.12.3
+++ b/metadata/md5-cache/kde-apps/print-manager-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.4.1:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-3 !kde-apps/print-manager:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/print-manager-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0b42b29e947d48c2b9cd2ad0d94f4636
diff --git a/metadata/md5-cache/kde-apps/rocs-15.12.3 b/metadata/md5-cache/kde-apps/rocs-15.12.3
index 619ac4430076..8bf18a2e516a 100644
--- a/metadata/md5-cache/kde-apps/rocs-15.12.3
+++ b/metadata/md5-cache/kde-apps/rocs-15.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/rocs-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f8c10f4bd70a039b7cb51c283a56c6cc
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-15.12.3 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-15.12.3
index b8188a09d3e6..b708dd332aad 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-15.12.3
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-15.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kwallet-5.18.0:5 net-libs/signond >=kde-frameworks/kf-env-3 !kde-apps/signon-kwallet-extension:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/signon-kwallet-extension-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8b551047e417226ff034f06d58855ee8
diff --git a/metadata/md5-cache/kde-apps/spectacle-15.12.3 b/metadata/md5-cache/kde-apps/spectacle-15.12.3
index 5bfbffeedc0c..049633b8394d 100644
--- a/metadata/md5-cache/kde-apps/spectacle-15.12.3
+++ b/metadata/md5-cache/kde-apps/spectacle-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-plasma/libkscreen-5.4.1:5= >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-15.12.3:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-3 !kde-apps/spectacle:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/spectacle-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4790d833e11dbbf1fc40ea126ebe44f2
diff --git a/metadata/md5-cache/kde-apps/step-15.12.3 b/metadata/md5-cache/kde-apps/step-15.12.3
index 7ce31451533a..7d8de661855e 100644
--- a/metadata/md5-cache/kde-apps/step-15.12.3
+++ b/metadata/md5-cache/kde-apps/step-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/khtml-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kplotting-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtopengl-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 =dev-cpp/eigen-3.2*:3 sci-libs/cln gsl? ( >=sci-libs/gsl-1.9-r1 ) qalculate? ( >=sci-libs/libqalculate-0.9.5 ) >=kde-frameworks/kf-env-3 !kde-apps/step:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/step-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=95753c5026deebf1b429ac64f29b24fa
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-15.12.3 b/metadata/md5-cache/kde-apps/thumbnailers-15.12.3
index 834f23f23431..8b74b1a5c08c 100644
--- a/metadata/md5-cache/kde-apps/thumbnailers-15.12.3
+++ b/metadata/md5-cache/kde-apps/thumbnailers-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kio-5.18.0:5 >=kde-apps/libkdcraw-15.12.3:5 >=kde-apps/libkexiv2-15.12.3:5 >=dev-qt/qtgui-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/thumbnailers:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kdegraphics-thumbnailers-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d4e0b4f0c05f9b874b61b770b20487ed
diff --git a/metadata/md5-cache/kde-apps/umbrello-15.12.3 b/metadata/md5-cache/kde-apps/umbrello-15.12.3
index abd8e187d533..2eeda2738807 100644
--- a/metadata/md5-cache/kde-apps/umbrello-15.12.3
+++ b/metadata/md5-cache/kde-apps/umbrello-15.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdoctools-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kjobwidgets-5.18.0:5 >=kde-frameworks/ktexteditor-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kf-env-3 !kde-apps/umbrello:4 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/umbrello-15.12.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7172736413fc7dfb0c8309b95fb87a00
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.18.0 b/metadata/md5-cache/kde-frameworks/attica-5.18.0
index 886cc16a2495..2f9bf8e1deff 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtnetwork:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/attica-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e4174f2da676b2dc3d1f63852cb3bcf2
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.21.0 b/metadata/md5-cache/kde-frameworks/attica-5.21.0
index 1fe8002a0f11..1ef9c042bc79 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtnetwork-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/attica-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6b15bcc935637c319817603edc513c43
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.18.0 b/metadata/md5-cache/kde-frameworks/baloo-5.18.0
index e1446062f163..5611d913582d 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.18.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kcrash-5.18:5 >=kde-frameworks/kdbusaddons-5.18:5 >=kde-frameworks/kfilemetadata-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kidletime-5.18:5 >=kde-frameworks/kio-5.18:5 >=kde-frameworks/solid-5.18:5 >=dev-db/lmdb-0.9.17 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/baloo:4[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/baloo-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3c47c6da4fb40a344841eced05a22c40
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.21.0 b/metadata/md5-cache/kde-frameworks/baloo-5.21.0
index 6c8b9a9cff5d..c51cc5ec46f1 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.21.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kcrash-5.21:5 >=kde-frameworks/kdbusaddons-5.21:5 >=kde-frameworks/kfilemetadata-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kidletime-5.21:5 >=kde-frameworks/kio-5.21:5 >=kde-frameworks/solid-5.21:5 >=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !kde-base/baloo:4[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/baloo-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=40208d3605eafa6ce31c191534aa5e01
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.18.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.18.0
index 32f7f6706d55..25c327d2bed6 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 !kde-plasma/bluez-qt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/bluez-qt-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=75ee22af455f792af8d38c319c19304a
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.21.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.21.0
index 39720b8f93e8..c8fc89f653e3 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 !kde-plasma/bluez-qt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/bluez-qt-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=957bb6aed0a9882fcb4321fb3d1730a7
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.18.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.18.0
index 499b429e2398..6c0f3780ad37 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=!<kde-plasma/breeze-5.4.3:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/breeze-icons-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7cf261a6f458980a3e4ce21fa503d011
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.21.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.21.0
index 9ca24d1818cf..b604361f8662 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=!<kde-plasma/breeze-5.4.3:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/breeze-icons-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=12f6e0b27c9dd29f14ede07af49e67cd
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.18.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.18.0
index 48095b77fb8c..30d3b930c3eb 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.18.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/extra-cmake-modules-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bea4095a297e66b7a260e1a8d54fa4d9
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.21.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.21.0
index 034aa12224c6..c4e9cec4fac8 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.21.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/extra-cmake-modules-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2ff070d7a6bfbd0700bd3f5d394ae431
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.18.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.18.0
index 871e97b8f17e..21d73024d66a 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.18.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-plasma/oxygen-fonts-5.4.1:5 >=kde-frameworks/kcompletion-5.18:5 >=
 RESTRICT=test
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/frameworkintegration-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bb1cf351c0a68a0435a46fe0b100a439
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.21.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.21.0
index 1e8601a91882..0051e56f34fe 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-plasma/oxygen-fonts-5.4.1:5 >=kde-frameworks/kcompletion-5.21:5 >=
 RESTRICT=test
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/frameworkintegration-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7f73852a906e6c1cbe4320238f7b0e62
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.18.0-r1 b/metadata/md5-cache/kde-frameworks/kactivities-5.18.0-r1
index 727f93a40467..59da5b53252f 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.18.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.18.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.18:5 >=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kconfigwidgets-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kdbusaddons-5.18:5 >=kde-frameworks/kdeclarative-5.18:5 >=kde-frameworks/kglobalaccel-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kio-5.18:5 >=kde-frameworks/kservice-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 >=kde-frameworks/kwindowsystem-5.18:5 >=kde-frameworks/kxmlgui-5.18:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kactivities-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3629a32596a6ba681d1c490cda1a5dc9
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.21.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.21.0
index 6197a9c8ddbd..4bc6c22c2ed3 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.21.0
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kio-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5[widgets] >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsql-5.5.1:5 >=kde-plasma/kactivitymanagerd-5.4.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kactivities-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e14eb8d0eef3d3eb5e316cef504b91d0
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.21.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.21.0
index 48ecc459734b..7c1827ee2105 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtsql-5.5.1:5 >=kde-frameworks/kactivities-5.21:5 >=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kactivities-stats-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=40d473c03e2cca75d37a4f7749ef9988
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.18.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.18.0
index 7826a504a4f3..5e6f4d6d22a5 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.18.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.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kapidox-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b8baa883394dce7d3ffd694d51cffb59
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.21.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.21.0
index 2e7536036029..bd1190cd5652 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.21.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.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kapidox-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=81a26eb4825212538a230eb561b58290
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.18.0 b/metadata/md5-cache/kde-frameworks/karchive-5.18.0
index 97988360b591..9931bbbd49c3 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.18.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/karchive-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=309174f075c84de4b8911a9355912d54
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.21.0 b/metadata/md5-cache/kde-frameworks/karchive-5.21.0
index 28978bd856f2..e33b50df70a0 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.21.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/karchive-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e8b2ae042bdbd80ebe0601cef17db807
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.18.0 b/metadata/md5-cache/kde-frameworks/kauth-5.18.0
index 016e72573921..444c7b78e071 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.18.0
@@ -10,5 +10,5 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 policykit? ( sys-auth/polkit-qt[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kauth-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a4985e5c6fc4c99b30238f49712a6102
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.21.0 b/metadata/md5-cache/kde-frameworks/kauth-5.21.0
index 87b4af14c2d5..831cce674362 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.21.0
@@ -10,5 +10,5 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 policykit? ( sys-auth/polkit-qt[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kauth-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=088e1129fe865405dd35adf930133d94
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.18.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.18.0
index 69f2b3415931..ec56c64a32a8 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.18:5 >=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kiconthemes-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 >=kde-frameworks/kxmlgui-5.18:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kbookmarks-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=47ab59faa42aedd51c43581d6aca916d
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.21.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.21.0
index 500364205434..0dcf2402c072 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.21:5 >=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kiconthemes-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=kde-frameworks/kxmlgui-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kbookmarks-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cf99d1a9fff928415464ac093ac8d762
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.18.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.18.0
index 7cbed9e999b9..b1ff4a02d651 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.18:5 >=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kconfigwidgets-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kdeclarative-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kiconthemes-5.18:5 >=kde-frameworks/kitemviews-5.18:5 >=kde-frameworks/kservice-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 >=kde-frameworks/kxmlgui-5.18:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kcmutils-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=293ce50f5e60a0ed99777d4fcf439c05
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.21.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.21.0
index 40b3d4797633..5e54d9ec172c 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.21:5 >=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kconfigwidgets-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kdeclarative-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kiconthemes-5.21:5 >=kde-frameworks/kitemviews-5.21:5 >=kde-frameworks/kservice-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=kde-frameworks/kxmlgui-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kcmutils-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2e45e8f8833c1662bfcee0ea4a059367
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.18.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.18.0
index b76cf2161bd4..ec97e71b3b2c 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.18.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kcodecs-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9f3e1a6eb1c2336ee56099aecfb7bc24
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.21.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.21.0
index 5c11803b8f4e..5a5e4ff75b52 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.21.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kcodecs-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=35d63b5b9ef28d0f32746f40e16b7f15
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.18.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.18.0
index 8cd6d07e14ce..87c4c69b08d6 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.18.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kcompletion-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b454cb9683264a532b1d62f215c6a39d
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.21.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.21.0
index 0ee798733220..e9475cd7cf4d 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.21.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kcompletion-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d4d40347402bdb4dcae5964f24fe9f26
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.18.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.18.0
index 75b888d599cb..d750f841e130 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.18.0
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtgui:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l
 RESTRICT=test
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kconfig-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f4f7879f6cd0ce548d9dd754b9eb20c7
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.21.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.21.0
index ba31f202d1db..41f5f341fc16 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3
 RESTRICT=test
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kconfig-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=333b2c500a12ab3dd17a61d5c71e38b8
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.18.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.18.0
index f4276ce9ba48..b1e587fd4945 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.18:5 >=kde-frameworks/kcodecs-5.18:5 >=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kguiaddons-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !<kde-frameworks/kdelibs4support-5.3.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kconfigwidgets-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1521df1eb5cd7fe106bf0213d65d9a53
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.21.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.21.0
index 6f20f6415ed5..b1c63d3fa70c 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.21:5 >=kde-frameworks/kcodecs-5.21:5 >=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kguiaddons-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !<kde-frameworks/kdelibs4support-5.3.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kconfigwidgets-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=13310d7d6e57ae4b0327604418f6629d
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.18.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.18.0
index b9e8f4402e4c..c298dee8c12c 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtcore:5[icu] fam? ( virtual/fam ) !<kde-frameworks/kservice-5.2.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kcoreaddons-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a1fee8bec3a58a998bc22012ec951c24
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.21.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.21.0
index d63a6222edd3..6f922c867e57 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.5.1:5[icu] fam? ( virtual/fam ) !<kde-frameworks/kservice-5.2.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kcoreaddons-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ac76afe366c0516b987a8d667193e688
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.18.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.18.0
index 75b066c0c57b..da742daa1561 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.18.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kwindowsystem-5.18:
 RESTRICT=test
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kcrash-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c551d1fa426153609bb910ba4b307b2b
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.21.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.21.0
index a06cf23acd48..8ee4f03dee10 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kwindowsystem-5.21:
 RESTRICT=test
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kcrash-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bd505eaafaa8d6fc573044bde93d34b4
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.18.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.18.0
index b0b3b82aaad6..899037126d64 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtdbus:5 X? ( dev-qt/qtx11extras:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kdbusaddons-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9aaf5a8197b634e1d79c79e42c27a1ad
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.21.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.21.0
index 1bb2046a51ed..09e9f3328c35 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.5.1:5 X? ( >=dev-qt/qtx11extras-5.5.1:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kdbusaddons-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b128b0f666e95aa3b9e328abb5654a89
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.18.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.18.0
index 6fd052870130..ea72fd52b90c 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kglobalaccel-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kiconthemes-5.18:5 >=kde-frameworks/kio-5.18:5 >=kde-frameworks/kpackage-5.18:5 >=kde-frameworks/kservice-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 >=kde-frameworks/kwindowsystem-5.18:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libepoxy >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kdeclarative-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a4a8cdfc130a6fbcf956aa2e603c3030
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.21.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.21.0
index b6b0cb9cb0d8..b19fbbb60194 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kglobalaccel-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kiconthemes-5.21:5 >=kde-frameworks/kio-5.21:5 >=kde-frameworks/kpackage-5.21:5 >=kde-frameworks/kservice-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=kde-frameworks/kwindowsystem-5.21:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kdeclarative-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ebe6183f789198227f24064195bd9a4f
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.18.0 b/metadata/md5-cache/kde-frameworks/kded-5.18.0
index 14e9481edab7..c4bcd5fe4ab6 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kcrash-5.18:5 >=kde-frameworks/kdbusaddons-5.18:5 >=kde-frameworks/kinit-5.18:5 >=kde-frameworks/kservice-5.18:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kded-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=47a13140b97db72704089e0c5894409a
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.21.0 b/metadata/md5-cache/kde-frameworks/kded-5.21.0
index b5603c369d6e..066fd51ad7be 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kcrash-5.21:5 >=kde-frameworks/kdbusaddons-5.21:5 >=kde-frameworks/kinit-5.21:5 >=kde-frameworks/kservice-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kded-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=248e775c0ef0ef8295a131d4ebee1709
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.18.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.18.0
index fdcbe136488b..41a0eb854419 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.18.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.18:5 >=kde-frameworks/kcodecs-5.18:5 >=kde-fram
 RESTRICT=test
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/portingAids/kdelibs4support-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=252c62d84956b7d23490a504e0dd1281
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.21.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.21.0
index 3989db9562d1..b157ca028b7b 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.21:5 >=kde-frameworks/kcodecs-5.21:5 >=kde-fram
 RESTRICT=test
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/portingAids/kdelibs4support-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b43947ccce673102261b6b3668decec5
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.18.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.18.0
index 12a27d6f036e..a23a42922953 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 designer? ( dev-qt/designer:5 >=kde-frameworks/kcompletion-5.18:5 >=kde-frameworks/kconfigwidgets-5.18:5 >=kde-frameworks/kiconthemes-5.18:5 >=kde-frameworks/kio-5.18:5 >=kde-frameworks/kitemviews-5.18:5 >=kde-frameworks/kplotting-5.18:5 >=kde-frameworks/ktextwidgets-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 >=kde-frameworks/kxmlgui-5.18:5 >=kde-frameworks/sonnet-5.18:5 ) webkit? ( dev-qt/designer:5 dev-qt/qtgui:5 >=kde-frameworks/kdewebkit-5.18:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kdesignerplugin-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=32addf7c062f5b2ff77ff98bdcf1274a
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.21.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.21.0
index 923d3291e540..937d686ea509 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 designer? ( >=dev-qt/designer-5.5.1:5 >=kde-frameworks/kcompletion-5.21:5 >=kde-frameworks/kconfigwidgets-5.21:5 >=kde-frameworks/kiconthemes-5.21:5 >=kde-frameworks/kio-5.21:5 >=kde-frameworks/kitemviews-5.21:5 >=kde-frameworks/kplotting-5.21:5 >=kde-frameworks/ktextwidgets-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=kde-frameworks/kxmlgui-5.21:5 >=kde-frameworks/sonnet-5.21:5 ) webkit? ( >=dev-qt/designer-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=kde-frameworks/kdewebkit-5.21:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kdesignerplugin-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=11a4f0de5c71128ce72b4e8f9753d6e4
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.18.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.18.0
index d634f924b749..59e0284287a4 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kpty-5.18:5 >=kde-frameworks/kservice-5.18:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kdesu-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d934710ef8fab75093232505bdff5d28
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.21.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.21.0
index 5704fa024f19..a2af3b0d6885 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kpty-5.21:5 >=kde-frameworks/kservice-5.21:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kdesu-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=311127d4db974f487d9c6700426976a4
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.18.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.18.0
index d872e29b7e59..abfb32c3d06a 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kio-5.18:5 >=kde-frameworks/kjobwidgets-5.18:5 >=kde-frameworks/kparts-5.18:5 >=kde-frameworks/kservice-5.18:5 >=kde-frameworks/kwallet-5.18:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kdewebkit-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=94a4bd604c16d9977ed69f33a7005af3
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.21.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.21.0
index ddc4400d5d02..af4dcf49b717 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kio-5.21:5 >=kde-frameworks/kjobwidgets-5.21:5 >=kde-frameworks/kparts-5.21:5 >=kde-frameworks/kservice-5.21:5 >=kde-frameworks/kwallet-5.21:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwebkit-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kdewebkit-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bebf3909f34f89b239d1f2f2f067de38
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.18.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.18.0
index 1afadb4b89b4..49ce0dee0426 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtnetwork:5 zeroconf? ( dev-qt/qtdbus:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kdnssd-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=77c27bbd1ce68372a68c95ef81cf03e7
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.21.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.21.0
index 62d549e47461..21b3809d3efb 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.5.1:5 zeroconf? ( >=dev-qt/qtdbus-5.5.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kdnssd-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=63340e9890d75fce54b43bb4c4faeeb3
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.18.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.18.0
index f01447e607df..5e01b0f87c56 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.18.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.18:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kdoctools-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=24e5c1afffaff26320ef03bdc57d67ac
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.21.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.21.0
index 15b70f02bb53..b748117cb030 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.21.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.21:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kdoctools-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1768c3982cf2f5d8ce0e679f066b56ef
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.18.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.18.0
index 4c637b7f539f..5040813f0e0a 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.18.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.18:5 >=kde-frameworks/kconfig-5.18:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kemoticons-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=08bc0e576c1fcc66f6335fee4fbb4c7b
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.21.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.21.0
index f76220b24587..168dbd6e4fb6 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.21:5 >=kde-frameworks/kconfig-5.21:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kemoticons-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=093e2b88598d45fb1f4ee6ae4be7e68d
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.18.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.18.0
index 550c6924dc12..0f59bf9d0200 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.18.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18:5 >=kde-frameworks/ki18n-5.18:5 dev-qt/qtxml:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kfilemetadata-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=017d0becdbdb9795ca612f4a5821ce3b
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.21.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.21.0
index cceb21888e31..5338aacc819d 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.21.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=dev-qt/qtxml-5.5.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-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kfilemetadata-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=effd5b424c892513765effa432c62a97
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.18.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.18.0
index 6e36b2f6174c..06bcd3adb33b 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kcrash-5.18:5 >=kde-frameworks/kdbusaddons-5.18:5 >=kde-frameworks/kwindowsystem-5.18:5[X] dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms !<kde-plasma/plasma-workspace-5.2.0-r2 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kglobalaccel-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3076dbe47ac61ffe424d86637d0b0075
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.21.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.21.0
index e42e79ea51fd..52908d5d7a5c 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kcrash-5.21:5 >=kde-frameworks/kdbusaddons-5.21:5 >=kde-frameworks/kwindowsystem-5.21:5[X] >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms !<kde-plasma/plasma-workspace-5.2.0-r2 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kglobalaccel-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=44ce70b605e3d696204ef992275b6600
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.18.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.18.0
index 49d935842ad1..6051a96b2feb 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kguiaddons-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=aa19a32b57930a1a6d63f4ba49446df0
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.21.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.21.0
index 43c5737cd525..4ab87d6fc067 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kguiaddons-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=34fa2423e075db7368b2bab3f51681bf
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.18.0 b/metadata/md5-cache/kde-frameworks/khtml-5.18.0
index a0aa4714294a..b55aec8baba7 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18:5 >=kde-frameworks/kcodecs-5.18:5 >=kde-frameworks/kcompletion-5.18:5 >=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kconfigwidgets-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kglobalaccel-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kiconthemes-5.18:5 >=kde-frameworks/kio-5.18:5 >=kde-frameworks/kjobwidgets-5.18:5 >=kde-frameworks/kjs-5.18:5 >=kde-frameworks/knotifications-5.18:5 >=kde-frameworks/kparts-5.18:5 >=kde-frameworks/kservice-5.18:5 >=kde-frameworks/ktextwidgets-5.18:5 >=kde-frameworks/kwallet-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 >=kde-frameworks/kwindowsystem-5.18:5 >=kde-frameworks/kxmlgui-5.18:5 >=kde-frameworks/sonnet-5.18:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5] sys-libs/zlib virtual/jpeg:0 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/portingAids/khtml-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=eceb7a24455f49afe08e5788a18fd5be
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.21.0 b/metadata/md5-cache/kde-frameworks/khtml-5.21.0
index 3c5b892636c6..70ffa45ef5e4 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.21:5 >=kde-frameworks/kcodecs-5.21:5 >=kde-frameworks/kcompletion-5.21:5 >=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kconfigwidgets-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kglobalaccel-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kiconthemes-5.21:5 >=kde-frameworks/kio-5.21:5 >=kde-frameworks/kjobwidgets-5.21:5 >=kde-frameworks/kjs-5.21:5 >=kde-frameworks/knotifications-5.21:5 >=kde-frameworks/kparts-5.21:5 >=kde-frameworks/kservice-5.21:5 >=kde-frameworks/ktextwidgets-5.21:5 >=kde-frameworks/kwallet-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=kde-frameworks/kwindowsystem-5.21:5 >=kde-frameworks/kxmlgui-5.21:5 >=kde-frameworks/sonnet-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5[ssl] >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5] sys-libs/zlib virtual/jpeg:0 X? ( >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/portingAids/khtml-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8e49550a1ea4331a81ced5ddfb09c304
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.18.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.18.0
index b578bf6882e2..aaaa9273f21a 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtscript:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/ki18n-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fc78669551c58eb27398913c81bf6886
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.21.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.21.0
index 23b625bc1dab..52298cb95fc4 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtscript-5.5.1:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/ki18n-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e8d9a554b362b6d52302d1ec03f65953
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.18.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.18.0
index df803c54a723..f96079718306 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kconfigwidgets-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kitemviews-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kiconthemes-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cf8976cbb6ee0f7b3163d694410c1b2c
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.21.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.21.0
index 79741f842c31..32d05001a006 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kconfigwidgets-5.21:5 >
 RESTRICT=test
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kiconthemes-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1baa7dc969df90760ef25553b25fd555
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.18.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.18.0
index 5b0ba84ae94d..d51807b19285 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libxcb >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kidletime-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e2eeef64c065987e156eb50656a63dcd
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.21.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.21.0
index 1ce6f16c5eb0..529dd3ba32de 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libxcb >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kidletime-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7dc23d25648669f85f298717c0606083
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.18.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.18.0
index 6c556fed45bc..ecb594833fb4 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 eps? ( dev-qt/qtprintsupport:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kimageformats-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=953295e59dab5a148fc651bd58b33241
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.21.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.21.0
index b99f72369cb2..489659dfc5f9 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.21:5 >=dev-qt/qtgui-5.5.1:5 eps? ( >=dev-qt/qtprintsupport-5.5.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kimageformats-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8da12e91308d1dd1588e1099ef61ba13
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.18.0 b/metadata/md5-cache/kde-frameworks/kinit-5.18.0
index 61c3b8b9769f..880a1fa7ae94 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kcrash-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kio-5.18:5 >=kde-frameworks/kservice-5.18:5 >=kde-frameworks/kwindowsystem-5.18:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 x11-libs/libX11 caps? ( sys-libs/libcap ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kinit-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0c13179f73f1656c785ef719f9e269a0
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.21.0 b/metadata/md5-cache/kde-frameworks/kinit-5.21.0
index b70458e7f2ae..133a9eee863a 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kcrash-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kio-5.21:5 >=kde-frameworks/kservice-5.21:5 >=kde-frameworks/kwindowsystem-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 x11-libs/libX11 x11-libs/libxcb caps? ( sys-libs/libcap ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kinit-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ad513bf4d764ecfb2f815e8c098334a6
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.18.0 b/metadata/md5-cache/kde-frameworks/kio-5.18.0
index 70b518ab3f73..c891a7efdd7d 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.18.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.18:5 >=kde-frameworks/kbookmarks-5.18:5 >=kd
 RESTRICT=test
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kio-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=46c03a886c80dce25c1e808175ba716f
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.21.0 b/metadata/md5-cache/kde-frameworks/kio-5.21.0
index 576ce4be12f2..9336d6b92068 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.21.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.21:5 >=kde-frameworks/kbookmarks-5.21:5 >=kd
 RESTRICT=test
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kio-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b950e6c5fc6e198a06fde1417fc4a7f0
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.18.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.18.0
index 825c0451e156..279f07746fe8 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kitemmodels-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e260438af1a245d1e10472e1607ea2f8
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.21.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.21.0
index 2a89f741e78b..b48d0a9db5d4 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kitemmodels-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8670a385f3dd52a801a1b9e668cc314f
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.18.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.18.0
index 708ea06f93b5..b3f6dec81f65 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kitemviews-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fa37129b70cbe4ea6c1a549238db4246
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.21.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.21.0
index d918d284970e..9f9f2918c774 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kitemviews-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5a32baed260515d6fc43b632c31add6c
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.18.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.18.0
index 0546b63bc576..9f947b28c016 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kjobwidgets-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b7bd007497a0da4cb1fcea4e500dd982
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.21.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.21.0
index 72cf6a920aa7..05f24f137232 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 X? ( >=dev-qt/qtx11extras-5.5.1:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kjobwidgets-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=75290eaf64f09d3a1ee951f9e0cc4434
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.18.0 b/metadata/md5-cache/kde-frameworks/kjs-5.18.0
index 6269da22ac6d..8277ac086b7b 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.18.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/portingAids/kjs-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3f766e525d0536d96c457af4b6bcd179
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.21.0 b/metadata/md5-cache/kde-frameworks/kjs-5.21.0
index cac9d1c8416f..c868d07b8f6d 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.21.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/portingAids/kjs-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6ad422c6483e39567e24287f1d3035fa
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.18.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.18.0
index d1a5e67f4a5e..c42cc0887d6c 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kjs-5.18:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/portingAids/kjsembed-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b4e129201c7a063d10dbc7ac661e7cb4
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.21.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.21.0
index f48ca0cbc41a..660e26c9f655 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kjs-5.21:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsvg-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/portingAids/kjsembed-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4b0dc53ff304b2d661f10961b2054c50
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.18.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.18.0
index bd7895846a33..47d1c51ac6d3 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.18.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.18:5 >=kde-frameworks/kxmlgui-5.18:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/portingAids/kmediaplayer-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6fed2b2a54770b0e40774b344eb9732d
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.21.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.21.0
index 77573183f745..463bb140b03a 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.21.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.21:5 >=kde-frameworks/kxmlgui-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/portingAids/kmediaplayer-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=47df75e36cef494f6d36d52220041fec
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.18.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.18.0
index 45b6952708c1..5ebcb6c8fa0c 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.18:5 >=kde-frameworks/karchive-5.18:5 >=kde-frameworks/kcompletion-5.18:5 >=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kiconthemes-5.18:5 >=kde-frameworks/kio-5.18:5 >=kde-frameworks/kitemviews-5.18:5 >=kde-frameworks/kservice-5.18:5 >=kde-frameworks/ktextwidgets-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 >=kde-frameworks/kxmlgui-5.18:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/knewstuff-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=708dd15c3afef3002b2a17618ad1bfe2
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.21.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.21.0
index 5450d368cbfb..f03054955636 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.21:5 >=kde-frameworks/karchive-5.21:5 >=kde-frameworks/kcompletion-5.21:5 >=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kiconthemes-5.21:5 >=kde-frameworks/kio-5.21:5 >=kde-frameworks/kitemviews-5.21:5 >=kde-frameworks/kservice-5.21:5 >=kde-frameworks/ktextwidgets-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=kde-frameworks/kxmlgui-5.21:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/knewstuff-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=283ea01e4bf11ed49809575e7806ab8a
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.18.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.18.0
index ba9969bf3e8c..dfa41ae47135 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.18:5 >=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kwindowsystem-5.18:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] dbus? ( dev-libs/libdbusmenu-qt[qt5] ) speech? ( dev-qt/qtspeech:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/knotifications-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d02bfbf9819f6e922602ba4d65356fc0
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.21.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.21.0
index 99d46f913d00..79c8ae199b02 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.21:5 >=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kwindowsystem-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 media-libs/phonon[qt5] dbus? ( dev-libs/libdbusmenu-qt[qt5] ) speech? ( >=dev-qt/qtspeech-5.5.1:5 ) X? ( >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/knotifications-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bc437cff8ff4f41bbd667b7f3d1b580a
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.18.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.18.0
index c371f69c1fba..5c4cbb67e492 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.18:5 >=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kio-5.18:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 phonon? ( media-libs/phonon[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/knotifyconfig-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=553763a3c2a0a17cd796ac7dc7753890
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.21.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.21.0
index 570511940155..d37290bcf11b 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.21:5 >=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kio-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 phonon? ( media-libs/phonon[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/knotifyconfig-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=15bb1a5b8f82d0dad89b0fad44fedf3e
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.18.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.18.0
index bf293239fa6d..db24bd1cde87 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.18:5 >=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kpackage-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=97235036b4eba05a4c6e3b6d411654d9
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.21.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.21.0
index 7d279f8de466..9cbdd5aa788d 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.21:5 >=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kpackage-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f486c8f81294c76b5fdcf8572ccf3c1e
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.18.0 b/metadata/md5-cache/kde-frameworks/kparts-5.18.0
index d7c9bf7ba807..2b9d2ac2c16a 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kiconthemes-5.18:5 >=kde-frameworks/kio-5.18:5 >=kde-frameworks/kjobwidgets-5.18:5 >=kde-frameworks/kservice-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 >=kde-frameworks/kxmlgui-5.18:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kparts-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5cb8e2642838dcfdc2e10913461f9b3e
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.21.0 b/metadata/md5-cache/kde-frameworks/kparts-5.21.0
index f63447abcddf..5afec2d0f1f6 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kiconthemes-5.21:5 >=kde-frameworks/kio-5.21:5 >=kde-frameworks/kjobwidgets-5.21:5 >=kde-frameworks/kservice-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=kde-frameworks/kxmlgui-5.21:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kparts-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4225df10f4f31f8a84715cd0b2b7fd44
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.18.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.18.0
index 81f6a9dbfca3..d740577f9230 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kitemviews-5.18:5 >=kde-frameworks/kservice-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !net-libs/kpeople:5 !net-libs/libkpeople[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kpeople-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cf0f9d7e011d43794d56aeb2ea5d0561
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.21.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.21.0
index 687d308ab9ca..0cc5ed1471c6 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kitemviews-5.21:5 >=kde-frameworks/kservice-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsql-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !net-libs/kpeople:5 !net-libs/libkpeople[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kpeople-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=99d0eae2553f0f05cdce9e81372b20b8
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.18.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.18.0
index c9c5015f00c2..7296b70f4fe0 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kplotting-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bf00c36469cf7efeecb21bdfa82b1c31
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.21.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.21.0
index f1238467453d..c27d3940cb20 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kplotting-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bd5411e87bcd692053c80e84ba92e8b0
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.18.0 b/metadata/md5-cache/kde-frameworks/kpty-5.18.0
index b3ac4d301878..26d9c70c11ad 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/ki18n-5.18:5 sys-libs/libutempter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kpty-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=320559b190f0aceea704b4a4c59c0b2f
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.21.0 b/metadata/md5-cache/kde-frameworks/kpty-5.21.0
index 27e718673698..7f6d9f24326d 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/ki18n-5.21:5 sys-libs/libutempter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kpty-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fa2384783ca9e338ed9422dff7f033da
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.18.0 b/metadata/md5-cache/kde-frameworks/kross-5.18.0
index e8d94744c124..ff6cb5079079 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kiconthemes-5.18:5 >=kde-frameworks/kio-5.18:5 >=kde-frameworks/kparts-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 >=kde-frameworks/kxmlgui-5.18:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/portingAids/kross-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8fb5dd4dfdacc31d5a0b8a67706d2f6f
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.21.0 b/metadata/md5-cache/kde-frameworks/kross-5.21.0
index 4fc12461edbd..2734009dff03 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kiconthemes-5.21:5 >=kde-frameworks/kio-5.21:5 >=kde-frameworks/kparts-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=kde-frameworks/kxmlgui-5.21:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtscript-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/portingAids/kross-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8136549d9080b5824ccd1aa01471b9fa
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.18.0 b/metadata/md5-cache/kde-frameworks/krunner-5.18.0
index 6f9d57e27bcd..9f3c26f6f067 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kio-5.18:5 >=kde-frameworks/kservice-5.18:5 >=kde-frameworks/plasma-5.18:5 >=kde-frameworks/solid-5.18:5 >=kde-frameworks/threadweaver-5.18:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/portingAids/krunner-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5984b110c876872e07489ee0c7667d1e
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.21.0 b/metadata/md5-cache/kde-frameworks/krunner-5.21.0
index fc3ba74d886d..bf72100c9a7c 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kio-5.21:5 >=kde-frameworks/kservice-5.21:5 >=kde-frameworks/plasma-5.21:5 >=kde-frameworks/solid-5.21:5 >=kde-frameworks/threadweaver-5.21:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !<kde-apps/kapptemplate-15.12.3-r1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/portingAids/krunner-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fc78a6022cf64e9396c6a307eda2789a
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.18.0 b/metadata/md5-cache/kde-frameworks/kservice-5.18.0
index f502d021e0f5..67a68364bfb4 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.18.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kd
 RESTRICT=test
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kservice-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f17e7e1fbcf62c54778784453d175293
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.21.0 b/metadata/md5-cache/kde-frameworks/kservice-5.21.0
index 056314419397..b8ef5694cd93 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kd
 RESTRICT=test
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kservice-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=22b01156618499a4ed820a8e611bfed4
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.18.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.18.0
index d6f526746a4e..e4a1ad4d16e1 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.18.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.18:5 >=kde-frameworks/kcodecs-5.18:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/ktexteditor-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=83ec2cdd6d9028db63bb51250f33cd39
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.21.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.21.0
index ad85a4befa40..c5a6262a65d2 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.21:5 >=kde-frameworks/kcodecs-5.21:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/ktexteditor-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=339c8e2a037d4cfb8c050d93c0ff3ec4
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.18.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.18.0
index 1068b751f5f9..56eaef13c040 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.18:5 >=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kconfigwidgets-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kiconthemes-5.18:5 >=kde-frameworks/kservice-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 >=kde-frameworks/kwindowsystem-5.18:5 >=kde-frameworks/sonnet-5.18:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 speech? ( dev-qt/qtspeech:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/ktextwidgets-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fb414dc6518f62d77fa45b262ac17b8d
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.21.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.21.0
index 388833f2e05d..738416ada356 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.21:5 >=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kconfigwidgets-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kiconthemes-5.21:5 >=kde-frameworks/kservice-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=kde-frameworks/kwindowsystem-5.21:5 >=kde-frameworks/sonnet-5.21:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 speech? ( >=dev-qt/qtspeech-5.5.1:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/ktextwidgets-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=717a3846ed4a8e6e30dfb88c3f5749f2
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.18.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.18.0
index e5cc0d2b139f..c164364ca7c9 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.18:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kunitconversion-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e774cf4ed8124909fde5286f954bd227
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.21.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.21.0
index 7029ee2a3171..52a06473889d 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.21:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kunitconversion-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=53ff98395f33b29b736921e3a9d8364e
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.18.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.18.0
index 0b9cee5fd0d3..0d110e0026ca 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kdbusaddons-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kiconthemes-5.18:5 >=kde-frameworks/knotifications-5.18:5 >=kde-frameworks/kservice-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 >=kde-frameworks/kwindowsystem-5.18:5 dev-libs/libgcrypt:0= dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gpg? ( >=kde-apps/gpgmepp-14.12.0:5 app-crypt/gpgme ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kwallet-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=99a39865aa15b9f0698c0bf3eedcc858
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.21.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.21.0
index 447a60198b36..a97d94a5c8a4 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kconfigwidgets-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kdbusaddons-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kiconthemes-5.21:5 >=kde-frameworks/knotifications-5.21:5 >=kde-frameworks/kservice-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=kde-frameworks/kwindowsystem-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 dev-libs/libgcrypt:0= gpg? ( >=kde-apps/gpgmepp-14.12.0:5 app-crypt/gpgme ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kwallet-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d684b39c1e98eb4b1dc1d59cd3ddd7ed
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.18.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.18.0
index 8809104e56f6..17f11a1cc541 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kwidgetsaddons-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3dc1de8b42fc521c07a1e3bfb1c87658
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.21.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.21.0
index 56b5eb9a648d..90ac3c14cfbc 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kwidgetsaddons-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=111473ee84eda148ec3f68655403561a
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.18.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.18.0
index 49228ce6e673..c0c868783f83 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.18.0
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/lib
 RESTRICT=test
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kwindowsystem-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e2d4d17b80c51d0b96fe586a0dde3469
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.21.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.21.0
index 8f6cab85a6f7..087da042ec9f 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 X? ( >=dev-qt/qtx11ext
 RESTRICT=test
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kwindowsystem-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ea79a8567c4b0a6d955eec61d39404cd
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.18.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.18.0
index 68de78a8548a..569c17e3096c 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18:5 >=kde-frameworks/kconfigwidgets-5.18:5 >=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/kglobalaccel-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kiconthemes-5.18:5 >=kde-frameworks/kitemviews-5.18:5 >=kde-frameworks/ktextwidgets-5.18:5 >=kde-frameworks/kwidgetsaddons-5.18:5 >=kde-frameworks/kwindowsystem-5.18:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 attica? ( >=kde-frameworks/attica-5.18:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kxmlgui-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fc7d1843ccecd379ae8bcd2011bfb55a
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.21.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.21.0
index 98a6b67f8e58..3bd7a5fe0943 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.21:5 >=kde-frameworks/kconfigwidgets-5.21:5 >=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/kglobalaccel-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kiconthemes-5.21:5 >=kde-frameworks/kitemviews-5.21:5 >=kde-frameworks/ktextwidgets-5.21:5 >=kde-frameworks/kwidgetsaddons-5.21:5 >=kde-frameworks/kwindowsystem-5.21:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5[ssl] >=dev-qt/qtprintsupport-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 attica? ( >=kde-frameworks/attica-5.21:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kxmlgui-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=80fda831bce6b2f22d61406495204f30
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.18.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.18.0
index cdbed186e6f9..9e785d447688 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.18.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18:5 >=kde-frameworks/ki18n-5.18:5 >=kde-frameworks/kio-5.18:5 dev-qt/qtxml:5 !<kde-plasma/plasma-workspace-5.2.95 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/kxmlrpcclient-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=90b3340f0bd397ef6ab32ed011b6d2de
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.21.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.21.0
index 48e3236110ab..5a96c21263b1 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.21.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.21:5 >=kde-frameworks/ki18n-5.21:5 >=kde-frameworks/kio-5.21:5 >=dev-qt/qtxml-5.5.1:5 !<kde-plasma/plasma-workspace-5.2.95 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/kxmlrpcclient-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7c0082f49dcb4f4c1c0c75ee6140c27e
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.18.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.18.0
index 3f29f84fca22..dd944d7cb78f 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtxml:5 net-misc/modemmanager !kde-plasma/libmm-qt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/modemmanager-qt-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0f93c0b84512365e3a1014b8749f73c9
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.21.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.21.0
index f605d2c0d212..7b86a8465293 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 net-misc/modemmanager !kde-plasma/libmm-qt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/modemmanager-qt-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7bdcc699853b7e5096603ad66daf2339
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.18.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.18.0
index e79a1d4256da..ceb6d1b3e246 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtnetwork:5 || ( >=net-misc/networkmanager-0.9.10.0[consolekit,teamd=] >=net-misc/networkmanager-0.9.10.0[systemd,teamd=] ) !kde-frameworks/libnm-qt !kde-plasma/libnm-qt !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/networkmanager-qt-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ee15f73a7784788823bbb8b7783e7cba
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.21.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.21.0
index a67c7847028a..294463f92697 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 || ( >=net-misc/networkmanager-0.9.10.0[consolekit,teamd=] >=net-misc/networkmanager-0.9.10.0[systemd,teamd=] ) !kde-frameworks/libnm-qt !kde-plasma/libnm-qt !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/networkmanager-qt-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e7e0a53e8d1848d9050418d44bab8f64
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.18.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.18.0
index 2989ade27149..6ecd223add88 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.18.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=!kde-apps/oxygen-icons !kde-frameworks/oxygen-icons:4
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/oxygen-icons5-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=86bc330b5daa9c26ec5d7286c6b9e1fb
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.21.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.21.0
index 7fc104e4b2c2..36114fb37280 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.21.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.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/oxygen-icons5-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c7d7757fdf3855238b1806ad634ece80
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.18.0 b/metadata/md5-cache/kde-frameworks/plasma-5.18.0
index 0ae36f6bc4df..6534e45ede6e 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.18.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.18:5 >=kde-frameworks/karchive-5.18:5 >=k
 RESTRICT=test
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/plasma-framework-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=22aecd6623055946770208fb2335eac5
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.21.0 b/metadata/md5-cache/kde-frameworks/plasma-5.21.0
index a2e3c1869272..447b231cf005 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.21:5 >=kde-frameworks/karchive-5.21:5 >=k
 RESTRICT=test
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/plasma-framework-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1a3f27bfc5602d8695119d91e38bd178
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.18.0 b/metadata/md5-cache/kde-frameworks/solid-5.18.0
index 7afb3a2da3dd..12e1abd13ed1 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/solid-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=269d92283c164c4242317aac6ee9b5aa
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.21.0 b/metadata/md5-cache/kde-frameworks/solid-5.21.0
index e9cc2e898381..068c97fb54db 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/solid-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7516a1d92466a24ef4951e911f282653
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.18.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.18.0
index c73568aff288..2bc7c9a1b5ec 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/sonnet-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ef89206e0a91dbfa9ab68265e9835e1e
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.21.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.21.0
index 575c161c1842..bdd8fadc2a85 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/sonnet-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=27de1227b21d619c9590c289c65aaf4d
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.18.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.18.0
index 9a2229838cf8..f2a18bb330d7 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.18
 SRC_URI=mirror://kde/stable/frameworks/5.18/threadweaver-5.18.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=eacfcbe697870b9b6409b88e7dfe5cba
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.21.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.21.0
index bf0985c2b337..651ce95a814b 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.21.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.21.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5/5.21
 SRC_URI=mirror://kde/stable/frameworks/5.21/threadweaver-5.21.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7e0b6ec38e22cd5864142d7e9947da5f
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-0.9g b/metadata/md5-cache/kde-misc/kdeconnect-0.9g
index dbdfeeb472d7..33450f4c27ce 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-0.9g
+++ b/metadata/md5-cache/kde-misc/kdeconnect-0.9g
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 >=app-crypt/qca-2.1.0:2[qt5,openssl] x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst app? ( >=kde-frameworks/kdeclarative-5.18.0:5 ) telepathy? ( >=net-libs/telepathy-qt-0.9.7[qt5] ) wayland? ( >=kde-plasma/kwayland-5.4.1:5 ) >=kde-plasma/plasma-workspace-5.4.1:5 wayland? ( >=kde-plasma/kwin-5.4.1:5 ) !kde-misc/kdeconnect:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kdeconnect/0.9/src/kdeconnect-kde-0.9g.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=130ccca35c799247564850505d01d9ee
diff --git a/metadata/md5-cache/kde-misc/kdirstat-3.0-r1 b/metadata/md5-cache/kde-misc/kdirstat-3.0-r1
index d356f01e0c0b..6fd7755af50d 100644
--- a/metadata/md5-cache/kde-misc/kdirstat-3.0-r1
+++ b/metadata/md5-cache/kde-misc/kdirstat-3.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kjobwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 sys-libs/zlib !kde-misc/kdirstat:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-3.0.tar.bz2
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e5e1d017213b53199aefa993bbcbbac4
diff --git a/metadata/md5-cache/kde-misc/kimtoy-1.91 b/metadata/md5-cache/kde-misc/kimtoy-1.91
index 5050e04c640e..c609bc6e0725 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.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/plasma-5.18.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.18.0:5 ) !kde-misc/kimtoy:4 >=app-i18n/fcitx-4.0 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=http://kde-apps.org/CONTENT/content-files/140967-kimtoy-1.91.tar.bz2
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=049ae7c45938bbaed7908a40a90e2061
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 c7c383457cbd..3149ba9dfa4e 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.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=http://arielch.fedorapeople.org/devel/src/OpenOfficeorgThumbnail-1.0.0.tar.gz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2262bf045e54dcae7ec185c762259098
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 51efa9e15ca1..68e7c18a3a5b 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.18.0:5 x11-misc/redshift >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.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	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=04abc9ed8f222c9f6336a4a0048e27bc
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.1 b/metadata/md5-cache/kde-misc/rsibreak-0.12.1
index de40d02cb351..caf6b8913c50 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.1
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kidletime-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !kde-misc/rsibreak:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.1.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1d6664da75b8d7d7f11fcbb963e1c986
diff --git a/metadata/md5-cache/kde-misc/skanlite-2.0 b/metadata/md5-cache/kde-misc/skanlite-2.0
index 12e047a7eda1..5a5c88da228e 100644
--- a/metadata/md5-cache/kde-misc/skanlite-2.0
+++ b/metadata/md5-cache/kde-misc/skanlite-2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kjobwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/libksane-14.12.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 media-libs/libpng:0= !kde-misc/skanlite:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/skanlite/2.0/skanlite-2.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=088645e1c5e26b9ab44104020066c425
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 9b5aafef7df1..edec4cbadbc0 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.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-libs/boost-1.45 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-apps/systemd !kde-misc/kcmsystemd:4 !kde-misc/systemd-kcm:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/systemd-kcm/systemd-kcm-1.2.1.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0198be04e499d9f12b94a5122aa48651
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 a969426cbeb7..96f2622aa031 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.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.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-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-3.0.0~beta1.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e0df70e4cb6e4773a385eeaed3375288
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.2 b/metadata/md5-cache/kde-misc/yakuake-3.0.2
index b7a9c503647c..c288cf84a925 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.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-apps/konsole-14.12.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libX11 !kde-misc/yakuake:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/yakuake/3.0.2/src/yakuake-3.0.2.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2a6acb78ff7f4e91733192cb5b8af7c1
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.5.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.5.5
index a6e2f2fa07cb..168f648d642e 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.5.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/bluez-qt-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kded-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-plasma/kde-cli-tools-5.5.5:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !net-wireless/bluedevil !net-wireless/kbluetooth >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/bluedevil-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8c0e7a9674907a35e0cdfbed733b1150
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.6.3 b/metadata/md5-cache/kde-plasma/bluedevil-5.6.3
index e8ef44876bdf..82b814ff8d27 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.6.3
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/bluez-qt-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kded-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-plasma/kde-cli-tools-5.6.3:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !net-wireless/bluedevil !net-wireless/kbluetooth >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/bluedevil-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6ae452ea51de7e87a8cafe258b3f67b5
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.5.5 b/metadata/md5-cache/kde-plasma/breeze-5.5.5
index a1e9cd6c0d24..f1633e51428f 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.5.5
+++ b/metadata/md5-cache/kde-plasma/breeze-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=kde-plasma/kdecoration-5.5.5:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=kde-frameworks/breeze-icons-5.18.0:5 >=kde-plasma/kde-cli-tools-5.5.5:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/breeze-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=653bdf3c40e0ddc0241d445f0467c723
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.6.3 b/metadata/md5-cache/kde-plasma/breeze-5.6.3
index d49cc2d36278..b4dd9eddf6c5 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.6.3
+++ b/metadata/md5-cache/kde-plasma/breeze-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=kde-plasma/kdecoration-5.6.3:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=kde-frameworks/breeze-icons-5.18.0:5 >=kde-plasma/kde-cli-tools-5.6.3:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/breeze-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6501cd2f55b0f66861740056bc3dfff9
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.6.3 b/metadata/md5-cache/kde-plasma/breeze-grub-5.6.3
index 2c7fbf7a523d..77231195eafa 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.6.3
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.6.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/breeze-grub-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f60635ae1c41cd1372e71fda07b61cce
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.5
index 583e7f7cf81e..826f9b3ffa3b 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/breeze-gtk-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f769b56981d5322ea8969dcf696fea17
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.6.3 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.6.3
index 82951bc60b6c..dd9e23a13954 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.6.3
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.6.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/breeze-gtk-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=770d1d11b414166ae87a2fab05d12f3c
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.6.3 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.6.3
index be17aa53c963..02f54fc33e41 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.6.3
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/breeze-plymouth-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=efcb5558a02dbce75b845743b5ec0d66
diff --git a/metadata/md5-cache/kde-plasma/kactivities-workspace-5.5.0 b/metadata/md5-cache/kde-plasma/kactivities-workspace-5.5.0
index 55ce10726f0a..3edd5f842e24 100644
--- a/metadata/md5-cache/kde-plasma/kactivities-workspace-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kactivities-workspace-5.5.0
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kactivities-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsql-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !>kde-apps/kio-extras-15.12.50 !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] !kde-base/kactivitymanagerd !<kde-frameworks/kactivities-5.20.0 !>kde-plasma/plasma-desktop-5.5.90 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kactivities/kactivities-workspace-5.5.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=700f52bfac8d44fec90103b11620de92
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.5.0 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.5.0
index e63c09f54f3f..fab54810befd 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.5.0
@@ -10,5 +10,5 @@ PDEPEND=>=kde-plasma/kactivities-workspace-5.5.0:5
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsql-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] !kde-base/kactivitymanagerd !<kde-frameworks/kactivities-5.20.0 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kactivities/kactivitymanagerd-5.5.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=67720370e948d83f6921193581fe95df
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.6.3 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.6.3
index 5726d7522f70..f3b8b8f45242 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.20.0:5 >=kde-frameworks/kcoreaddons-5.20.0:5 >=kde-frameworks/kdbusaddons-5.20.0:5 >=kde-frameworks/kglobalaccel-5.20.0:5 >=kde-frameworks/ki18n-5.20.0:5 >=kde-frameworks/kio-5.20.0:5 >=kde-frameworks/kservice-5.20.0:5 >=kde-frameworks/kwindowsystem-5.20.0:5 >=kde-frameworks/kxmlgui-5.20.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtsql-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] !kde-base/kactivitymanagerd !<kde-frameworks/kactivities-5.20.0 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kactivitymanagerd-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=43bc2c8c791d306c6167a7320e3a9644
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.5
index 8a076f1d1a63..a3c328d95cd6 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kde-cli-tools-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f0fb0cc0d8ad6e80637262298fb9a147
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.6.3 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.6.3
index de3b63fa0876..8a56448bbce7 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kde-cli-tools-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=40c075d16a2e303239919e8b2b372ad4
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.5
index 77db65bfd46c..0a4b05f4212b 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 dev-libs/glib:2 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.5.5:5 !kde-base/kde-gtk-config:4 !kde-misc/kde-gtk-config >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kde-gtk-config-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ca8b0390a3dcd893b002bac567431eb0
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.6.3 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.6.3
index 3354f64f684e..02f925f50852 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 dev-libs/glib:2 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.6.3:5 !kde-base/kde-gtk-config:4 !kde-misc/kde-gtk-config >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kde-gtk-config-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d409bdb21ae0238a11bc0bf10cd494d9
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.5.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.5.5
index a00db7ef04b7..2d8d2a4ba8d3 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.5.5
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kdecoration-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5148abaaeb3032b21837f56be0030def
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.6.3 b/metadata/md5-cache/kde-plasma/kdecoration-5.6.3
index 1484eff0f72e..e02ba2afc189 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kdecoration-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3f652ebf397918df1302e14c6dc0f51a
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.5
index 3b97ce724ae6..f647da6bab1c 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.18.0:5 >=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kpackage-5.18.0:5 >=kde-frameworks/kross-5.18.0:5 >=kde-frameworks/krunner-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kunitconversion-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=kde-frameworks/sonnet-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=kde-plasma/plasma-workspace-5.5.5:5 !kde-base/kdeplasma-addons:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kdeplasma-addons-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f528837a0a7421bb735aa77fab141122
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.6.3 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.6.3
index 7ab811337302..99346911748c 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.18.0:5 >=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kpackage-5.18.0:5 >=kde-frameworks/kross-5.18.0:5 >=kde-frameworks/krunner-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kunitconversion-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=kde-frameworks/sonnet-5.18.0:5 >=kde-plasma/plasma-workspace-5.6.3:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 share? ( dev-libs/purpose:5 ) >=kde-plasma/plasma-workspace-5.6.3:5 !kde-base/kdeplasma-addons:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kdeplasma-addons-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5fa8deeb7f1f5213918f35e9d058c558
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.5.5 b/metadata/md5-cache/kde-plasma/kgamma-5.5.5
index 9423ef490d1c..97df6691ebe0 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kgamma5-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fadb5d0242668fc3b065f1dd41e0d4e0
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.6.3 b/metadata/md5-cache/kde-plasma/kgamma-5.6.3
index 2807e774e7ef..850ed53a432a 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kgamma5-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d638c3271b63d2493d8c32c93613cb9d
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.5.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.5.5
index 2716eee44ab3..94d44831d9c3 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.5.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5[X] >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-plasma/plasma-workspace-5.5.5:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libX11 >=kde-frameworks/kded-5.18.0:5 >=kde-plasma/kde-cli-tools-5.5.5:5 !kde-base/khotkeys:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/khotkeys-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=56f47dfaef1c2138cf8cfc757c826676
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.6.3 b/metadata/md5-cache/kde-plasma/khotkeys-5.6.3
index 9f734b8b569c..625b6ed28fe1 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.6.3
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5[X] >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-plasma/plasma-workspace-5.6.3:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libX11 >=kde-frameworks/kded-5.18.0:5 >=kde-plasma/kde-cli-tools-5.6.3:5 !kde-base/khotkeys:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/khotkeys-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6613b6892d92d0328295f08394e93869
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.5.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.5.5
index d47faa848247..4f26da903d09 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.5.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5
 REQUIRED_USE=egl? ( || ( gles opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kinfocenter-5.5.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0466941d37c813b74a8b2ade77d17755
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.6.3 b/metadata/md5-cache/kde-plasma/kinfocenter-5.6.3
index 31e1bc21da71..cbff55cb00cd 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5
 REQUIRED_USE=egl? ( || ( gles opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kinfocenter-5.6.3.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=344213afd7580287ae1432758bddea53
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.5.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.5.5
index 9b4e6958385f..f593c246a0fc 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/sonnet-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.5.5:5 ) !kde-base/kmenuedit:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kmenuedit-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ee115928e7b21fc0243006997d6054e4
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.6.3 b/metadata/md5-cache/kde-plasma/kmenuedit-5.6.3
index b967cc28b604..d6a332e12325 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/sonnet-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.6.3:5 ) !kde-base/kmenuedit:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kmenuedit-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2268d44cc3e8eb197f05248a1614a9fd
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.5.5 b/metadata/md5-cache/kde-plasma/kscreen-5.5.5
index 165ce6212dac..8ccb7cb824ce 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-plasma/libkscreen-5.5.5:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5[widgets] >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-plasma/kde-cli-tools-5.5.5:5 >=dev-qt/qtgraphicaleffects-5.5.1:5 !kde-misc/kscreen >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kscreen-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1b7897336cf637f4ec3cf89bb8add6ee
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.6.3 b/metadata/md5-cache/kde-plasma/kscreen-5.6.3
index c9d5f660da8a..e9ca6acefe8f 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kscreen-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0557e2430447237cabe8a590846e66c7
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.5
index d8735a711c60..65cb31237d81 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kscreenlocker-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8aeada09b5dc203863e7e2ffc3946f9a
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.6.3 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.6.3
index 46d5d685ba06..9848e0897efe 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kscreenlocker-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a2c4f76504503413bfc24afd9118b370
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.5
index 798521c316ae..c33100e3725a 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwallet-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtwidgets-5.5.1:5 !net-misc/ksshaskpass >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/ksshaskpass-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=95a11a23ca375054562cdaa076338100
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.6.3 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.6.3
index 841902dd018d..e41f9931e8b4 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.6.3
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwallet-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtwidgets-5.5.1:5 !net-misc/ksshaskpass >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/ksshaskpass-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=af70b44bae0f2654e958376096369641
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.5.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.5.5
index fabecbcd90fe..f88e0b370544 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.5.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-plasma/libksysguard-5.5.5:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-base/ksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/ksysguard-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bd8be8be05ecf9d52e245d627ce411df
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.6.3 b/metadata/md5-cache/kde-plasma/ksysguard-5.6.3
index 4951dbbfce3e..7e18fc615178 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.6.3
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-plasma/libksysguard-5.6.3:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-base/ksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/ksysguard-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8666051abca9a9d19b185bea66128036
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.5
index 48612c4f3360..83d8bfd3a045 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kwallet-pam-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cefa0cc5ad30367432e0c0b8d591ca03
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.6.3 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.6.3
index 598566e17af7..08e3937c7127 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.6.3
@@ -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.6.3/kwallet-pam-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8ab94ac53f7181d87d87a926b5078973
diff --git a/metadata/md5-cache/kde-plasma/kwayland-5.5.5 b/metadata/md5-cache/kde-plasma/kwayland-5.5.5
index 85df84934d7b..c621fd8f179e 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-5.5.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.7.0 >=dev-qt/qtgui-5.5.1:5 media-libs/mesa[egl] >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kwayland-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=10f89ec2a241063c74e62acb79dd50e7
diff --git a/metadata/md5-cache/kde-plasma/kwayland-5.6.3 b/metadata/md5-cache/kde-plasma/kwayland-5.6.3
index f56d9d229a69..ccbf18578ada 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kwayland-5.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.7.0 >=dev-qt/qtgui-5.5.1:5 media-libs/mesa[egl] >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kwayland-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1dc47958c5a42a94470affe17029c553
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.5
index c0bcb2eb3902..08620e34a858 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kidletime-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-plasma/kwayland-5.5.5:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kwayland-integration-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=22239a4345bddc2adb28224ca804a677
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.6.3 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.6.3
index 42b650c34d0b..52a2127ed615 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.6.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kidletime-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-plasma/kwayland-5.6.3:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kwayland-integration-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=772bb5491eb21d1b8719dc106e813c2a
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.5.5 b/metadata/md5-cache/kde-plasma/kwin-5.5.5
index 9e92c903b2f1..1e7e50e5dea0 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.5.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.18.0:5 >=kde-frameworks/kauth-5.18.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kwin-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=717321eb13f3aafa08b19b561b5dd45e
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.6.3 b/metadata/md5-cache/kde-plasma/kwin-5.6.3
index 55f63d8d4d10..f2b3fb958665 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kwin-5.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.18.0:5 >=kde-frameworks/kauth-5.18.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kwin-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4e5130668ae028b20fd80bee68269149
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.5.5 b/metadata/md5-cache/kde-plasma/kwrited-5.5.5
index 4d1e843e8d36..05fdb29ce07a 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.5.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kpty-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !kde-base/kwrited:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/kwrited-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fe1ae1d50bdffdff904cd3b9fb8f6183
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.6.3 b/metadata/md5-cache/kde-plasma/kwrited-5.6.3
index 14914b8d3c42..60ea345412a3 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.6.3
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kpty-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !kde-base/kwrited:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/kwrited-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=421fe8975da56cb6628708ab8a60bb36
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.5.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.5.5
index 5c6ad421dc3a..645b621afb6f 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.5.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.5.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtx11extras-5.5.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/libkscreen-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b5e8ca83f53598853d1fa052252a8f3a
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.6.3 b/metadata/md5-cache/kde-plasma/libkscreen-5.6.3
index 2c7cffd310d0..3587ca14f2c4 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.6.3
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-plasma/kwayland-5.6.3:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5
 RESTRICT=test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.6.3/libkscreen-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=81db960beac8edc18239db201fba9948
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.5.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.5.5
index 53c66c300615..72d54a20f92a 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.5.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.5.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.5.1:5 ) X? ( >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-base/ksysguard:4 !kde-base/libksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/libksysguard-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=be33b130639e2a6c6dc601fd464ae1f9
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.6.3 b/metadata/md5-cache/kde-plasma/libksysguard-5.6.3
index c1f9e6e439a2..2a9403995a27 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.6.3
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.6.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.5.1:5 ) X? ( >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-base/ksysguard:4 !kde-base/libksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/libksysguard-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5a56cc2fd1e84de459c85295a421a513
diff --git a/metadata/md5-cache/kde-plasma/milou-5.5.5 b/metadata/md5-cache/kde-plasma/milou-5.5.5
index b8e530090386..c4937a23c2a8 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.5.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/krunner-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !kde-misc/milou:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/milou-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ae9a067383526a373c0d915a67f35179
diff --git a/metadata/md5-cache/kde-plasma/milou-5.6.3 b/metadata/md5-cache/kde-plasma/milou-5.6.3
index f4db393bf131..0e86094b5f81 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.6.3
+++ b/metadata/md5-cache/kde-plasma/milou-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/krunner-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !kde-misc/milou:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/milou-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7ed82d0cd01857ac7be8a7f8317c5b2e
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.5.5 b/metadata/md5-cache/kde-plasma/oxygen-5.5.5
index a36185a356b9..159ce18ab16d 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.5.5
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-plasma/kdecoration-5.5.5:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/oxygen-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f438932e70000bae922ce8d6afc66303
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.6.3 b/metadata/md5-cache/kde-plasma/oxygen-5.6.3
index d5d1e5f57bf8..56e66c0c7c23 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.6.3
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-plasma/kdecoration-5.6.3:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/oxygen-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=065eb273a3cd907059c1991e542c9a7c
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 0834cc55ba8e..bb9c14169cae 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	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	font	cd7790315ca5b8c505e1e0513df6acce	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	font	cd7790315ca5b8c505e1e0513df6acce	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8f2e345f40550d1e1c43e6bc109761b3
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.5
index 244460f20e19..004c965474f9 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.5
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-plasma/kwin-5.5.5:5 >=kde-plasma/plasma-workspace-5.5.5:5 >=kde-fr
 REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/plasma-desktop-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=19a4789b61a12898e45d47707fd4df71
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.5-r1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.5-r1
index e41fac71dcd5..e1a4d42f4662 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/attica-5.19.0:5 >=kde-frameworks/baloo-5.19.0:5 >=kde-f
 REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/plasma-desktop-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c2234725aaaa7637ad7605f60452ce09
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.6.3 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.6.3
index 3d2979e701cf..50e1244b4a0e 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.6.3
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/attica-5.20.0:5 >=kde-frameworks/baloo-5.20.0:5 >=kde-f
 REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/plasma-desktop-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c8c8c0e6175e8d7a86a57c499caeaa9b
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.6.3 b/metadata/md5-cache/kde-plasma/plasma-integration-5.6.3
index 207eb9fce6c1..6ad68dce6451 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.6.3
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/plasma-integration-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b14091113e92be12f53cfdcbbe2c9fcd
diff --git a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.5 b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.5
index 24b9c4b32158..7add02ec8055 100644
--- a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.5
+++ b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.18.0:5 >=kde-frameworks/kfilemetadata-5.18.0:5 ) >=kde-plasma/plasma-workspace-5.5.5:5 >=dev-qt/qtmultimedia-5.5.1:5[qml] !media-video/plasma-mediacenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/plasma-mediacenter-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=87e0362e76626327cfcdc5341af8628b
diff --git a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.6.3 b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.6.3
index d82a783a7289..9b1b602984a0 100644
--- a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.6.3
+++ b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/kguiaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.18.0:5 >=kde-frameworks/kfilemetadata-5.18.0:5 ) >=kde-plasma/plasma-workspace-5.6.3:5 >=dev-qt/qtmultimedia-5.5.1:5[qml] !media-video/plasma-mediacenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/plasma-mediacenter-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8228009b84200cbcffc07dc97cd3fc9a
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.5.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.5.5
index c3a7e1758959..ff96dff13064 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.5.5
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwallet-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/networkmanager-qt-5.18.0:5[teamd=] >=kde-frameworks/plasma-5.18.0:5 >=kde-frameworks/solid-5.18.0:5 >=app-crypt/qca-2.1.0.3-r1:2[qt5] >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.18.0:5 >=dev-qt/qtxml-5.5.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.5.1:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=kde-plasma/plasma-workspace-5.5.5:5 !kde-misc/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/plasma-nm-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=67b52db493ac15c3cd20ccc4226fe165
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.6.3 b/metadata/md5-cache/kde-plasma/plasma-nm-5.6.3
index 5899656945c0..68a4a47e6375 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.6.3
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwallet-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/networkmanager-qt-5.18.0:5[teamd=] >=kde-frameworks/plasma-5.18.0:5 >=kde-frameworks/solid-5.18.0:5 >=app-crypt/qca-2.1.1:2[qt5] >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.18.0:5 >=dev-qt/qtxml-5.5.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.5.1:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=kde-plasma/plasma-workspace-5.6.3:5 !kde-misc/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/plasma-nm-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=503fbc716d89cedcc374f13ab21fe63a
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.5.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.5.5
index a43ddb3688b4..9f788d32cff5 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.5.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 media-sound/pulseaudio >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/plasma-pa-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2fe4dd20d1d532f4c3bf8211fd978b50
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.6.3 b/metadata/md5-cache/kde-plasma/plasma-pa-5.6.3
index e871a8637ec1..22441979423c 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.6.3
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 media-sound/pulseaudio >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/plasma-pa-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=46d406ff3450eeec46f578d65b09bfa0
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.5-r1 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.5-r1
index af13b5d6b0ba..4deb23acc736 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemmodels-5.18.0:5 >=kde-frameworks/kpackage-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktexteditor-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 plasmate? ( >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=dev-qt/qtwebkit-5.5.1:5 dev-util/kdevplatform:5 ) !dev-util/plasmate >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/plasma-sdk-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b8d7c136dcf2ec8b9c72b94639d0986b
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.6.3 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.6.3
index a8d6759a61d7..d85ebd06d3aa 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.6.3
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemmodels-5.18.0:5 >=kde-frameworks/kpackage-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktexteditor-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/plasma-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 plasmate? ( >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/knewstuff-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=dev-qt/qtwebkit-5.5.1:5 dev-util/kdevplatform:5 ) !dev-util/plasmate >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/plasma-sdk-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dc59dbbfdcf3c65cb99526172a54477a
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.5-r2 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.5-r2
index 8090c3a4d9b9..75c0fb2e71f4 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.5-r2
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.5-r2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/baloo-5.18.0:5 >=kde-frameworks/kactivities-5.18.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/plasma-workspace-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5cdb6e6401c3194c1ffbb9d3bc4da80f
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.6.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.6.3
index cc8d962c2caf..5718ddb7b0f4 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.6.3
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/baloo-5.18.0:5 >=kde-frameworks/kactivities-5.18.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/plasma-workspace-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=69372475424b17ffd8531878c7e0417c
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.5
index b423819654b3..e71522cf5f0e 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-wallpapers-15.08.3[-minimal(-)]
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/plasma-workspace-wallpapers-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=56d5b9cd296a4b21b1bd973f4770d564
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.6.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.6.3
index fbd77c948bba..ccfac30f9193 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.6.3
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.6.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-wallpapers-15.08.3[-minimal(-)]
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/plasma-workspace-wallpapers-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e7f480698a52e8aa61f197584bf41317
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.5
index fd654931b955..cb47c249fc5a 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 || ( >=kde-frameworks/polkit-qt-5.18.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-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/polkit-kde-agent-1-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f93ff43e9574402fc1cbc016b9c7bef5
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.6.3 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.6.3
index 68ff4e12fae0..ceef03e56751 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.6.3
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 || ( >=kde-frameworks/polkit-qt-5.18.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-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/polkit-kde-agent-1-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2acd0a3849edfbdcc98fe2d74a613107
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.5.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.5.5
index d5fc3360a813..0861df1484f8 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.5.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.18.0:5 >=kde-frameworks/kauth-5.18.0:5[policykit] >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kidletime-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/solid-5.18.0:5 >=kde-plasma/kwayland-5.5.5:5 >=kde-plasma/libkscreen-5.5.5:5 >=kde-plasma/plasma-workspace-5.5.5:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.5.5:5 systemd? ( >=sys-power/upower-0.9.23 ) !systemd? ( sys-auth/polkit-pkla-compat || ( ( >=sys-auth/consolekit-1.0.1 sys-power/pm-utils >=sys-power/upower-0.9.23 ) sys-power/upower-pm-utils ) ) !kde-base/powerdevil:4 !kde-base/systemsettings:4[handbook] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/powerdevil-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4d328281a4322c8f5a75ced346e11e5b
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.6.3 b/metadata/md5-cache/kde-plasma/powerdevil-5.6.3
index f6c612977076..20827f48b61c 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.6.3
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.18.0:5 >=kde-frameworks/kauth-5.18.0:5[policykit] >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kidletime-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/solid-5.18.0:5 >=kde-plasma/kwayland-5.6.3:5 >=kde-plasma/libkscreen-5.6.3:5 >=kde-plasma/plasma-workspace-5.6.3:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.6.3:5 systemd? ( >=sys-power/upower-0.9.23 ) !systemd? ( sys-auth/polkit-pkla-compat || ( ( >=sys-auth/consolekit-1.0.1 sys-power/pm-utils >=sys-power/upower-0.9.23 ) sys-power/upower-pm-utils ) ) !kde-base/powerdevil:4 !kde-base/systemsettings:4[handbook] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/powerdevil-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=74dad08baecfed4759174b942e33cb1e
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.5
index 9975634e2726..18ed0e995b72 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=dev-qt/qtdeclarative-5.5.1:5[widgets] >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.5.5:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/sddm-kcm-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=db0660aa2d78a1495329bea7b4d2cc07
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.6.3 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.6.3
index fb880b2eb2d7..2e24a280a6fb 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.6.3
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=dev-qt/qtdeclarative-5.5.1:5[widgets] >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtx11extras-5.5.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.6.3:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/sddm-kcm-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0b3f0618d283ac46bd333435552af091
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.5.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.5.5
index e1a6f122d8d1..ee97173f259c 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.5.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 classic? ( >=kde-frameworks/khtml-5.18.0:5 ) gtk? ( >=kde-plasma/kde-gtk-config-5.5.5:5 ) !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/systemsettings-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c823cc6c9bdb91a76df53c7470f86603
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.6.3 b/metadata/md5-cache/kde-plasma/systemsettings-5.6.3
index af60e89afb47..3d321de58b4c 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.6.3
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 classic? ( >=kde-frameworks/khtml-5.18.0:5 ) gtk? ( >=kde-plasma/kde-gtk-config-5.6.3:5 ) !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/systemsettings-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5d27da60e97ef1cabbb9d9c08574fa7a
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.5.5 b/metadata/md5-cache/kde-plasma/user-manager-5.5.5
index 358956b42ca3..35213fc88eca 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.5.5
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.5/user-manager-5.5.5.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=49217f4ce8f8dc9196d58ab5b39ce49d
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.6.3 b/metadata/md5-cache/kde-plasma/user-manager-5.6.3
index ca34a58c7567..b69d399f17fc 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.6.3
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.6.3/user-manager-5.6.3.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4584456a5898fca82cabe55a4ae38dc3
diff --git a/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r7 b/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r7
new file mode 100644
index 000000000000..447b60cdad6c
--- /dev/null
+++ b/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=net-libs/liblockfile-1.03 virtual/mta mail-client/mailx-support
+DESCRIPTION=The /bin/mail program, which is used to send mail via shell scripts
+EAPI=6
+HOMEPAGE=http://www.debian.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=net-libs/liblockfile-1.03 virtual/mta mail-client/mailx-support !mail-client/nail !net-mail/mailutils
+SLOT=0
+SRC_URI=mirror://gentoo/mailx_8.1.2-0.20050715cvs.orig.tar.gz mirror://gentoo/mailx_8.1.2-0.20050715cvs-1.diff.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=08b65411ce5904a2b6e31aae6a969d8a
diff --git a/metadata/md5-cache/media-gfx/symboleditor-2.0.0 b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
index 42c27ad71edf..040a5981bbf5 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.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 !media-gfx/symboleditor:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/symboleditor/2.0.0/src/SymbolEditor-2.0.0.tar.bz2
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=43e6609fdb22e0661b7e21f62b468e3f
diff --git a/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2 b/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2
new file mode 100644
index 000000000000..8747d2a3e7fb
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=app-text/libpaper dev-libs/fribidi gnome-base/librsvg:2 >=media-libs/libpng-1.2:0= >=media-libs/freetype-2:2 media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf x11-libs/cairo nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=Drawing program designed for young children
+EAPI=6
+HOMEPAGE=http://www.tuxpaint.org/
+IUSE=nls
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/libpaper dev-libs/fribidi gnome-base/librsvg:2 >=media-libs/libpng-1.2:0= >=media-libs/freetype-2:2 media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf x11-libs/cairo
+SLOT=0
+SRC_URI=mirror://sourceforge/tuxpaint/tuxpaint-0.9.21.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=261b414fd4a9fef67c75fc6668c26ebc
diff --git a/metadata/md5-cache/media-libs/phonon-4.9.0 b/metadata/md5-cache/media-libs/phonon-4.9.0
index cc8b12bf7be4..9fe498b7752f 100644
--- a/metadata/md5-cache/media-libs/phonon-4.9.0
+++ b/metadata/md5-cache/media-libs/phonon-4.9.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!dev-qt/qtphonon:4 qt4? ( dev-qt/qtcore: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(-)?] dev-qt/qtdbus: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(-)?] dev-qt/qtgui: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(-)?] designer? ( dev-qt/designer: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(-)?] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) ) pulseaudio? ( dev-libs/glib: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-sound/pulseaudio-0.9.21[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeitgeist? ( dev-libs/libqzeitgeist ) 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(-)?] sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=!!dev-qt/qtphonon:4 qt4? ( dev-qt/qtcore: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(-)?] dev-qt/qtdbus: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(-)?] dev-qt/qtgui: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(-)?] designer? ( dev-qt/designer: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(-)?] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) ) pulseaudio? ( dev-libs/glib: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-sound/pulseaudio-0.9.21[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeitgeist? ( dev-libs/libqzeitgeist ) 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(-)?] qt5? ( kde-frameworks/extra-cmake-modules:5 ) sys-devel/make >=dev-util/cmake-2.8.12
 DESCRIPTION=KDE multimedia API
 EAPI=6
 HOMEPAGE=https://phonon.kde.org/
 IUSE=aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist abi_x86_32 abi_x86_64 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 PDEPEND=aqua? ( media-libs/phonon-qt7 ) gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt4?,qt5?] ) vlc? ( >=media-libs/phonon-vlc-0.9.0[qt4?,qt5?] )
 RDEPEND=!!dev-qt/qtphonon:4 qt4? ( dev-qt/qtcore: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(-)?] dev-qt/qtdbus: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(-)?] dev-qt/qtgui: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(-)?] designer? ( dev-qt/designer: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(-)?] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) ) pulseaudio? ( dev-libs/glib: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-sound/pulseaudio-0.9.21[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeitgeist? ( dev-libs/libqzeitgeist )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( qt4 qt5 ) zeitgeist? ( qt4 )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/4.9.0/phonon-4.9.0.tar.xz
 _eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1d8284cd7e7231632f994f36896a293c
+_md5_=555be9b246ce9b224d53eee34a6aaecc
diff --git a/metadata/md5-cache/media-libs/phonon-9999 b/metadata/md5-cache/media-libs/phonon-9999
index a298bebdc50f..65ea999ecb0c 100644
--- a/metadata/md5-cache/media-libs/phonon-9999
+++ b/metadata/md5-cache/media-libs/phonon-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!dev-qt/qtphonon:4 qt4? ( dev-qt/qtcore: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(-)?] dev-qt/qtdbus: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(-)?] dev-qt/qtgui: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(-)?] designer? ( dev-qt/designer: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(-)?] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) ) pulseaudio? ( dev-libs/glib: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-sound/pulseaudio-0.9.21[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeitgeist? ( dev-libs/libqzeitgeist ) 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(-)?] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=!!dev-qt/qtphonon:4 qt4? ( dev-qt/qtcore: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(-)?] dev-qt/qtdbus: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(-)?] dev-qt/qtgui: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(-)?] designer? ( dev-qt/designer: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(-)?] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) ) pulseaudio? ( dev-libs/glib: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-sound/pulseaudio-0.9.21[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeitgeist? ( dev-libs/libqzeitgeist ) 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(-)?] qt5? ( kde-frameworks/extra-cmake-modules:5 ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12
 DESCRIPTION=KDE multimedia API
 EAPI=6
 HOMEPAGE=https://phonon.kde.org/
@@ -10,4 +10,4 @@ RDEPEND=!!dev-qt/qtphonon:4 qt4? ( dev-qt/qtcore:4[abi_x86_32(-)?,abi_x86_64(-)?
 REQUIRED_USE=|| ( qt4 qt5 ) zeitgeist? ( qt4 )
 SLOT=0
 _eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1d8284cd7e7231632f994f36896a293c
+_md5_=555be9b246ce9b224d53eee34a6aaecc
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0 b/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0
index 9f936af9df3f..bb6e506f0cb1 100644
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Phonon GStreamer backend
 EAPI=6
 HOMEPAGE=https://phonon.kde.org/
 IUSE=alsa debug +network +qt4 qt5
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] >=media-libs/phonon-4.9.0[qt4?,qt5?] qt4? ( dev-qt/qtcore:4[glib] dev-qt/qtgui:4[glib] dev-qt/qtopengl:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 )
 REQUIRED_USE=|| ( qt4 qt5 )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-gstreamer/4.9.0/phonon-backend-gstreamer-4.9.0.tar.xz
 _eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3d72bfb83aa5512a34acb10fa42f077e
+_md5_=f096547cd79c0d6ebb5d596439403e41
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.9.0 b/metadata/md5-cache/media-libs/phonon-vlc-0.9.0
index eb6071acfc83..da1b5195b9a9 100644
--- a/metadata/md5-cache/media-libs/phonon-vlc-0.9.0
+++ b/metadata/md5-cache/media-libs/phonon-vlc-0.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Phonon VLC backend
 EAPI=6
 HOMEPAGE=https://phonon.kde.org/
 IUSE=debug +qt4 qt5
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-fbsd
 LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=media-libs/phonon-4.9.0[qt4=,qt5=] >=media-video/vlc-2.0.1:=[dbus,ogg,vorbis] qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=|| ( qt4 qt5 )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.9.0/phonon-backend-vlc-0.9.0.tar.xz
 _eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1873611eae0007f34d64dafd1de4b0fc
+_md5_=506ae8bac9317404d119bc425862a071
diff --git a/metadata/md5-cache/media-sound/kwave-0.9.1-r1 b/metadata/md5-cache/media-sound/kwave-0.9.1-r1
index bc72abe0458e..f1ed13f47dfc 100644
--- a/metadata/md5-cache/media-sound/kwave-0.9.1-r1
+++ b/metadata/md5-cache/media-sound/kwave-0.9.1-r1
@@ -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.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.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.5.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !media-sound/kwave:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kwave/kwave-0.9.1-1.tar.bz2
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=238760e1af7626c0b9e3dbac18e77dba
diff --git a/metadata/md5-cache/media-sound/pympd-0.08.1-r1 b/metadata/md5-cache/media-sound/pympd-0.08.1-r1
new file mode 100644
index 000000000000..27be0a4d0bd3
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pympd-0.08.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.6:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] gnome-base/libglade:2.0 x11-libs/gdk-pixbuf:2[jpeg] x11-themes/adwaita-icon-theme virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=a Rhythmbox-like PyGTK+ client for Music Player Daemon
+EAPI=6
+HOMEPAGE=http://sourceforge.net/projects/pympd
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.6:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] gnome-base/libglade:2.0 x11-libs/gdk-pixbuf:2[jpeg] x11-themes/adwaita-icon-theme
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/pympd/pympd-0.08.1.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=2dbc7ef398aa0f767338d6cabf8176d3
diff --git a/metadata/md5-cache/media-sound/tomahawk-9999 b/metadata/md5-cache/media-sound/tomahawk-9999
index 7ae608cce7b5..da7d2c409f13 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.18.0 >=dev-qt/designer-5.5.1 >=dev-qt/qtdbus-5.5.1 >=dev-qt/qtgui-5.5.1 >=dev-qt/qtnetwork-5.5.1 >=dev-qt/qtsql-5.5.1 >=dev-qt/qtsvg-5.5.1 >=dev-qt/qtwebkit-5.5.1 >=dev-qt/qtwidgets-5.5.1 >=dev-qt/qtx11extras-5.5.1 >=dev-qt/qtxml-5.5.1 app-crypt/qca:2[qt5] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain[qt5] dev-libs/quazip[qt5] >=media-libs/libechonest-2.3.1:=[qt5] media-libs/liblastfm[qt5] media-libs/phonon[qt5] >=media-libs/taglib-1.8.0 >=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[openssl] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=0
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=91c2c1b8c3fc9e2cce22d5d8f866b168
diff --git a/metadata/md5-cache/media-video/kamoso-3.1.0 b/metadata/md5-cache/media-video/kamoso-3.1.0
index 9c663280f59b..aea31e5fe634 100644
--- a/metadata/md5-cache/media-video/kamoso-3.1.0
+++ b/metadata/md5-cache/media-video/kamoso-3.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdeclarative-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.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-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kamoso/3.1/src/kamoso-3.1.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d24eabef973356c8b0f2424fbb78f09a
diff --git a/metadata/md5-cache/net-analyzer/ntop-5.0.1-r1 b/metadata/md5-cache/net-analyzer/ntop-5.0.1-r1
index 702559ba0be3..f6640ba71706 100644
--- a/metadata/md5-cache/net-analyzer/ntop-5.0.1-r1
+++ b/metadata/md5-cache/net-analyzer/ntop-5.0.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/ntop/ntop/Stable/ntop-5.0.1.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=0ff73804f7d3dc7ccdcebdfb55757884
+_md5_=7560c9318861c51ea4e351303b601104
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.6.0 b/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
similarity index 98%
rename from metadata/md5-cache/net-analyzer/rrdtool-1.6.0
rename to metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
index cbdfc15a35a9..580138a8ac87 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.6.0
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
@@ -9,7 +9,7 @@ LICENSE=GPL-2
 PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.6.0 )
 RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
 REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
+SLOT=0/8.0.0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=1295fb53f1dd1907169e56d446272d7b
+_md5_=c818e57914c346995b8430da8121d543
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.0.3 b/metadata/md5-cache/net-analyzer/wireshark-2.0.3
index 10f48689ad1a..6c6e41d4aabb 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.0.3
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=5
 HOMEPAGE=http://www.wireshark.org/
 IUSE=adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark cpu_flags_x86_sse4_2 ssl zlib +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk3? ( virtual/freedesktop-icon-theme ) qt4? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ssl? ( crypt ) ?? ( qt4 qt5 )
 SLOT=0/2.0.3
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-2.0.3.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=ee894eb3902067f42dd6ba4cc6ae775c
+_md5_=c0d7a6f2b892ef9aa80e8978c7da5e04
diff --git a/metadata/md5-cache/net-ftp/scythia-0.9.3_p2 b/metadata/md5-cache/net-ftp/scythia-0.9.3_p2
index f04c749f7eb7..2ded97edafca 100644
--- a/metadata/md5-cache/net-ftp/scythia-0.9.3_p2
+++ b/metadata/md5-cache/net-ftp/scythia-0.9.3_p2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
 DEPEND=dev-qt/qtgui:4 >=sys-apps/sed-4
 DESCRIPTION=Just a small FTP client
-EAPI=3
+EAPI=5
 HOMEPAGE=http://scythia.free.fr/
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
@@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtgui:4
 SLOT=0
 SRC_URI=http://scythia.free.fr/wp-content/scythia_0.9.3-2-src.tar.gz
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5286098194325c4a28b9728880a2f682
+_md5_=3351e509016796753736e3d05744a70d
diff --git a/metadata/md5-cache/net-irc/konversation-1.6 b/metadata/md5-cache/net-irc/konversation-1.6
index 86849c9623d7..c63902a6eaa0 100644
--- a/metadata/md5-cache/net-irc/konversation-1.6
+++ b/metadata/md5-cache/net-irc/konversation-1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kbookmarks-5.18.0:5 >=kde-frameworks/kcodecs-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kemoticons-5.18.0:5 >=kde-frameworks/kglobalaccel-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kidletime-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kitemviews-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/ktextwidgets-5.18.0:5 >=kde-frameworks/kwallet-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/solid-5.18.0:5 >=kde-frameworks/sonnet-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.1:5 media-libs/phonon[qt5] sys-devel/gettext crypt? ( app-crypt/qca:2[qt5] ) !net-irc/konversation:4 crypt? ( app-crypt/qca:2[openssl] ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/konversation/1.6/src/konversation-1.6.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=02200ff4b55e0f83eab7a97c04a4eba4
diff --git a/metadata/md5-cache/net-libs/libktorrent-2.0 b/metadata/md5-cache/net-libs/libktorrent-2.0
index 7b8de7795772..540decf53a62 100644
--- a/metadata/md5-cache/net-libs/libktorrent-2.0
+++ b/metadata/md5-cache/net-libs/libktorrent-2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/solid-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.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-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.0/libktorrent-2.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=83d17cb348aacb28a343fa0d989d1fe5
diff --git a/metadata/md5-cache/net-libs/libktorrent-2.0.1 b/metadata/md5-cache/net-libs/libktorrent-2.0.1
index a1cac3778fa2..ea682f1cf7d8 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.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/solid-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=dev-qt/qtxml-5.5.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-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.0/libktorrent-2.0.1.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d600621c135c8a44ca080a76eed1cbb3
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.1.6 b/metadata/md5-cache/net-libs/socket_wrapper-1.1.6
index 891912144dc3..2e82af404a0e 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.1.6
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.1.6
@@ -4,9 +4,9 @@ DESCRIPTION=A library passing all socket communications through unix sockets
 EAPI=6
 HOMEPAGE=https://cwrap.org/socket_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 arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/socket_wrapper-1.1.6.tar.gz
 _eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f6fe81c413b57ed31db6788fde064899
+_md5_=a75c41491419bf048b979a2c6b0e8dfa
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 688c52a61733..4038c7d54a12 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.5.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-3 >=dev-qt/qtcore-5.5.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	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0db33a21cd9b56aca307c81c0521b5f3
diff --git a/metadata/md5-cache/net-p2p/ktorrent-5.0 b/metadata/md5-cache/net-p2p/ktorrent-5.0
index 882a8bda8338..167c1ec0c101 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-5.0
+++ b/metadata/md5-cache/net-p2p/ktorrent-5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/kdewebkit-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/solid-5.18.0:5 >=kde-frameworks/sonnet-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtdeclarative-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 <net-libs/libktorrent-2.1:5 >=net-libs/libktorrent-2.0:5 infowidget? ( dev-libs/geoip ) mediaplayer? ( media-libs/phonon[qt5] >=media-libs/taglib-1.5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.4.1:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.18.0:5 ) !net-p2p/ktorrent:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.0/ktorrent-5.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5474be11fde9b5b733b460f900d41fdf
diff --git a/metadata/md5-cache/net-p2p/ktorrent-5.0.1 b/metadata/md5-cache/net-p2p/ktorrent-5.0.1
index 9a36e26f608d..0b002080d9c8 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.18.0:5 >=kde-frameworks/kcmutils-5.18.0:5 >=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/kdbusaddons-5.18.0:5 >=kde-frameworks/kdelibs4support-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/knotifications-5.18.0:5 >=kde-frameworks/knotifyconfig-5.18.0:5 >=kde-frameworks/kparts-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kwindowsystem-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=kde-frameworks/solid-5.18.0:5 >=kde-frameworks/sonnet-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtnetwork-5.5.1:5 >=dev-qt/qtwidgets-5.5.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.18.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.18.0:5 ) !net-p2p/ktorrent:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=14abd1831b9d70d64375df160f5c4c0b
diff --git a/metadata/md5-cache/sci-electronics/electronics-menu-1.0 b/metadata/md5-cache/sci-electronics/electronics-menu-1.0
deleted file mode 100644
index 8a871defc45a..000000000000
--- a/metadata/md5-cache/sci-electronics/electronics-menu-1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Creates an "Electronics" desktop menu
-EAPI=3
-HOMEPAGE=http://www.gpleda.org/
-KEYWORDS=amd64 ppc ppc64 sparc x86 ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://geda.seul.org/dist/electronics-menu-1.0.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bded8951e06c687f92d7ae7e99ff0574
diff --git a/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1 b/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
index 0a4cfd4bf1bf..9eadbc1a619e 100644
--- a/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
+++ b/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
@@ -3,9 +3,9 @@ DEPEND=>=sys-apps/sed-4
 DESCRIPTION=Creates an "Electronics" desktop menu
 EAPI=5
 HOMEPAGE=http://www.gpleda.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos
+KEYWORDS=amd64 ppc ppc64 sparc x86 ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://geda.seul.org/dist/electronics-menu-1.0.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=38bee68978bd7c54b5a7b8e96062cd56
+_md5_=a6c81e461343e33f30824a0425f2272a
diff --git a/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r3 b/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r3
new file mode 100644
index 000000000000..1af0fe6204c4
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst postrm preinst prepare setup
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] sci-electronics/pcb[dbus] sci-electronics/geda nls? ( virtual/libintl ) dev-util/intltool dev-lang/perl nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=A graphical front-end for the gschem -> pcb workflow
+EAPI=6
+HOMEPAGE=http://www.gpleda.org
+IUSE=gnome nls python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] sci-electronics/pcb[dbus] sci-electronics/geda nls? ( virtual/libintl ) sci-electronics/electronics-menu gnome? ( dev-python/gnome-vfs-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://geda.seul.org/dist/geda-xgsch2pcb-0.1.3.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=4cddae66e253fc7fa48f5a814f05109b
diff --git a/metadata/md5-cache/sys-block/partitionmanager-2.1.0 b/metadata/md5-cache/sys-block/partitionmanager-2.1.0
index 6c959d2ededa..ed0f68daee01 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-2.1.0
+++ b/metadata/md5-cache/sys-block/partitionmanager-2.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/kcrash-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kjobwidgets-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 sys-apps/util-linux sys-libs/kpmcore:5 >=kde-plasma/kde-cli-tools-5.5.2:5[kdesu] !sys-block/partitionmanager:0 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/partitionmanager/2.1.0/src/partitionmanager-2.1.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=120b94da8da5be7d71c4fb8b4a64aa79
diff --git a/metadata/md5-cache/sys-boot/grub-2.02_beta3-r1 b/metadata/md5-cache/sys-boot/grub-2.02_beta3-r1
index 24a13124e4f1..d4528eaa0c43 100644
--- a/metadata/md5-cache/sys-boot/grub-2.02_beta3-r1
+++ b/metadata/md5-cache/sys-boot/grub-2.02_beta3-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2/2.02_beta3-r1
 SRC_URI=mirror://gnu-alpha/grub/grub-2.02~beta3.tar.xz fonts? ( mirror://gnu/unifont/unifont-8.0.01/unifont-8.0.01.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.35.zip )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1603f7b0be4548a56dc78f9c8b7a00b4
+_md5_=0fb345eb8a9ced41719bb32efad58627
diff --git a/metadata/md5-cache/sys-boot/gummiboot-48 b/metadata/md5-cache/sys-boot/gummiboot-48
new file mode 100644
index 000000000000..8b33a52724b9
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/gummiboot-48
@@ -0,0 +1,12 @@
+DEFINED_PHASES=pretend setup
+DEPEND=sys-apps/util-linux app-arch/xz-utils app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-boot/gnu-efi-3.0.2
+DESCRIPTION=Minimalistic UEFI bootloader
+EAPI=6
+HOMEPAGE=https://freedesktop.org/wiki/Software/gummiboot/
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1+
+RDEPEND=sys-apps/util-linux
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~floppym/dist/gummiboot-48.tar.xz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c9f615f121ba00e241469ead2086ce5d
diff --git a/metadata/md5-cache/sys-boot/syslinux-6.03 b/metadata/md5-cache/sys-boot/syslinux-6.03
index 0449566c98a9..9dbd76031e66 100644
--- a/metadata/md5-cache/sys-boot/syslinux-6.03
+++ b/metadata/md5-cache/sys-boot/syslinux-6.03
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/syslinux/6.xx/syslinux-6.03.tar.xz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=ea9bb32cd6ddf0164e6939355854316e
+_md5_=f59739c819d7ed2a5a7d014c1881d542
diff --git a/metadata/md5-cache/sys-boot/syslinux-6.02 b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1
similarity index 81%
rename from metadata/md5-cache/sys-boot/syslinux-6.02
rename to metadata/md5-cache/sys-boot/syslinux-6.04_pre1
index 099b566a571f..75ec24d9ac0e 100644
--- a/metadata/md5-cache/sys-boot/syslinux-6.02
+++ b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1
@@ -8,6 +8,6 @@ KEYWORDS=-* ~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1
 SLOT=0
-SRC_URI=mirror://kernel/linux/utils/boot/syslinux/syslinux-6.02.tar.xz
+SRC_URI=mirror://kernel/linux/utils/boot/syslinux/Testing/6.04/syslinux-6.04-pre1.tar.xz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=3cd510214978bc661d66c690a06f50ef
+_md5_=f59739c819d7ed2a5a7d014c1881d542
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.6
index 49f3c418d1d5..39fbf09786ea 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.6
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.6
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
 EAPI=5
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build kdbus
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=4.4.6
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-8.base.tar.xz mirror://gentoo/genpatches-4.4-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-8.experimental.tar.xz )
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	23ae8c186171e6476af098d2a50d0ee0	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=142c8b3e0c65dfe6c4032fcab22c4599
+_md5_=1340b3132be6dfef2e01cb6c49e49480
diff --git a/metadata/md5-cache/sys-libs/kpmcore-2.1.0 b/metadata/md5-cache/sys-libs/kpmcore-2.1.0
index 35384da2e386..9c70195017e8 100644
--- a/metadata/md5-cache/sys-libs/kpmcore-2.1.0
+++ b/metadata/md5-cache/sys-libs/kpmcore-2.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kiconthemes-5.18.0:5 >=kde-frameworks/kio-5.18.0:5 >=kde-frameworks/kservice-5.18.0:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 dev-libs/libatasmart sys-apps/util-linux >=sys-block/parted-3 !<sys-block/partitionmanager-2.0.0 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kpmcore/2.1.0/src/kpmcore-2.1.0.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=977f29b9f6a8f4b1f10bfb3c6a4e8f46
diff --git a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.3 b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.3
index f6b672bc1e92..642df9dbbe15 100644
--- a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.3
+++ b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.3
@@ -4,9 +4,9 @@ DESCRIPTION=A wrapper for the user, group and hosts NSS API
 EAPI=6
 HOMEPAGE=https://cwrap.org/nss_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 arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/nss_wrapper-1.1.3.tar.gz
 _eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=546dd125d6c9f7a01fe0a03ad821128a
+_md5_=a248c88a55eca548eea88ff775f181d0
diff --git a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.1 b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.1
index fd2d5c2cfdaa..e8ce37689978 100644
--- a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.1
+++ b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.1
@@ -4,9 +4,9 @@ DESCRIPTION=A wrapper to fake privilege separation
 EAPI=6
 HOMEPAGE=https://cwrap.org/uid_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 arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=ftp://ftp.samba.org/pub/cwrap/uid_wrapper-1.2.1.tar.gz https://ftp.samba.org/pub/cwrap/uid_wrapper-1.2.1.tar.gz
 _eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ed7a5188d1610fb91d90c2853b6bceac
+_md5_=ab5a7ce770e8ab13043551bead2e64a2
diff --git a/metadata/md5-cache/virtual/jdk-1.8.0-r2 b/metadata/md5-cache/virtual/jdk-1.8.0-r2
deleted file mode 100644
index a0695113b306..000000000000
--- a/metadata/md5-cache/virtual/jdk-1.8.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Java Development Kit (JDK)
-EAPI=6
-KEYWORDS=~amd64 ~arm ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris
-RDEPEND=|| ( dev-java/icedtea-bin:8 dev-java/oracle-jdk-bin:1.8 )
-SLOT=1.8
-_md5_=bbb5238f68eaf5747627edb3f9424d95
diff --git a/metadata/md5-cache/virtual/jdk-1.8.0-r3 b/metadata/md5-cache/virtual/jdk-1.8.0-r3
index 4bd39fe51d1e..49cb60207f28 100644
--- a/metadata/md5-cache/virtual/jdk-1.8.0-r3
+++ b/metadata/md5-cache/virtual/jdk-1.8.0-r3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Java Development Kit (JDK)
 EAPI=6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~amd64 ~arm ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris
 RDEPEND=|| ( dev-java/icedtea-bin:8 dev-java/icedtea:8 dev-java/oracle-jdk-bin:1.8 )
 SLOT=1.8
-_md5_=be46d5cb760f8a4fcf76eaed86513092
+_md5_=d526c1a7d2784b3cea4b89bd43cc73fa
diff --git a/metadata/md5-cache/www-apps/baikal-0.4.4 b/metadata/md5-cache/www-apps/baikal-0.4.4
index b24691bcc623..ff197a5e4409 100644
--- a/metadata/md5-cache/www-apps/baikal-0.4.4
+++ b/metadata/md5-cache/www-apps/baikal-0.4.4
@@ -6,9 +6,9 @@ HOMEPAGE=http://sabre.io/baikal/
 IUSE=+mysql sqlite vhosts
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3
-RDEPEND=>=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,mysql?,sqlite?] mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+RDEPEND=>=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?] mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql sqlite )
 SLOT=0.4.4
 SRC_URI=https://github.com/fruux/Baikal/releases/download/0.4.4/baikal-0.4.4.zip
 _eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=c168843ca34455e1c5320e226e3c2174
+_md5_=4e9b32ae221ae277d392b140e3d264f3
diff --git a/metadata/md5-cache/www-apps/moinmoin-1.9.7-r1 b/metadata/md5-cache/www-apps/moinmoin-1.9.7-r1
index 95e1ae4bb006..36291a078ae1 100644
--- a/metadata/md5-cache/www-apps/moinmoin-1.9.7-r1
+++ b/metadata/md5-cache/www-apps/moinmoin-1.9.7-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://static.moinmo.in/files/moin-1.9.7.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=87649b84c4e15e13418ad5986c454281
+_md5_=f97eabfcd0d9aec968485a59a5d306dc
diff --git a/metadata/md5-cache/www-plugins/gnash-0.8.10_p20150316 b/metadata/md5-cache/www-plugins/gnash-0.8.10_p20150316
index 27ab9c2d5d57..fcf5f5af68a5 100644
--- a/metadata/md5-cache/www-plugins/gnash-0.8.10_p20150316
+++ b/metadata/md5-cache/www-plugins/gnash-0.8.10_p20150316
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.41.0:0= dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) directfb? ( dev-libs/DirectFB ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gconf? ( gnome-base/gconf ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 python? ( dev-python/pygtk:2 ) ) jemalloc? ( dev-libs/jemalloc ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/glu virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) virtual/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) nsplugin? ( net-misc/npapi-sdk ) test? ( dev-util/dejagnu ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] ) app-arch/unzip
+DEPEND=>=dev-libs/boost-1.41.0:0= dev-libs/expat dev-libs/libxml2 virtual/jpeg:0 media-libs/libpng:0 net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) directfb? ( dev-libs/DirectFB ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( || ( !vaapi? ( media-video/libav ) media-video/ffmpeg[vaapi?] ) ) gconf? ( gnome-base/gconf ) gstreamer? ( media-plugins/gst-plugins-ffmpeg:* media-plugins/gst-plugins-mad:* media-plugins/gst-plugins-meta:* ) gtk? ( x11-libs/gtk+:2 python? ( dev-python/pygtk:2 ) ) jemalloc? ( dev-libs/jemalloc ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/glu virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl:0 ) vaapi? ( x11-libs/libva[opengl?] ) virtual/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) nsplugin? ( net-misc/npapi-sdk ) test? ( dev-util/dejagnu ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] ) app-arch/unzip
 DESCRIPTION=GNU Flash movie player that supports many SWF v7,8,9 features
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gnash/
 IUSE=X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg gconf gnome gstreamer gtk harden jemalloc kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi aqua kde
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41.0:0= dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) directfb? ( dev-libs/DirectFB ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gconf? ( gnome-base/gconf ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 python? ( dev-python/pygtk:2 ) ) jemalloc? ( dev-libs/jemalloc ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/glu virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) 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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] )
+RDEPEND=>=dev-libs/boost-1.41.0:0= dev-libs/expat dev-libs/libxml2 virtual/jpeg:0 media-libs/libpng:0 net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) directfb? ( dev-libs/DirectFB ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( || ( !vaapi? ( media-video/libav ) media-video/ffmpeg[vaapi?] ) ) gconf? ( gnome-base/gconf ) gstreamer? ( media-plugins/gst-plugins-ffmpeg:* media-plugins/gst-plugins-mad:* media-plugins/gst-plugins-meta:* ) gtk? ( x11-libs/gtk+:2 python? ( dev-python/pygtk:2 ) ) jemalloc? ( dev-libs/jemalloc ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/glu virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl:0 ) vaapi? ( x11-libs/libva[opengl?] ) 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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] )
 REQUIRED_USE=dump? ( agg ffmpeg ) fbcon? ( agg ) nsplugin? ( gtk ) openvg? ( egl ) python? ( gtk ) vaapi? ( agg ffmpeg ) || ( agg cairo opengl openvg ) || ( dump fbcon gtk kde sdl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/gnash-0.8.10_p20150316.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	497e7beacd4cbf96e4a5082eaa5d75fb	kde4-functions	88bc45dff8c885002aca6e4c0adbe541	libtool	4890219c51da247200223277f993e054	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	23ae8c186171e6476af098d2a50d0ee0	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1e73e5b0fddb49c910adbc242b6758ad
+_md5_=a909c881f1eb7687dd6df01a9e845e16
diff --git a/metadata/md5-cache/www-plugins/gnash-0.8.10_p20160329 b/metadata/md5-cache/www-plugins/gnash-0.8.10_p20160329
new file mode 100644
index 000000000000..be7459f3b12a
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/gnash-0.8.10_p20160329
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/boost-1.41.0:0= dev-libs/expat dev-libs/libxml2 virtual/jpeg:0 media-libs/libpng:0 net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) directfb? ( dev-libs/DirectFB ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gconf? ( gnome-base/gconf ) gstreamer? ( media-plugins/gst-plugins-ffmpeg:* media-plugins/gst-plugins-mad:* media-plugins/gst-plugins-meta:* ) gtk? ( x11-libs/gtk+:2 python? ( dev-python/pygtk:2 ) ) jemalloc? ( dev-libs/jemalloc ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/glu virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl:0 ) vaapi? ( x11-libs/libva[opengl?] ) virtual/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) nsplugin? ( net-misc/npapi-sdk ) test? ( dev-util/dejagnu ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] ) app-arch/unzip
+DESCRIPTION=GNU Flash movie player that supports many SWF v7,8,9 features
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/gnash/
+IUSE=X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg gconf gnome gstreamer gtk harden jemalloc kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi aqua kde
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.41.0:0= dev-libs/expat dev-libs/libxml2 virtual/jpeg:0 media-libs/libpng:0 net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) directfb? ( dev-libs/DirectFB ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gconf? ( gnome-base/gconf ) gstreamer? ( media-plugins/gst-plugins-ffmpeg:* media-plugins/gst-plugins-mad:* media-plugins/gst-plugins-meta:* ) gtk? ( x11-libs/gtk+:2 python? ( dev-python/pygtk:2 ) ) jemalloc? ( dev-libs/jemalloc ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/glu virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl:0 ) vaapi? ( x11-libs/libva[opengl?] ) 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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] )
+REQUIRED_USE=dump? ( agg ffmpeg ) fbcon? ( agg ) nsplugin? ( gtk ) openvg? ( egl ) python? ( gtk ) vaapi? ( agg ffmpeg ) || ( agg cairo opengl openvg ) || ( dump fbcon gtk kde sdl )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gentoo/gnash-0.8.10_p20160329.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	497e7beacd4cbf96e4a5082eaa5d75fb	kde4-functions	88bc45dff8c885002aca6e4c0adbe541	libtool	4890219c51da247200223277f993e054	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	23ae8c186171e6476af098d2a50d0ee0	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=893f654987908e4a91bc43f2bb92affb
diff --git a/metadata/md5-cache/www-servers/nginx-1.9.12 b/metadata/md5-cache/www-servers/nginx-1.9.12
deleted file mode 100644
index 90a9684e6cb4..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.9.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) pcre-jit? ( >=dev-libs/libpcre-8.20[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) virtual/pkgconfig
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=6
-HOMEPAGE=http://nginx.org
-IUSE=aio debug +http +http2 +http-cache ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_ip_hash +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_limit_conn nginx_modules_stream_upstream nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_cache_purge nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex nginx_modules_http_lua nginx_modules_http_auth_pam nginx_modules_http_upstream_check nginx_modules_http_metrics nginx_modules_http_naxsi nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_security nginx_modules_http_push_stream nginx_modules_http_sticky nginx_modules_http_ajp nginx_modules_http_mogilefs nginx_modules_http_memc nginx_modules_http_auth_ldap nginx_modules_http_spdy
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) pcre-jit? ( >=dev-libs/libpcre-8.20[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-SLOT=mainline
-SRC_URI=http://nginx.org/download/nginx-1.9.12.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.2.19.tar.gz -> ngx_devel_kit-0.2.19-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.1.tar.gz -> ngx_http_upload_progress-0.9.1-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.29.tar.gz -> ngx_http_headers_more-0.29.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.3.6.tar.gz -> ngx_http_fancyindex-0.3.6.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.1rc1.tar.gz -> ngx_http_lua-0.10.1rc1.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.4.tar.gz -> ngx_http_auth_pam-1.4.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/v0.3.0.tar.gz -> ngx_http_upstream_check-0.3.0.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.54.tar.gz -> ngx_http_naxsi-0.54.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.1.7.tar.gz -> ngx_rtmp-1.1.7.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz -> ngx_http_dav_ext-0.0.3.tar.gz ) nginx_modules_http_echo? ( https://github.com/agentzh/echo-nginx-module/archive/v0.58.tar.gz -> ngx_http_echo-0.58.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.0/modsecurity-2.9.0.tar.gz -> modsecurity-2.9.0.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.1.tar.gz -> ngx_http_push_stream-0.5.1.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.16.tar.gz -> ngx_memc_module-0.16.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz -> nginx-auth-ldap-8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz )
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	ssl-cert	b031e94f4c7c34e1d677376b8929821a	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=370bb13a5446990f32a630d2be533f86
diff --git a/metadata/md5-cache/www-servers/nginx-1.9.13 b/metadata/md5-cache/www-servers/nginx-1.9.15
similarity index 78%
rename from metadata/md5-cache/www-servers/nginx-1.9.13
rename to metadata/md5-cache/www-servers/nginx-1.9.15
index a053b648201e..33324ec32b97 100644
--- a/metadata/md5-cache/www-servers/nginx-1.9.13
+++ b/metadata/md5-cache/www-servers/nginx-1.9.15
@@ -10,6 +10,6 @@ PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
 RDEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) pcre-jit? ( >=dev-libs/libpcre-8.20[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
 REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
 SLOT=mainline
-SRC_URI=http://nginx.org/download/nginx-1.9.13.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.2.19.tar.gz -> ngx_devel_kit-0.2.19-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.1.tar.gz -> ngx_http_upload_progress-0.9.1-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.29.tar.gz -> ngx_http_headers_more-0.29.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.3.6.tar.gz -> ngx_http_fancyindex-0.3.6.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.2.tar.gz -> ngx_http_lua-0.10.2.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.4.tar.gz -> ngx_http_auth_pam-1.4.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/v0.3.0.tar.gz -> ngx_http_upstream_check-0.3.0.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.54.tar.gz -> ngx_http_naxsi-0.54.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.1.7.tar.gz -> ngx_rtmp-1.1.7.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz -> ngx_http_dav_ext-0.0.3.tar.gz ) nginx_modules_http_echo? ( https://github.com/agentzh/echo-nginx-module/archive/v0.58.tar.gz -> ngx_http_echo-0.58.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz -> modsecurity-2.9.1.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.1.tar.gz -> ngx_http_push_stream-0.5.1.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.16.tar.gz -> ngx_memc_module-0.16.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz -> nginx-auth-ldap-8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz )
+SRC_URI=http://nginx.org/download/nginx-1.9.15.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.2.19.tar.gz -> ngx_devel_kit-0.2.19-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.1.tar.gz -> ngx_http_upload_progress-0.9.1-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.29.tar.gz -> ngx_http_headers_more-0.29.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.3.6.tar.gz -> ngx_http_fancyindex-0.3.6.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.2.tar.gz -> ngx_http_lua-0.10.2.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/v0.3.0.tar.gz -> ngx_http_upstream_check-0.3.0.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.54.tar.gz -> ngx_http_naxsi-0.54.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.1.7.tar.gz -> ngx_rtmp-1.1.7.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz -> ngx_http_dav_ext-0.0.3.tar.gz ) nginx_modules_http_echo? ( https://github.com/agentzh/echo-nginx-module/archive/v0.58.tar.gz -> ngx_http_echo-0.58.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz -> modsecurity-2.9.1.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.1.tar.gz -> ngx_http_push_stream-0.5.1.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.16.tar.gz -> ngx_memc_module-0.16.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz -> nginx-auth-ldap-8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz )
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	ssl-cert	b031e94f4c7c34e1d677376b8929821a	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ba1c87ceb6eb0b1d6dfc6312ce8e2caa
+_md5_=9a0067d609483310e152a28296283790
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.18.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.18.0
index 119b4c6c7bfb..9afc8f1b0292 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.18.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.18.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=>=dev-libs/libinput-1.2.0:0= !<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 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) 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 x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
 DESCRIPTION=X.org input driver based on libinput
 EAPI=5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.2.0:0= x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-libinput-0.18.0.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=886e02f6288985340e660ec700c22d20
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xorg-2	b41f09eee8d441f780b7413dba7e120b
+_md5_=fd3bf6ff041856ed5d983e513e37b75d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20160407 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20160407
deleted file mode 100644
index 1c6f050de15c..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20160407
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] dri3? ( >=x11-base/xorg-server-1.18 ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/dri3proto x11-proto/presentproto x11-proto/resourceproto !<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 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) 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 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=X.Org driver for Intel cards
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=debug +dri3 +sna +udev uxa xvmc dri
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd -x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] dri3? ( >=x11-base/xorg-server-1.18 ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-REQUIRED_USE=|| ( sna uxa )
-SLOT=0
-SRC_URI=https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/59d371a9b215fdcd6139279435af7e1f6803309e.tar.xz -> xf86-video-intel-2.99.917_p20160407.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=398adc29e8fdd89024a7d34ee60f2841
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20160417 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20160417
deleted file mode 100644
index 2110e75557bb..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20160417
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] dri3? ( >=x11-base/xorg-server-1.18 ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/dri3proto x11-proto/presentproto x11-proto/resourceproto !<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 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) 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 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=X.Org driver for Intel cards
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=debug +dri3 +sna +udev uxa xvmc dri
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd -x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] dri3? ( >=x11-base/xorg-server-1.18 ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-REQUIRED_USE=|| ( sna uxa )
-SLOT=0
-SRC_URI=https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/81029be07380090195d165fab91d3e1fe1d84bb9.tar.xz -> xf86-video-intel-2.99.917_p20160417.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=47f3549c60cb9624254fbaa233f1f1df
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.0.1 b/metadata/md5-cache/x11-misc/kronometer-2.0.1
index 5e38b758e7cc..fadc8a3bc2b7 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.0.1
+++ b/metadata/md5-cache/x11-misc/kronometer-2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.0.1/src/kronometer-2.0.1.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=59d1f2ced72acc5f01d78ba1d9d9a5e4
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.0.2 b/metadata/md5-cache/x11-misc/kronometer-2.0.2
index afa084e64148..037d82dd1c94 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.0.2
+++ b/metadata/md5-cache/x11-misc/kronometer-2.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.18.0:5 >=kde-frameworks/kconfigwidgets-5.18.0:5 >=kde-frameworks/kcoreaddons-5.18.0:5 >=kde-frameworks/ki18n-5.18.0:5 >=kde-frameworks/kwidgetsaddons-5.18.0:5 >=kde-frameworks/kxmlgui-5.18.0:5 >=dev-qt/qtdbus-5.5.1:5 >=dev-qt/qtgui-5.5.1:5 >=dev-qt/qtwidgets-5.5.1:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.5.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.0.2/src/kronometer-2.0.2.tar.xz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4110b761b0caac5ec27ebff2526d4419	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	8e596dc62ae8c72384824e9bbe8797c3	kde5-functions	5e89f74fb9c544ed0a6760cc62b98517	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b618a27db51623de5368ea664a058161
diff --git a/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031 b/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031
index edc30be17e2d..cae69cda42c6 100644
--- a/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031
+++ b/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031
@@ -1,7 +1,7 @@
-DEFINED_PHASES=install postinst postrm preinst
+DEFINED_PHASES=postinst postrm preinst
 DEPEND=virtual/pkgconfig >=x11-misc/icon-naming-utils-0.8.90 >=sys-apps/sed-4
 DESCRIPTION=SVG icon theme from the Echo Icon project
-EAPI=2
+EAPI=6
 HOMEPAGE=https://fedorahosted.org/echo-icon-theme
 KEYWORDS=~amd64 ~x86
 LICENSE=CC-BY-SA-3.0
@@ -9,4 +9,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/echo-icon-theme-0.3.89.0_pre20081031.tar.bz2
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=35869ebc62d4d40d402b16f2f401ed4c
+_md5_=40ace6b184c489de63bf9a3558c66905
diff --git a/metadata/md5-cache/x11-themes/gnome-colors-common-5.5.1 b/metadata/md5-cache/x11-themes/gnome-colors-common-5.5.1
index 0bf1fc18989a..13796e8d59df 100644
--- a/metadata/md5-cache/x11-themes/gnome-colors-common-5.5.1
+++ b/metadata/md5-cache/x11-themes/gnome-colors-common-5.5.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare
 DEPEND=>=sys-apps/sed-4
 DESCRIPTION=Colorized icons shared between all gnome-colors iconsets
-EAPI=2
+EAPI=6
 HOMEPAGE=https://code.google.com/p/gnome-colors/
 IUSE=+branding
 KEYWORDS=amd64 x86
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://gnome-colors.googlecode.com/files/gnome-colors-5.5.1.tar.gz branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0ed08169a087b5358d76404030d4e9e5
+_md5_=dcbb7079ece95818ebf68a631e55a0d6
diff --git a/metadata/md5-cache/x11-themes/gnome-colors-themes-5.5.1 b/metadata/md5-cache/x11-themes/gnome-colors-themes-5.5.1
index f14767f8c72e..501978d5e3bc 100644
--- a/metadata/md5-cache/x11-themes/gnome-colors-themes-5.5.1
+++ b/metadata/md5-cache/x11-themes/gnome-colors-themes-5.5.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install postinst postrm preinst
 DEPEND=>=sys-apps/sed-4
 DESCRIPTION=Some gnome-colors iconsets including a Gentoo one
-EAPI=2
+EAPI=6
 HOMEPAGE=https://code.google.com/p/gnome-colors/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 public-domain
@@ -10,4 +10,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://gnome-colors.googlecode.com/files/gnome-colors-5.5.1.tar.gz https://dev.gentoo.org/~pacho/gnome-gentoo-5.5.1.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1db772bbf4a7339d877152320847dfe8
+_md5_=3026a609942bf69f340808dc70a46678
diff --git a/metadata/news/2016-04-24-default-video-cards/2016-04-24-default-video-cards.en.txt b/metadata/news/2016-04-24-default-video-cards/2016-04-24-default-video-cards.en.txt
new file mode 100644
index 000000000000..8a94240b08e9
--- /dev/null
+++ b/metadata/news/2016-04-24-default-video-cards/2016-04-24-default-video-cards.en.txt
@@ -0,0 +1,27 @@
+Title: Changes in default VIDEO_CARDS
+Author: Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+Content-Type: text/plain
+Posted: 2016-04-24
+Revision: 2
+News-Item-Format: 1.0
+Display-If-Keyword: amd64
+Display-If-Keyword: x86
+Display-If-Installed: x11-drivers/xf86-video-dummy
+Display-If-Installed: x11-drivers/xf86-video-glint
+Display-If-Installed: x11-drivers/xf86-video-mach64
+Display-If-Installed: x11-drivers/xf86-video-mga
+Display-If-Installed: x11-drivers/xf86-video-nv
+Display-If-Installed: x11-drivers/xf86-video-r128
+Display-If-Installed: x11-drivers/xf86-video-savage
+Display-If-Installed: x11-drivers/xf86-video-tdfx
+Display-If-Installed: x11-drivers/xf86-video-trident
+Display-If-Installed: x11-drivers/xf86-video-v4l
+Display-If-Installed: x11-drivers/xf86-video-via
+Display-If-Installed: x11-drivers/xf86-video-vmware
+
+In order to better reflect the graphics chipsets present on modern
+systems, the default VIDEO_CARDS setting has been changed to
+"amdgpu fbdev intel nouveau radeon radeonsi vesa"
+
+If your graphics chipset requires a different driver, and you have not set
+VIDEO_CARDS in make.conf, it is advisable to do that now.
diff --git a/metadata/news/2016-04-24-default-video-cards/2016-04-24-default-video-cards.en.txt.asc b/metadata/news/2016-04-24-default-video-cards/2016-04-24-default-video-cards.en.txt.asc
new file mode 100644
index 000000000000..ff30974c9005
--- /dev/null
+++ b/metadata/news/2016-04-24-default-video-cards/2016-04-24-default-video-cards.en.txt.asc
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAABCgBmBQJXHVL1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRoFoQAIn0QswHkr2wwycM21mhnq99
+zTfSEo6UqZdPfaBItyM1QPzRjzLd1tm4henp1ebTCL8GJhjzpA0mrhk6oHa8KWuZ
+qVkcj5hUuCuBqAjSq+XSzbwGAbvgtm76GA5mgAT6/UOTISStYmum/niKS6dGnJo1
+pgfld2eQG7hRNSeXpRXPb3NMnVv4XTz0UvRTq/2rrqrdHnIa0RtBo6l03HP+ays7
+nivcNCgFv1UUKzaK4Dfwj5Ro6txJdYKxNlsupwIpPCjZs+tAjsAYKb/JqvpE3j8d
+mSA7nUJ2ZoeDtEKID8UoF6ccWzBUBYBBMxnsmKVYMMOHIn9+NvtnkwP7kMlv329I
+4aXoBTzdxq1g+EL0S9hEP+Jw7t+9w4SEoq5n8BSHaZ+9zRTgHcQhC+vlik6fpvb7
+C6z9KHCyPOWFfeNx/O/ENnG0jtmOOI7aX8Th9TKTk21a49gf9ichf5kvUQiIP+Q3
+uCCx7helJb9dcouAS0JHhvg+r+MadOOBB5XLeEXaVHkefNiyZh3dhlC8TuqJAe8x
+XYXzA9ad/HysKQRnKxGhRAlCjQsh9GkfciUglx1Oe1XnRuzms8V7z3OjzeYuA7JA
+TbYb3yjDEH860qjbeaYpz9ZjhLxP2iD3bYXQYUzQNVQmK4JLBwj7oyaJppS1Rrw3
+IB6GjyhU7cq3hluh/rm8
+=cfJi
+-----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8fff9292388a..b6ea9c920a3f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 24 Apr 2016 05:38:58 +0000
+Mon, 25 Apr 2016 07:09:01 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 9f77c20bf16c..d7376a6636af 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Apr 24 05:38:01 UTC 2016
+Mon Apr 25 07:08:07 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 330843863d1d..539a818207ad 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 24 Apr 2016 06:00:01 +0000
+Mon, 25 Apr 2016 07:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index cb4ba8a5b047..6ecda58e2f2e 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1461476401 Sun 24 Apr 2016 05:40:01 AM UTC
+1461568201 Mon 25 Apr 2016 07:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8fff9292388a..edfad772e241 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 24 Apr 2016 05:38:58 +0000
+Mon, 25 Apr 2016 07:09:00 +0000
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch b/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch
new file mode 100644
index 000000000000..db2530c8a5e5
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch
@@ -0,0 +1,31 @@
+--- a/configure.in
++++ b/configure.in
+@@ -887,28 +887,6 @@
+    fi
+ fi
+ 
+-RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
+-
+-if test -f "$RRD_HOME/lib/librrd_th.so"; then
+-   AC_MSG_RESULT(checking for rrdtool... yes)
+-else
+-  if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX
+-     AC_MSG_RESULT(checking for rrdtool... yes)
+-  else
+-     if test -f "$RRD_HOME/lib/librrd_th.a"; then
+-       AC_MSG_RESULT(checking for rrdtool... yes)
+-     else
+-       AC_CHECK_LIB([rrd_th], [main])
+-       if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then
+-         AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR);
+-	 AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/);
+-       else
+-         RRD_LIB=
+-       fi
+-     fi
+-  fi
+-fi
+-
+ RRD_INC=
+ if test -d "${RRD_HOME}/include"; then
+   RRD_INC="-I${RRD_HOME}/include"
diff --git a/net-analyzer/ntop/ntop-5.0.1-r1.ebuild b/net-analyzer/ntop/ntop-5.0.1-r1.ebuild
index 789328164915..49b8f207abaf 100644
--- a/net-analyzer/ntop/ntop-5.0.1-r1.ebuild
+++ b/net-analyzer/ntop/ntop-5.0.1-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools eutils user python-single-r1
+inherit autotools eutils multilib user python-single-r1
 
 DESCRIPTION="Network traffic analyzer with web interface"
 HOMEPAGE="http://www.ntop.org/products/ntop/"
@@ -50,8 +50,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-includes.patch
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-includes.patch \
+		"${FILESDIR}"/${P}-librrd.patch
+
 	cp /usr/share/aclocal/libtool.m4 libtool.m4.in
 	cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
 	eautoreconf
@@ -77,10 +80,16 @@ src_configure() {
 	econf
 	popd &>/dev/null || die
 
+	if has_version '<net-analyzer/rrdtool-1.6'; then
+		export RRD_LIB=-lrrd_th
+	else
+		export RRD_LIB=-lrrd
+	fi
+
 	econf \
 		$(use_enable snmp) \
 		$(use_with ssl) \
-		--with-rrd-home=/usr/lib
+		--with-rrd-home=/usr/$(get_libdir)
 
 }
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
similarity index 99%
rename from net-analyzer/rrdtool/rrdtool-1.6.0.ebuild
rename to net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
index 5f8a447fb1be..8ff5f05e30b5 100644
--- a/net-analyzer/rrdtool/rrdtool-1.6.0.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
 SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/8.0.0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-analyzer/wireshark/wireshark-2.0.3.ebuild b/net-analyzer/wireshark/wireshark-2.0.3.ebuild
index 6ac11201de55..3b460f430aa0 100644
--- a/net-analyzer/wireshark/wireshark-2.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
diff --git a/net-ftp/scythia/scythia-0.9.3_p2.ebuild b/net-ftp/scythia/scythia-0.9.3_p2.ebuild
index c06b4acf268d..b39486b211f3 100644
--- a/net-ftp/scythia/scythia-0.9.3_p2.ebuild
+++ b/net-ftp/scythia/scythia-0.9.3_p2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=3
+EAPI=5
 inherit gnome2-utils qt4-r2
 
 DESCRIPTION="Just a small FTP client"
@@ -14,11 +14,10 @@ SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-qt/qtgui:4"
+RDEPEND="dev-qt/qtgui:4"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
-DOCS="AUTHORS"
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
 	sed -i \
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.6.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.1.6.ebuild
index e073a179f39a..495cfe3188ab 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.1.6.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.1.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://cwrap.org/socket_wrapper.html"
 SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 2beb988c3c2a..96a6803f351a 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -45,7 +45,7 @@ ABI_X86="64"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint intel mach64 mga nouveau nv r128 radeon savage sis tdfx trident vesa via vmware voodoo"
+VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa"
 
 # 2006/12/22 - Danny van Dyk <kugelfang@gentoo.org>
 # Default for ALSA_CARDS USE_EXPAND variable.
diff --git a/profiles/arch/arm/armv6j/package.mask b/profiles/arch/arm/armv6j/package.mask
index 1302a9201232..fba35e2f0be7 100644
--- a/profiles/arch/arm/armv6j/package.mask
+++ b/profiles/arch/arm/armv6j/package.mask
@@ -2,11 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# James Le Cuirot <chewi@gentoo.org> (09 Jan 2016)
-# Unmask against the wider arm mask.
--virtual/jdk:1.8
--virtual/jre:1.8
-
 # James Le Cuirot <chewi@gentoo.org> (09 Jan 2016)
 # This is built for armv6 so unmask against the wider arm mask.
 -dev-java/oracle-jdk-bin
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index 15027689b1c8..8686f2f66dc1 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -2,16 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# James Le Cuirot <chewi@gentoo.org> (09 Jan 2016)
-# Unmask against the wider arm mask.
--virtual/jdk:1.8
--virtual/jre:1.8
-
 # James Le Cuirot <chewi@gentoo.org> (09 Jan 2016)
 # This is built for armv6 so unmask against the wider arm mask.
 -dev-java/oracle-jdk-bin
 -dev-java/oracle-jre-bin
 
+# James Le Cuirot <chewi@gentoo.org> (24 Apr 2016)
+# The ARM32 JIT code is broken as of 7.2.6.6. Without this, Java 7 is
+# no faster than Java 8. Earlier versions have vulnerabilities so
+# either switch to icedtea-bin:8 or build icedtea:7 from source.
+dev-java/icedtea-bin:7
+
 # James Le Cuirot <chewi@gentoo.org> (24 May 2015)
 # This is built for armv7a so unmask against the wider arm mask.
 -dev-java/icedtea-bin
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index c0178249e536..ff6f86039d03 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -2,12 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# James Le Cuirot <chewi@gentoo.org> (09 Jan 2016)
-# There are no providers for Java 8 on pre-armv6. icedtea 3 may work
-# but we don't have it in the tree yet.
-virtual/jdk:1.8
-virtual/jre:1.8
-
 # James Le Cuirot <chewi@gentoo.org> (09 Jan 2016)
 # This is built for armv6 and will not work on earlier generations.
 dev-java/oracle-jdk-bin
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 02ba7382dda4..e8257d42fbd9 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -29,7 +29,7 @@ LIBDIR_x86="lib"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint intel mach64 mga nouveau nv r128 radeon savage sis tdfx trident vesa via vmware voodoo"
+VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa"
 
 # 2006/12/21 - Andrej Kacian <ticho@gentoo.org>
 # Defaults for audio drivers
diff --git a/profiles/hardened/linux/x86/make.defaults b/profiles/hardened/linux/x86/make.defaults
index 65bc7aab0941..05cc3205e707 100644
--- a/profiles/hardened/linux/x86/make.defaults
+++ b/profiles/hardened/linux/x86/make.defaults
@@ -15,10 +15,7 @@ USE="nptl"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="apm ark chips cirrus cyrix dummy fbdev glint i128 i740 intel \
-	mach64 mga nsc nv r128 radeon rendition s3 s3virge savage \
-	siliconmotion sis sisusb tdfx tga trident tseng v4l vesa via vmware \
-	voodoo"
+VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa"
 
 # 2006/12/21 - Andrej Kacian <ticho@gentoo.org>
 # Defaults for audio drivers
diff --git a/profiles/package.mask b/profiles/package.mask
index 179108dcd9a0..5354929b0cdf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -286,10 +286,6 @@ dev-vcs/statcvs
 # Bug: https://bugs.gentoo.org/577158
 =sys-apps/systemd-229-r100
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (10 Mar 2016)
-# Masking until we figure out what to do about bug #576930
-=gnome-base/gnome-extra-apps-3.18.0-r2
-
 # Ian Stakenvicius <axs@gentoo.org> (06 Mar 2016)
 # Mask old versions of thunderbird as they are no longer supported,
 # but we keep them in the repo for now in case there is a need
diff --git a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
index f34b53a54c3b..b8a887af8f49 100644
--- a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
+++ b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/sci-electronics/electronics-menu/electronics-menu-1.0.ebuild b/sci-electronics/electronics-menu/electronics-menu-1.0.ebuild
deleted file mode 100644
index 3e1da3ca7ce0..000000000000
--- a/sci-electronics/electronics-menu/electronics-menu-1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit gnome2-utils
-
-DESCRIPTION="Creates an \"Electronics\" desktop menu"
-HOMEPAGE="http://www.gpleda.org/"
-SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${ED}" install || die "emake install failed"
-	dodoc README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r3.ebuild b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r3.ebuild
new file mode 100644
index 000000000000..ec565d24e952
--- /dev/null
+++ b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+WANT_AUTOCONF="2.5"
+
+inherit autotools fdo-mime gnome2-utils python-single-r1
+
+DESCRIPTION="A graphical front-end for the gschem -> pcb workflow"
+HOMEPAGE="http://www.gpleda.org"
+SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gnome nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="${PYTHON_DEPS}
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	sci-electronics/pcb[dbus]
+	sci-electronics/geda
+	nls? ( virtual/libintl )
+"
+RDEPEND="${CDEPEND}
+	sci-electronics/electronics-menu
+	gnome? ( dev-python/gnome-vfs-python[${PYTHON_USEDEP}] )
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	dev-lang/perl
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=( "${FILESDIR}"/${PV}-python.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare(){
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--disable-update-desktop-database
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sys-boot/grub/files/2.02_beta3-sysmacros.patch b/sys-boot/grub/files/2.02_beta3-sysmacros.patch
new file mode 100644
index 000000000000..8610f3a1a57c
--- /dev/null
+++ b/sys-boot/grub/files/2.02_beta3-sysmacros.patch
@@ -0,0 +1,107 @@
+From 7a5b301e3adb8e054288518a325135a1883c1c6c Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 19 Apr 2016 14:27:22 -0400
+Subject: [PATCH] build: Use AC_HEADER_MAJOR to find device macros
+
+Depending on the OS/libc, device macros are defined in different
+headers. This change ensures we include the right one.
+
+sys/types.h - BSD
+sys/mkdev.h - Sun
+sys/sysmacros.h - glibc (Linux)
+
+glibc currently pulls sys/sysmacros.h into sys/types.h, but this may
+change in a future release.
+
+https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html
+---
+ configure.ac                         | 3 ++-
+ grub-core/osdep/devmapper/getroot.c  | 6 ++++++
+ grub-core/osdep/devmapper/hostdisk.c | 5 +++++
+ grub-core/osdep/linux/getroot.c      | 6 ++++++
+ grub-core/osdep/unix/getroot.c       | 4 +++-
+ 5 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 57e1713..9ddfc53 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -388,7 +388,8 @@ fi
+ 
+ # Check for functions and headers.
+ AC_CHECK_FUNCS(posix_memalign memalign getextmntent)
+-AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h sys/mkdev.h limits.h)
++AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h limits.h)
++AC_HEADER_MAJOR
+ 
+ AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$ac_includes_default
+ #include <sys/param.h>
+diff --git a/grub-core/osdep/devmapper/getroot.c b/grub-core/osdep/devmapper/getroot.c
+index 05eda50..72e5582 100644
+--- a/grub-core/osdep/devmapper/getroot.c
++++ b/grub-core/osdep/devmapper/getroot.c
+@@ -40,6 +40,12 @@
+ #include <limits.h>
+ #endif
+ 
++#if defined(MAJOR_IN_MKDEV)
++#include <sys/mkdev.h>
++#elif defined(MAJOR_IN_SYSMACROS)
++#include <sys/sysmacros.h>
++#endif
++
+ #include <libdevmapper.h>
+ 
+ #include <grub/types.h>
+diff --git a/grub-core/osdep/devmapper/hostdisk.c b/grub-core/osdep/devmapper/hostdisk.c
+index 19c1101..a697bcb 100644
+--- a/grub-core/osdep/devmapper/hostdisk.c
++++ b/grub-core/osdep/devmapper/hostdisk.c
+@@ -24,6 +24,11 @@
+ #include <errno.h>
+ #include <limits.h>
+ 
++#if defined(MAJOR_IN_MKDEV)
++#include <sys/mkdev.h>
++#elif defined(MAJOR_IN_SYSMACROS)
++#include <sys/sysmacros.h>
++#endif
+ 
+ #ifdef HAVE_DEVICE_MAPPER
+ # include <libdevmapper.h>
+diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
+index 10480b6..09e7e6e 100644
+--- a/grub-core/osdep/linux/getroot.c
++++ b/grub-core/osdep/linux/getroot.c
+@@ -35,6 +35,12 @@
+ #include <limits.h>
+ #endif
+ 
++#if defined(MAJOR_IN_MKDEV)
++#include <sys/mkdev.h>
++#elif defined(MAJOR_IN_SYSMACROS)
++#include <sys/sysmacros.h>
++#endif
++
+ #include <grub/types.h>
+ #include <sys/ioctl.h>         /* ioctl */
+ #include <sys/mount.h>
+diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c
+index 1079a91..4bf37b0 100644
+--- a/grub-core/osdep/unix/getroot.c
++++ b/grub-core/osdep/unix/getroot.c
+@@ -51,8 +51,10 @@
+ #endif
+ 
+ #include <sys/types.h>
+-#if defined(HAVE_SYS_MKDEV_H)
++#if defined(MAJOR_IN_MKDEV)
+ #include <sys/mkdev.h>
++#elif defined(MAJOR_IN_SYSMACROS)
++#include <sys/sysmacros.h>
+ #endif
+ 
+ #if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+-- 
+2.8.1
+
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index 87d786d64fa3..43291a0473bd 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/gfxpayload.patch
 	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
 	"${FILESDIR}"/2.02_beta3-10_linux-UUID.patch
+	"${FILESDIR}"/2.02_beta3-sysmacros.patch
 )
 
 DEJAVU=dejavu-sans-ttf-2.35
diff --git a/sys-boot/gummiboot/Manifest b/sys-boot/gummiboot/Manifest
index eab13032a2d0..97fa2d15ff10 100644
--- a/sys-boot/gummiboot/Manifest
+++ b/sys-boot/gummiboot/Manifest
@@ -1 +1,2 @@
 DIST gummiboot-45.tar.xz 126376 SHA256 e3a6734c4c5acd3b42ec72dfc1214147c9f0ca74f08eeb44f969eb0d9b6d1e50 SHA512 09472a34ef8697a605c65462dde41ef09b1528a63b3a006f73a179ebeb16ac236adf9aaf8c8d7d3c411f3e3e029eb47ad916dc13f69ad9558c4277b1fa3d0619 WHIRLPOOL 04418cb9fd20df1a2bf77264bb766dc8542df8c1b05038ae780fbaa5dfb83e84f02cfd1adb20e22a032e9b0ad6e4654f40e25a67e5edf6b09e918c257930b9e1
+DIST gummiboot-48.tar.xz 131284 SHA256 e6b4b58c79cf600948d4d89a5324ced5736d7f20f7d3de74b2be8221123a9d40 SHA512 c3b3176f1b2fc0f5c8e196c9e63cf6ff6111d009c46a6311bd96367256cf4fbc28b46e3ae9ab4452cdc3b41d92fa978052b9803274b01ec3da72562076ea7737 WHIRLPOOL a9f2751a64a53b07a4d3fff17760f9ff38aed7ad4c0f60772b4b039d8b9a4ba50a9ef7006d28fc96d2653253ea9c65cb1e50391a467cb148684322e956d6fe05
diff --git a/sys-boot/gummiboot/gummiboot-48.ebuild b/sys-boot/gummiboot/gummiboot-48.ebuild
new file mode 100644
index 000000000000..a4b017d2b6d7
--- /dev/null
+++ b/sys-boot/gummiboot/gummiboot-48.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info
+
+DESCRIPTION="Minimalistic UEFI bootloader"
+HOMEPAGE="https://freedesktop.org/wiki/Software/gummiboot/"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-boot/gnu-efi-3.0.2"
+
+pkg_pretend() {
+	# CONFIG_EFI_STUB  is required to boot a kernel with gummiboot
+	local CONFIG_CHECK="~EFI_STUB"
+	check_extra_config
+}
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 23780b32adf9..14410fa083b6 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -1,5 +1,5 @@
 DIST syslinux-3.86.tar.bz2 3735823 SHA256 82a8d2a242f869cb4c34b3a074871f472762343e1879a4dca23d7ce5c4dcd06d SHA512 6231f233e5f5ac26aa7e4bfd2704e2a4081350a3f3f21b5ec88a13cf992528c2796dbdfdf6cc2cc7a9543828650ae46de3685e5e55fac3a6ad520430220d1073 WHIRLPOOL 985efd16587ac3f00dc1b75563dc12e5abfeb14b42b64accdadda087f6c9a61c8f5cc149a2b9ce8dd1368d1083720340c20240a4b7d7ea3bf51ff65512d1bd3e
 DIST syslinux-4.07.tar.bz2 5761877 SHA256 1240a4e4219b518bdaef78931b6e901befeff35e6894ac6db785115848a7a05a SHA512 8efbd14803ec74c5ee699a754b4727e4b975c08afd4dbb39f4b7ccdb90743e4459cd4609c6f1065c7b7efaa26c9d465806254891795d363758f35a2fe5704ae5 WHIRLPOOL b68966ed87055a157812f36f2881b4a86797eacef1894b70c1a063327547264daa4b4ca1ea52ccb286ab86332c2163e57004d3503215497278e073b48583a9dc
 DIST syslinux-5.10.tar.xz 5315660 SHA256 4b52d7647d5584c69764c06a836e0d524e5246bf2e94f68cf86342c415508422 SHA512 56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5 WHIRLPOOL 77d73bdc1cd75a3ad9f58de8a9fa31a1c4247d579ac8c849e8d0dacc7cd1b9e02b2cf0737f1be1c2bc2e974f4ded3955857588a8a07d6cf35997c57f47d9b583
-DIST syslinux-6.02.tar.xz 6471080 SHA256 afa31b7cbf72e1c0c1752a0636ba724ce01c0e374366e46e61db6862b4685478 SHA512 919d165e9cba2b964cec8b015f0a4281a5f90e908f247441d6edefe289170e697b933554d12fa90e698b6d2e8b5b40fdb3b7a95d746a41c580e3a44f8859818f WHIRLPOOL 98d7552f8c66be7689166e7d7a7b5499af0a974711e7ca1f01e1538250c533ceed6d80cec0ac189ff66ea243e22ff1add62c2e3392945d4b7e1586f38c1b6a1d
 DIST syslinux-6.03.tar.xz 6855224 SHA256 26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e SHA512 dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31 WHIRLPOOL c3abf6dd84610f2265ce94ce0991e200e3f7fcf2cf2926d46c389c7235544e959ee52aef4a510258b861da2233fd38696d3164a7d0e75f0060a18cc13f23b546
+DIST syslinux-6.04-pre1.tar.xz 5283272 SHA256 3f6d50a57f3ed47d8234fd0ab4492634eb7c9aaf7dd902f33d3ac33564fd631d SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98 WHIRLPOOL d8d3765b974122a1265ca95470379c577108a6aba755c19c1f0373f3986d117c1cfaf1f3f2a9477d2558e66f82db3de980ab12d66c721396154dea7ee1edc28a
diff --git a/sys-boot/syslinux/syslinux-6.03.ebuild b/sys-boot/syslinux/syslinux-6.03.ebuild
index 25ec57bc1fc1..fe34dc6eb086 100644
--- a/sys-boot/syslinux/syslinux-6.03.ebuild
+++ b/sys-boot/syslinux/syslinux-6.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -72,6 +72,17 @@ src_prepare() {
 		x86)	loaderarch="efi32" ;;
 		*)	ewarn "Unsupported architecture, building installers only." ;;
 	esac
+
+	# building with ld.gold causes problems, bug #563364
+	if tc-ld-is-gold; then
+		ewarn "Building syslinux with the gold linker may cause problems, see bug #563364"
+		if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
+			tc-ld-disable-gold
+			ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this."
+		else
+			ewarn "Continuing anyway as requested."
+		fi
+	fi
 }
 
 src_compile() {
diff --git a/sys-boot/syslinux/syslinux-6.02.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
similarity index 72%
rename from sys-boot/syslinux/syslinux-6.02.ebuild
rename to sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index 2be6a6be858e..fe34dc6eb086 100644
--- a/sys-boot/syslinux/syslinux-6.02.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,7 +8,15 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
 HOMEPAGE="http://www.syslinux.org/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P/_/-}.tar.xz"
+# Final releases in 6.xx/$PV.tar.* (literal "xx")
+# Testing releases in Testing/$PV/$PV.tar.*
+SRC_URI_DIR=${PV:0:1}.xx
+SRC_URI_TESTING=Testing/${PV:0:4}
+[[ ${PV/_alpha} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+[[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+[[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+[[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -35,9 +43,10 @@ QA_PREBUILT="usr/share/${PN}/*.c32"
 # removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-add-fno-stack-protector.patch
 	rm -f gethostip #bug 137081
 
+	epatch "${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928
+
 	# Don't prestrip or override user LDFLAGS, bug #305783
 	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
 		sample/Makefile utils/Makefile"
@@ -63,6 +72,17 @@ src_prepare() {
 		x86)	loaderarch="efi32" ;;
 		*)	ewarn "Unsupported architecture, building installers only." ;;
 	esac
+
+	# building with ld.gold causes problems, bug #563364
+	if tc-ld-is-gold; then
+		ewarn "Building syslinux with the gold linker may cause problems, see bug #563364"
+		if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
+			tc-ld-disable-gold
+			ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this."
+		else
+			ewarn "Continuing anyway as requested."
+		fi
+	fi
 }
 
 src_compile() {
@@ -83,7 +103,7 @@ src_install() {
 
 pkg_postinst() {
 	# print warning for users upgrading from the previous stable version
-	if has 4.06 ${REPLACING_VERSIONS}; then
+	if has 4.07 ${REPLACING_VERSIONS}; then
 		ewarn "syslinux now uses dynamically linked ELF executables. Before you reboot,"
 		ewarn "ensure that needed dependencies are fulfilled. For example, run from your"
 		ewarn "syslinux directory:"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.6.ebuild
index c99e31e9d32c..b7521b54277f 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.6.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.6.ebuild
@@ -13,7 +13,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild
index 060e5d38e03f..dae0b0073333 100644
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild
+++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://cwrap.org/nss_wrapper.html"
 SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild
index 973a7d58ddbe..46c31a84d0a9 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.samba.org/pub/cwrap/${P}.tar.gz
 	https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/virtual/jdk/jdk-1.8.0-r2.ebuild b/virtual/jdk/jdk-1.8.0-r2.ebuild
deleted file mode 100644
index 08aa0a7d1d58..000000000000
--- a/virtual/jdk/jdk-1.8.0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-SLOT="1.8"
-KEYWORDS="~amd64 ~arm ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
-
-RDEPEND="|| (
-		dev-java/icedtea-bin:8
-		dev-java/oracle-jdk-bin:1.8
-	)"
diff --git a/virtual/jdk/jdk-1.8.0-r3.ebuild b/virtual/jdk/jdk-1.8.0-r3.ebuild
index 9275b043d8e9..0c719cd544db 100644
--- a/virtual/jdk/jdk-1.8.0-r3.ebuild
+++ b/virtual/jdk/jdk-1.8.0-r3.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="1.8"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 
 RDEPEND="|| (
 		dev-java/icedtea-bin:8
diff --git a/www-apps/baikal/baikal-0.4.4.ebuild b/www-apps/baikal/baikal-0.4.4.ebuild
index ab0ae7718cab..b58484cc6bf6 100644
--- a/www-apps/baikal/baikal-0.4.4.ebuild
+++ b/www-apps/baikal/baikal-0.4.4.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm"
 IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 
-RDEPEND=">=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,mysql?,sqlite?]
+RDEPEND=">=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
 	mysql? ( virtual/mysql )
 	sqlite? ( dev-db/sqlite )
 	virtual/httpd-php"
diff --git a/www-apps/moinmoin/moinmoin-1.9.7-r1.ebuild b/www-apps/moinmoin/moinmoin-1.9.7-r1.ebuild
index 66fb239d363a..d5369ead5b7e 100644
--- a/www-apps/moinmoin/moinmoin-1.9.7-r1.ebuild
+++ b/www-apps/moinmoin/moinmoin-1.9.7-r1.ebuild
@@ -102,7 +102,5 @@ pkg_postinst() {
 	ewarn "If you are upgrading from an older version, please read"
 	ewarn "README.migration in /usr/share/doc/${PF}"
 	ewarn
-
-	distutils_pkg_postinst
 	webapp_pkg_postinst
 }
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index 773c154640f3..9b3b825ef30c 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -1,2 +1,3 @@
 DIST gnash-0.8.10_p20131019.tar.xz 3868156 SHA256 93e5c82c9f5e326b8ddba3cb4c4178fb9428e92987b3b8e6ef59b201ef37782a SHA512 79b4e86275b6b11774212315ea3b4a6192177d297d4ebe93c39d69734dbaa4c893845dc606e724e03f6409f0695794ade0f2544e30cf2d291a42d0cf3d674dcc WHIRLPOOL fb9a9b9f00c10af75c595147ce3d9bdf18f5cfde907fa69c9d0e28a278ff4fa835eba4d1e19ea72ac65e6e0f769da30f5790c652e2df723c36db6e3ef4436851
 DIST gnash-0.8.10_p20150316.tar.xz 4031684 SHA256 0c380f7b6756ad8a4d5ca152933f9a51278e00d51b3677812c69d65a166e3a6c SHA512 3f166de91a2f9f538ef76d21f7e9c2c240a776855cfe00c4e39fd6c0b6718f450ffecac61f38a6e534c6eb3f5b747c1d800f5bc7712ece3dcf14be1ee50384d0 WHIRLPOOL 6dd3886b9bcca56fbf63442f25d7af9184188702a167d3962f97fcf0496a99898033ee52843f9bc53b73236b96e4995b882de9685898820cf0f6b27dccb881c9
+DIST gnash-0.8.10_p20160329.tar.xz 4079572 SHA256 851ccba805a90a2e21ced841ae70cf55c0ba53c95f2b8b9bc729385a5b49bbb7 SHA512 e8956d6277dde29a22bfe5af4279b40f80dad5659961d042e0bb57505b084f3ef1b489cf6fdf06730a8f3e2f9fdb737d7b1bc015a0255a80b167b98e686aa245 WHIRLPOOL 58734701ff4d9a6aa9536a1fa7feb75a8357775fb11857ecaf1a678ac7eca590a00b8af76f3723e8bbdf03b1fdf01cb193d870d505b8cc5767fdaf29fff1d7ee
diff --git a/www-plugins/gnash/files/gnash-0.8.10-libva-1.6_0000.patch b/www-plugins/gnash/files/gnash-0.8.10-libva-1.6_0000.patch
new file mode 100644
index 000000000000..d914f4a3b826
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.10-libva-1.6_0000.patch
@@ -0,0 +1,43 @@
+From e5c08131abde15f7a1e048e35d1a9ff12b2acdaa Mon Sep 17 00:00:00 2001
+From: Bastiaan Jacques <bastiaan@bjacques.org>
+Date: Thu, 26 Mar 2015 15:24:21 +0000
+Subject: Build fix: adjust smart pointers to unique_ptr API.
+
+---
+diff --git a/libdevice/vaapi/VaapiContext.h b/libdevice/vaapi/VaapiContext.h
+index 8d9de72..c49d48a 100644
+--- a/libdevice/vaapi/VaapiContext.h
++++ b/libdevice/vaapi/VaapiContext.h
+@@ -84,7 +84,7 @@ public:
+     void releaseSurface(std::shared_ptr<VaapiSurface> surface);
+ 
+     /// Set user data
+-    void setData(std::unique_ptr<VaapiContextData> user_data) { _user_data = user_data; }
++    void setData(std::unique_ptr<VaapiContextData> user_data) { _user_data = std::move(user_data); }
+ 
+     /// Get user data
+     VaapiContextData *getData() const { return _user_data.get(); }
+diff --git a/libdevice/vaapi/VaapiGlobalContext.cpp b/libdevice/vaapi/VaapiGlobalContext.cpp
+index c19ed07..5127a27 100644
+--- a/libdevice/vaapi/VaapiGlobalContext.cpp
++++ b/libdevice/vaapi/VaapiGlobalContext.cpp
+@@ -33,7 +33,7 @@
+ namespace gnash {
+ 
+ VaapiGlobalContext::VaapiGlobalContext(std::unique_ptr<VaapiDisplay> display)
+-    : _display(display)
++    : _display(std::move(display))
+ {
+     GNASH_REPORT_FUNCTION;
+ 
+@@ -145,7 +145,7 @@ VaapiGlobalContext *VaapiGlobalContext::get()
+             if (!dpy.get()) {
+                 return NULL;
+             }
+-            vaapi_global_context.reset(new VaapiGlobalContext(dpy));
++            vaapi_global_context.reset(new VaapiGlobalContext(std::move(dpy)));
+         }
+         catch (...) {
+             vaapi_set_is_enabled(false);
+--
+cgit v0.9.0.2
diff --git a/www-plugins/gnash/files/gnash-0.8.10-libva-1.6_0001.patch b/www-plugins/gnash/files/gnash-0.8.10-libva-1.6_0001.patch
new file mode 100644
index 000000000000..4c25a98dba52
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.10-libva-1.6_0001.patch
@@ -0,0 +1,28 @@
+From f5016cc9399c9ffd3c5d32c67bb28fac285559c6 Mon Sep 17 00:00:00 2001
+From: Bastiaan Jacques <bastiaan@bjacques.org>
+Date: Wed, 09 Sep 2015 19:25:31 +0000
+Subject: Compilation fix. See Savannah #44636.
+
+Also skip useless NULL check.
+---
+diff --git a/gui/gtk/gtk_glue_agg_vaapi.cpp b/gui/gtk/gtk_glue_agg_vaapi.cpp
+index 1eda283..6209e89 100644
+--- a/gui/gtk/gtk_glue_agg_vaapi.cpp
++++ b/gui/gtk/gtk_glue_agg_vaapi.cpp
+@@ -301,11 +301,9 @@ GtkAggVaapiGlue::getVideoWindow(std::shared_ptr<VaapiSurface> surface,
+         return NULL;
+ 
+     if (!context->getData()) {
+-        std::unique_ptr<VaapiContextData> contextData;
+-        contextData.reset(new VaapiVideoWindow(parent_window, rect));
+-        if (!contextData.get())
+-            return NULL;
+-        context->setData(contextData);
++        context->setData(
++            std::unique_ptr<VaapiContextData>(
++                new VaapiVideoWindow(parent_window, rect)));
+     }
+     return dynamic_cast<VaapiVideoWindow *>(context->getData());
+ }
+--
+cgit v0.9.0.2
diff --git a/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild b/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
index 441d7ba28132..0ac37432f547 100644
--- a/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
+++ b/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -41,8 +41,8 @@ REQUIRED_USE="dump? ( agg ffmpeg )
 RDEPEND=">=dev-libs/boost-1.41.0:0=
 	dev-libs/expat
 	dev-libs/libxml2
-	virtual/jpeg
-	media-libs/libpng
+	virtual/jpeg:0
+	media-libs/libpng:0
 	net-misc/curl
 	x11-libs/libX11
 	x11-libs/libXi
@@ -65,16 +65,17 @@ RDEPEND=">=dev-libs/boost-1.41.0:0=
 	fbcon? (
 		x11-libs/tslib
 	)
-	ffmpeg? (
-		virtual/ffmpeg[vaapi?]
-	)
+	ffmpeg? ( || (
+		!vaapi? ( media-video/libav )
+		media-video/ffmpeg[vaapi?]
+	) )
 	gconf? (
 		gnome-base/gconf
 	)
 	gstreamer? (
-		media-plugins/gst-plugins-ffmpeg
-		media-plugins/gst-plugins-mad
-		media-plugins/gst-plugins-meta
+		media-plugins/gst-plugins-ffmpeg:*
+		media-plugins/gst-plugins-mad:*
+		media-plugins/gst-plugins-meta:*
 	)
 	gtk? (
 		x11-libs/gtk+:2
@@ -99,7 +100,7 @@ RDEPEND=">=dev-libs/boost-1.41.0:0=
 	lirc? ( app-misc/lirc )
 	dbus? ( sys-apps/dbus )
 	ssh?  ( >=net-libs/libssh-0.4[server] )
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0 )
 	vaapi? ( x11-libs/libva[opengl?] )
 	"
 DEPEND="${RDEPEND}
@@ -147,6 +148,11 @@ src_prepare() {
 	# See https://savannah.gnu.org/bugs/?46148
 	epatch "${FILESDIR}"/${P}-boost-1.60.patch
 
+	# Fix vaapi build, bug #546584
+	# See https://savannah.gnu.org/bugs/?44636
+	epatch "${FILESDIR}"/${PN}-0.8.10-libva-1.6_0000.patch
+	epatch "${FILESDIR}"/${PN}-0.8.10-libva-1.6_0001.patch
+
 	eautoreconf
 }
 src_configure() {
diff --git a/www-plugins/gnash/gnash-0.8.10_p20160329.ebuild b/www-plugins/gnash/gnash-0.8.10_p20160329.ebuild
new file mode 100644
index 000000000000..c05fede634ef
--- /dev/null
+++ b/www-plugins/gnash/gnash-0.8.10_p20160329.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CMAKE_REQUIRED="never"
+KDE_REQUIRED="optional"
+AT_M4DIR="cygnal"
+# won't build with python-3, bug #392969
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils kde4-base multilib nsplugins python-any-r1 flag-o-matic
+
+DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
+HOMEPAGE="https://www.gnu.org/software/gnash/"
+
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.savannah.gnu.org/gnash.git"
+	inherit git-2
+else
+# Release tarball is b0rked, upstream #35612
+#	SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg gconf gnome gstreamer gtk harden jemalloc kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
+REQUIRED_USE="dump? ( agg ffmpeg )
+	fbcon? ( agg )
+	nsplugin? ( gtk )
+	openvg? ( egl )
+	python? ( gtk )
+	vaapi? ( agg ffmpeg )
+	|| ( agg cairo opengl openvg )
+	|| ( dump fbcon gtk kde sdl )
+	"
+
+RDEPEND=">=dev-libs/boost-1.41.0:0=
+	dev-libs/expat
+	dev-libs/libxml2
+	virtual/jpeg:0
+	media-libs/libpng:0
+	net-misc/curl
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	media-libs/giflib
+	x11-proto/xproto
+	agg? ( x11-libs/agg )
+	cairo? ( x11-libs/cairo )
+	directfb? (
+		dev-libs/DirectFB
+	)
+	doc? (
+		>=app-text/docbook2X-0.8.8
+		app-text/docbook-sgml-utils
+	)
+	egl? (
+		media-libs/mesa[egl]
+	)
+	fbcon? (
+		x11-libs/tslib
+	)
+	ffmpeg? (
+		virtual/ffmpeg[vaapi?]
+	)
+	gconf? (
+		gnome-base/gconf
+	)
+	gstreamer? (
+		media-plugins/gst-plugins-ffmpeg:*
+		media-plugins/gst-plugins-mad:*
+		media-plugins/gst-plugins-meta:*
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		python? ( dev-python/pygtk:2 )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	kde? ( $(add_kdebase_dep kdebase-startkde) )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		gtk? ( x11-libs/gtkglext )
+	)
+	openvg? (
+		media-libs/mesa[openvg]
+	)
+	sdl? ( media-libs/libsdl[X] )
+	sdl-sound? ( media-libs/libsdl )
+	media-libs/speex[ogg]
+	sys-libs/zlib
+	>=sys-devel/libtool-2.2
+	mysql? ( virtual/mysql )
+	lirc? ( app-misc/lirc )
+	dbus? ( sys-apps/dbus )
+	ssh?  ( >=net-libs/libssh-0.4[server] )
+	ssl? ( dev-libs/openssl:0 )
+	vaapi? ( x11-libs/libva[opengl?] )
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	gnome? ( app-text/rarian )
+	nsplugin? ( net-misc/npapi-sdk )
+	test? ( dev-util/dejagnu )"
+# Tests hang with sandbox, bug #321017
+RESTRICT="test"
+
+pkg_setup() {
+	kde4-base_pkg_setup
+	python-any-r1_pkg_setup
+
+	if use !ffmpeg && use !gstreamer; then
+		ewarn "You are trying to build Gnash without choosing a media handler."
+		ewarn "Sound and video playback will not work."
+	fi
+}
+
+src_unpack() {
+	default
+	# rename git snapshot directory to what portage expects
+	mv ${PN}-*/ ${P} || die
+}
+
+src_prepare() {
+	# Fix paths for klash, bug #339610
+	epatch "${FILESDIR}"/${PN}-0.8.9-klash.patch
+
+	# Use external dejagnu for tests, bug #321017
+	epatch "${FILESDIR}"/${PN}-0.8.9-external-dejagnu.patch
+
+	# Fix building on ppc64, bug #342535
+	use ppc64 && append-flags -mminimal-toc
+
+	# Fix kde multilib library path, bug #391283
+	epatch "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch
+
+	# Fix libamf includes
+	epatch "${FILESDIR}"/${PN}-0.8.10-amf-include.patch
+
+	# Fix new adjacent_tokens_only() in >=boost-1.59 (bug 579142)
+	# See https://savannah.gnu.org/bugs/?46148
+	epatch "${FILESDIR}"/${PN}-0.8.10_p20150316-boost-1.60.patch
+
+	eautoreconf
+}
+src_configure() {
+	local device gui input media myconf myext renderers
+
+	# Set nsplugin install directory.
+	use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/"
+
+	# Set hardware acceleration.
+	use X && device+=",x11"
+	use directfb && device+=",directfb"
+	use egl && device+=",egl"
+	use fbcon && device+=",rawfb"
+	use vaapi && device+=",vaapi"
+	[[ "${device}x" == "x" ]] && device+=",none"
+
+	# Set rendering engine.
+	use agg && renderers+=",agg"
+	use cairo && renderers+=",cairo"
+	use opengl && renderers+=",opengl"
+	use openvg && renderers+=",openvg"
+
+	# Set kde and konqueror plugin directories.
+	if use kde; then
+		myconf="${myconf}
+			--with-plugins-install=system
+			--with-kde4-incl=${KDEDIR}/include
+			--with-kde4-configdir=${KDEDIR}/share/config
+			--with-kde4-prefix=${KDEDIR}
+			--with-kde4-lib=${KDEDIR}/$(get_libdir)
+			--with-kde-appsdatadir=${KDEDIR}/share/apps/klash
+			--with-kde4-servicesdir=${KDEDIR}/share/kde4/services
+			--with-kde4-plugindir=${KDEDIR}/$(get_libdir)/kde4"
+	fi
+
+	# Set media handler.
+	use ffmpeg || use gstreamer || media+=",none"
+	use ffmpeg && media+=",ffmpeg"
+	use gstreamer && media+=",gst"
+
+	# Set gui.
+	use dump && gui="${gui},dump"
+	use fbcon && gui="${gui},fb"
+	use gtk && gui=",gtk"
+	use kde && gui="${gui},kde4"
+	use sdl && gui="${gui},sdl"
+
+	if use sdl-sound; then
+		myconf="${myconf} --enable-sound=sdl"
+	else
+		myconf="${myconf} --enable-sound=none"
+	fi
+
+	# Set extensions
+	use mysql && myext=",mysql"
+	use gtk && myext="${myext},gtk"
+	use lirc && myext="${myext},lirc"
+	use dbus && myext="${myext},dbus"
+
+	# Strip extra comma from gui, myext, hwaccel and renderers.
+	device=$( echo $device | sed -e 's/,//' )
+	gui=$( echo $gui | sed -e 's/,//' )
+	myext=$( echo $myext | sed -e 's/,//' )
+	renderers=$( echo $renderers | sed -e 's/,//' )
+	media=$( echo $media | sed -e 's/,//' )
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--disable-kparts3 \
+		$(use_enable cygnal) \
+		$(use_enable cygnal cgibins) \
+		$(use_enable doc docbook) \
+		$(use_enable gnome ghelp) \
+		$(use_enable harden) \
+		$(use_enable jemalloc) \
+		$(use_enable kde kparts4) \
+		$(use_enable nls) \
+		$(use_enable nsplugin npapi) \
+		$(use_enable python) \
+		$(use_enable ssh) \
+		$(use_enable ssl) \
+		$(use_enable test testsuite) \
+		$(use_with gconf) \
+		--enable-gui=${gui} \
+		--enable-device=${device} \
+		--enable-extensions=${myext} \
+		--enable-renderer=${renderers} \
+		--enable-media=${media} \
+		${myconf}
+}
+src_test() {
+	local log=testsuite-results.txt
+	cd testsuite
+	emake check || die "make check failed"
+	./anaylse-results.sh > $log || die "results analyze failed"
+	cat $log
+}
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Install nsplugin in directory set by --with-npapi-plugindir.
+	if use nsplugin; then
+		emake DESTDIR="${D}" install-plugin || die "install plugins failed"
+	fi
+
+	# Install kde konqueror plugin.
+	if use kde; then
+		pushd "${S}/plugin/klash4" >& /dev/null || die
+		emake DESTDIR="${D}" install-plugin || die "install kde plugins failed"
+		popd >& /dev/null
+	fi
+	# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
+	use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so
+
+	# Remove eglinfo, bug #463654
+	if use egl; then
+		rm -f "${D}"/usr/bin/eglinfo || die
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+}
+pkg_postinst() {
+	if use !gnome || use !gstreamer && use !ffmpeg ; then
+		ewarn ""
+		ewarn "Gnash was built without a media handler and or http handler !"
+		ewarn ""
+		ewarn "If you want Gnash to support video then you will need to"
+		ewarn "rebuild Gnash with either the ffmpeg or gstreamer and gnome use flags set."
+		ewarn ""
+	fi
+	ewarn "${PN} is still in heavy development"
+	ewarn "Please first report bugs on upstream gnashdevs and deal with them"
+	ewarn "And then report a Gentoo bug to the maintainer"
+	use kde && kde4-base_pkg_postinst
+}
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 67f8139acee1..e29cd6ecbf71 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,9 +1,8 @@
 DIST modsecurity-2.9.0.tar.gz 4246467 SHA256 e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434 SHA512 1af04f29bf23c51d03cdd3795c530f88b523a645aa02d776a6b23dcbc31decec7cd574919e5c7c7cf82684df2774062de5e465bddbbaf4c01a442c6d49401d3d WHIRLPOOL 1167ba6048a3ca05dcdabf03c67ae12720cca0cec74547fc223ee92ff76b6d5131785fa77b5f16da180e56590c851c192eaf02817b798e4d6f41fa6bfb2735a6
 DIST modsecurity-2.9.1.tar.gz 4261212 SHA256 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 SHA512 374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269 WHIRLPOOL 5f41bebf032f8a269412d104b7632a06af4d4c495658c9cd1ebf69b82c10ce1bbcb34b9dd159a7b00e57348714a5e93ad3db19701dda51479accd3a9dc79a9cb
 DIST nginx-1.8.1.tar.gz 833473 SHA256 8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7 SHA512 546eba1749af0034cb8b924d2432be2f0e82a75c545aa929391ef7234103c3f29376235a2ef1363b120e1825cda15aeb085a05f9ce3596c88466e112e82aa882 WHIRLPOOL cd399083fb14bdb3498f1cd91a1cb59a73d37f323ce7c2a32500c9443f654cb5449137708cf149a0126aedb77abec9d1eb3dce3121f0b378d7d70e8eb18062af
-DIST nginx-1.9.12.tar.gz 899183 SHA256 1af2eb956910ed4b11aaf525a81bc37e135907e7127948f9179f5410337da042 SHA512 b5f4cae48c85cdc9a95006b6a321834de9d18981cb1a25670c9fc948d86b9a8906d25a1ca174626eb418b0afdb3f2e1df3cbb6f5a48bd781e39e2470a4d52520 WHIRLPOOL 0b6300528ae1c29e4f7647cdbe0ea6254b1bccbdcd7f0185b2bff25409aba093c089e5fa3c1a828e2cf7f55fa6d9d2f8b818f85014f37ccbf335a71cb2e93e32
-DIST nginx-1.9.13.tar.gz 907611 SHA256 f7cd529a5879cd9cd5b62e6fc4a3a7e8d8363cb12c080ab480cc718c55736609 SHA512 883e3d3be7a2a9abbeca54bed5b7004fc9810c1548a4de8f09ffc453ee077e75abfd0ae21bc87cd0814278a2cfefd2a5814b03faf4ec0298afbf75e530eb62f0 WHIRLPOOL 38d2e5006de6d9af2575d5b166051b3fa04406da89a6336b021b0a41be0f227566973fbeaaa9ae11967597c90f999dffd67129854693bc56ee840bed5fae5dd2
 DIST nginx-1.9.14.tar.gz 908191 SHA256 2b4893076d28e6b4384bba8c4fdebfca6de6f8f68ec48a1ca94b9b855ff457d2 SHA512 e73a10495a8b199856f4e5d6f428b46e0b1148cee26c8517e360130d9f1e85028b28f311879d31f37e1d3facccf6f215377e984ae937a44f45245fe09a3be90e WHIRLPOOL c4e1d2b8181b9c8c967de2d68314c05c28a1fe44bd35809f3672c2ff9b02d08e2f572970ab0328f85dbe9b29c6dae0c4ebb33586a8c70053e764158c055fa8d8
+DIST nginx-1.9.15.tar.gz 908984 SHA256 cc89b277cc03f403c0b746d60aa5943cdecf59ae48278f8cb7e2df0cbdb6dac3 SHA512 563cec7828d1e398ded83579c3c4afcd83fd809662e64a0212e25a34ce1b599135558e9fd8cee3e07ba028ee4b308e40ce9910a5071a3d8e3b7ec9f9bdef95f0 WHIRLPOOL b87dd96b1fa34824fb6ca16da39d72cf6036f6276766ef420c3be8ceac8e8639ff74e842c1ffd5f8f2dd03d7c411197a05049c1673dc70862cee662b494da88f
 DIST nginx-auth-ldap-8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz 16950 SHA256 2f0b1a65847ea1da801a99b654f132e1c814d2fa49a43a324d8fc4ce6327935f SHA512 65b0aec3a4b28625ef93d166f659d63b9ef7d971dea78b09987eaa02f632bf5b8f6c9afdb6ef444afa466dba7ff67180cad27e138e6818c2ba80bc804f140ca6 WHIRLPOOL 9ef896fa3501415e2c7022448783626af256c6c3878fcca5d6cc042a9789937147eb4c3743f92002ab8d09e4ce828532b9ae321dc284ef2560801da98153d146
 DIST nginx_http_sticky_module_ng-1.2.5.tar.bz2 124072 SHA256 f975c033eb3c342f7247f6524774bbb727aaf630ed984576dbafe5de7a790c58 SHA512 d6ae723f739efb2f0548461931b1c395801684759962beda08067111426b1c9787ceaede91b0e984c023108fd17864c53c53925506f7e8e25ec8d2fc065585f6 WHIRLPOOL 1013c6a51f5989c8131392b3d9704d42c99f9727a673f6205878d0b7dfd265bb6042c1d30089603c9b38e339d48302e6873e77fe380b7e8edba25b71e9e84ba6
 DIST nginx_http_sticky_module_ng-1.2.6.tar.bz2 124089 SHA256 e47b9fd435d7a5a3200f945a9745aaa7b9446495bda76df48f211129f88d6b26 SHA512 2632b04c94f523aa7c9726db182cba11d83e642c2db5798274e67fbef30de95d02e4e95cbfb98bc429d4244d630b5d9617405b43f728ae0117a5c134940c0ded WHIRLPOOL 1b754c02f834c6b4d4930e9c46b8c5accb6c9663718fb9296c92d79bc33206e66e49e4234ca4db9a5afcd42fa23273bdf0e675aa7b38927c4e46a85318c189eb
@@ -18,7 +17,6 @@ DIST ngx_http_fancyindex-0.3.5.tar.gz 14837 SHA256 e0998e83be58bc5787fa9243a76a9
 DIST ngx_http_fancyindex-0.3.6.tar.gz 17252 SHA256 e73f1f0444f8c53601b51da8684b174c5ffd3b4ed6eb7956dd57f8b95485b68f SHA512 ca2de16eef7d5e94104f44f180ebd98674c5799409d70d95fd6359512861efaa95d5242a9eb661363bcc5110032965f326e735a2b8fcfaaf29381023fd11a76e WHIRLPOOL 68c089a11a39685e3cb934c12daf12bd4c7176da6d17a26d4ec18f5bb44c480695e622c732925255c10af4bf819aa52da0dcf457ca40bffdc8a6673a10440823
 DIST ngx_http_headers_more-0.26.tar.gz 28028 SHA256 d6bdc51f9e778a3b23e41a51cae542c1467a1e5e55c1329a7ffc454be084fb6f SHA512 842927de67d28f3cff596607f209d1004b6d49f1d45b861758405ed6fe6f7aab76ad63530ccdfff1c1947db1190dd65dee0a29f50026bfa7a39a9a051561cf88 WHIRLPOOL 0dc37c36717be40a07112388d913d20bc99d76f90604da618d5547f24d93c636c14c2cca18191ff5916b40ec0113da648cfc07e1c00b1853f2b15ce056d5f3d7
 DIST ngx_http_headers_more-0.29.tar.gz 27144 SHA256 0a5f3003b5851373b03c542723eb5e7da44a01bf4c4c5f20b4de53f355a28d33 SHA512 50a45922f8d2d54fca345bf47df71035362a6868b86872528f2414386c15cdcdb5466ea2c0b7c7303dc85084f94ee05e7411da8836cde3cd549c576431c7ef14 WHIRLPOOL bfc3261b6b0a4add707069383ae1241b2bad02099c86985b87cdc595a49eb3eea0c5295d912f536c01110f7954f6738870ad72f1230a202824b5bc00293c7ddd
-DIST ngx_http_lua-0.10.1rc1.tar.gz 574793 SHA256 7b741a45ba8c66972fc7261cd191bdc89179ad9cebbc5af59c899c56811b8838 SHA512 6d9ab941bd89b6a4effb6ccec8aca7058ae4d0f1baa712616222f2fc7d60d78c76c33113a04c5ef71d28cfe55b6247720bd902726f8e93ed64ae50a84f653c0f WHIRLPOOL c494bec5318590f2c1e9e2ed06d4e2d15eb88d6feecb1208a1f968f466309742445c5316bdfbc4170aa5468f654399657799f3ae8a85248a8daa8a0b0ddd0cdd
 DIST ngx_http_lua-0.10.2.tar.gz 575525 SHA256 155feeff08a0b2efaf980705b9ef83d0b341e6d011adad8e2679ea4105668134 SHA512 33ad538f0f63aae91b691ceda593899881b3ac0ea48da6814724d9bfe3d74b323ac5f3b8bc2fa03116c5cd1045e2a12db4e9bf96c8172a96ec1c6cd0b30199fa WHIRLPOOL 6450f144fcae55756b1c2f879cf68a1d2369475ece910951c54e10cd7c4ef266ead56397cef5c4d6c4963f5c11124af635daa415af05524703ff96b9ff5edcfb
 DIST ngx_http_lua-0.9.15.tar.gz 520190 SHA256 659fe4c201f4a4ae1007fa029cef472aaa837bf0904babb6158f83b86536c5b7 SHA512 1d809f873ced8e50422298bb4b730b8e7aaf442c11570cbe892fd73a414ff4f6d6eca7be8b2d2dbf57a136136b17d80596ee2f2f195dcb59776e78df5a94ae92 WHIRLPOOL caf128254f99d674eb370779c6e41c0b459be1c5a2baac7df1ff3498a38349bd2c140594eea3eb29c468a366e265421f90363886be73db0b3484cc6f386cb563
 DIST ngx_http_naxsi-0.53-2.tar.gz 165690 SHA256 3eadff1d91995beae41b92733ade28091c2075a24ae37058f4d6aa90b0f4b660 SHA512 ada592f5e7f80a6d549cc435ee8720df01a788dc88cf27a7d55521bb7e4c66fa11b9ec28216aff7e13c70a5faf12cb745bd398b8a782ed4dea1eecd04b07e24c WHIRLPOOL c5b736dbe9bd66daf7e023f176a08f78225b61990781d7ad5a55d0f35391df7e05bf1b2623a6227e0355cf0204ef9eac1b9fa03aa62b3c0d6eac515f1213f270
diff --git a/www-servers/nginx/nginx-1.9.12.ebuild b/www-servers/nginx/nginx-1.9.12.ebuild
deleted file mode 100644
index 0892a61e8604..000000000000
--- a/www-servers/nginx/nginx-1.9.12.ebuild
+++ /dev/null
@@ -1,761 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.2.19"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.29"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.3.6"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.1rc1"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.4"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.54"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.1.7"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="0.0.3"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/agentzh/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.58"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/agentzh/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.0"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.1"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-c78b7dd79d0d"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.16"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="8517bb05ecc896b54429ca5e95137b0a386bd41a"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-
-inherit ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.org"
-SRC_URI="http://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo gzip limit_req limit_conn map memcached proxy referer
-	rewrite scgi ssi split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM="access limit_conn upstream"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_upload_progress
-	http_headers_more
-	http_cache_purge
-	http_slowfs_cache
-	http_fancyindex
-	http_lua
-	http_auth_pam
-	http_upstream_check
-	http_metrics
-	http_naxsi
-	http_dav_ext
-	http_echo
-	http_security
-	http_push_stream
-	http_sticky
-	http_ajp
-	http_mogilefs
-	http_memc
-	http_auth_ldap"
-
-IUSE="aio debug +http +http2 +http-cache ipv6 libatomic libressl luajit +pcre
-	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	http2? (
-		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	http-cache? (
-		userland_GNU? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
-	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
-	nginx_modules_http_secure_link? (
-		userland_GNU? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
-	nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
-	nginx_modules_http_auth_pam? ( virtual/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl )
-	nginx_modules_http_dav_ext? ( dev-libs/expat )
-	nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache )
-	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_lua? ( nginx_modules_http_rewrite )
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_ajp; then
-		eerror "The AJP module currently doesn't build for nginx >1.8."
-		eerror "It will be reintroduced with the 1.9 series when proven stable."
-		eerror "Either disable it or stick with nginx 1.7.x."
-		die "AJP module not supported"
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}/check-1.9.2".patch
-	fi
-
-	if use nginx_modules_http_lua; then
-		sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}"
-		if use luajit ; then
-			sed -i \
-				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
-				configure || die
-		fi
-		./configure \
-			--enable-standalone-module \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-	fi
-
-	cd "${S}"
-
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use ipv6      && myconf+=( --with-ipv6 )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		if use luajit; then
-			export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
-			export LUAJIT_INC=$(pkg-config --variable includedir luajit)
-		else
-			export LUA_LIB=$(pkg-config --variable libdir lua)
-			export LUA_INC=$(pkg-config --variable includedir lua)
-		fi
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			# Treat stream upstream slightly differently
-			if ! use nginx_modules_stream_upstream; then
-				myconf+=( --without-stream_upstream_hash_module )
-				myconf+=( --without-stream_upstream_least_conn_module )
-				myconf+=( --without-stream_upstream_zone_module )
-			else
-				myconf+=( --without-stream_${stream}_module )
-			fi
-		fi
-	done
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN}" "--group=${PN} )
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${EROOT}usr/include" \
-		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r2 nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${D}"usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 /var/log/nginx ${keepdir_list}
-	fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown}
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/{README.markdown,doc/HttpEchoModule.wiki}
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg"
-	fi
-
-	# This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for
-	# existing installations
-	local fix_perms=0
-
-	for rv in ${REPLACING_VERSIONS} ; do
-		version_compare ${rv} 1.4.1-r2
-		[[ $? -eq 1 ]] && fix_perms=1
-	done
-
-	if [[ $fix_perms -eq 1 ]] ; then
-		ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following"
-		ewarn "directories the world-readable bit removed (if set):"
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-		ewarn "Check if this is correct for your setup before restarting nginx!"
-		ewarn "This is a one-time change and will not happen on subsequent updates."
-		ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
-		chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
-	fi
-
-	# If the nginx user can't change into or read the dir, display a warning.
-	# If su is not available we display the warning nevertheless since we can't check properly
-	su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
-	if [ $? -ne 0 ] ; then
-		ewarn "Please make sure that the nginx user or group has at least"
-		ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)"
-		ewarn "Otherwise you end up with empty log files after a logrotate."
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.9.13.ebuild b/www-servers/nginx/nginx-1.9.15.ebuild
similarity index 99%
rename from www-servers/nginx/nginx-1.9.13.ebuild
rename to www-servers/nginx/nginx-1.9.15.ebuild
index 7b03064bcb12..119693126b30 100644
--- a/www-servers/nginx/nginx-1.9.13.ebuild
+++ b/www-servers/nginx/nginx-1.9.15.ebuild
@@ -60,7 +60,7 @@ HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HT
 HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
 
 # http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.4"
+HTTP_AUTH_PAM_MODULE_PV="1.5.1"
 HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
 HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
 HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.18.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.18.0.ebuild
index f87e480f668b..2d48e343fe75 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.18.0.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.18.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit xorg-2
+inherit linux-info xorg-2
 
 DESCRIPTION="X.org input driver based on libinput"
 
@@ -15,3 +15,8 @@ RDEPEND=">=dev-libs/libinput-1.2.0:0="
 DEPEND="${RDEPEND}"
 
 DOCS=( "README.md" "conf/90-libinput.conf" )
+
+pkg_pretend() {
+	CONFIG_CHECK="~TIMERFD"
+	check_extra_config
+}
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 8668c2d7789b..b381a8a959d1 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -2,6 +2,4 @@ DIST xf86-video-intel-2.21.15.tar.bz2 1977431 SHA256 7d5a140f82a72fd1cbc8a664d66
 DIST xf86-video-intel-2.9.1.tar.bz2 789001 SHA256 95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76 SHA512 62a7c1852b2d0b89be93536e7852caf398fc743e11a12c5071baed5e767b29c382ff5eb9d6c3ab453fc4d94aa16245b607ef33b94198bf7c7626746772fcc290 WHIRLPOOL 7e61c5d1396829aa354c9fdfbe5a21723171390d86b3307a2a331061e128a9866408993410090fe5d607609d245c55843633730bc4521e9cb0ec478c8d6ede1c
 DIST xf86-video-intel-2.99.917.tar.bz2 2259040 SHA256 00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9 SHA512 cbf4d46ad1ad5e5587c0f1f620ff534ef0645270517b60056b9f03e83d8216e2f456de46352a06c37c0c46963cc4ed20b71b815b20ec1bf680ff046e535f580f WHIRLPOOL b26f1b303a27825120e1036f15493119e8869ebae74a2663204fe1ee63cf9fc217e593c469d6c33151a73c9ea6e9df88d0e3a0bb74ece5109b51593785fd4d7d
 DIST xf86-video-intel-2.99.917_p20160403.tar.xz 936072 SHA256 4e5a18807669f73bfc5b0c5c64e2bfa30f4618e9acdab2b4618b9ac2aa4a3b3a SHA512 e338e9302b932a62c1dfe87d9a263786d0b8aaed16c30e00d4013eed93fc667ac9003414cba2d7cdeb8f674427965f7ba873b0fcdd852099b3a0456808c749a5 WHIRLPOOL afa402b528d0b8a9d19077ad5d6a8cae54aa143e72ea047575de62f0816da1a44f933f82c20573491785e428914d868f4c7d9d7a3ea045cd9a941315d0563196
-DIST xf86-video-intel-2.99.917_p20160407.tar.xz 938784 SHA256 80bc6da0000d26178f2c34ed40801137b4a8477b6195a95fab39c4e22b4f5e9d SHA512 e2913d1529d29b6b8daea9b4c39fa50d45b247d66100704e6d5c8c2acd48817b8d8476f652f01e32983b2c34924a4dae23f20ab15ddaf18fce19609d04143699 WHIRLPOOL 6af1f3b8d29b2264a4f1478bf50b69ed8044682f7e5ef3f0109ebcd7054034440ae168c996344841f06a3d13f667d40ed11dfcb63d61885808c6b637002fc0eb
 DIST xf86-video-intel-2.99.917_p20160410.tar.xz 939428 SHA256 c1459d4605fb160fe18d028d679544ab037ecfdca0a7fefff188a02b73220ebe SHA512 78636a6251787d8f60ce8862df14adaeeff3e4813b3cd30ca4cd4e97f2facf8bf3ed8f7c399c37618fd0bd9b467d840c66cd9ba725ee04cf9c1b63fd4eacb38a WHIRLPOOL 1ca3a3daff0689a0acf8763c91dba361916513a5d990b90d111724f5e5424485c5d1ff13dfe1b30d1079add9f896dc340a617e379988409f75ed33192b5f978c
-DIST xf86-video-intel-2.99.917_p20160417.tar.xz 939660 SHA256 5ee2b1780cd5d810d09635c80f9657dec7a0c426b6709df7575888108937c8b9 SHA512 aeedcfa4a2d37ee0be1834905198dd27905e6bcc4287656aeaa11902e6489ee62f4ecde734ac0f2654cec400c94539dcfe1d48e369e21942da43b38f2d6e22be WHIRLPOOL 86cec6aa8f59be996b525c5498b2c48e53a5643a34c7d41028f55cb819a1e94b3285f42797c73f69420f53b37f7fefdb360ff300f8be8049491830d0f7f53d03
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160407.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160407.ebuild
deleted file mode 100644
index 7ca50281d88f..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160407.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=dri
-XORG_EAUTORECONF=yes
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="debug +dri3 +sna +udev uxa xvmc"
-COMMIT_ID="59d371a9b215fdcd6139279435af7e1f6803309e"
-SRC_URI="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
-
-S=${WORKDIR}/${COMMIT_ID}
-
-REQUIRED_USE="
-	|| ( sna uxa )
-"
-RDEPEND="x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/pixman-0.27.1
-	>=x11-libs/libdrm-2.4.29[video_cards_intel]
-	dri3? (
-		>=x11-base/xorg-server-1.18
-	)
-	sna? (
-		>=x11-base/xorg-server-1.10
-	)
-	udev? (
-		virtual/udev
-	)
-	xvmc? (
-		x11-libs/libXvMC
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6
-	x11-proto/dri3proto
-	x11-proto/presentproto
-	x11-proto/resourceproto"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable debug)
-		$(use_enable dri)
-		$(use_enable dri3)
-		$(usex dri3 "--with-default-dri=3")
-		$(use_enable sna)
-		$(use_enable udev)
-		$(use_enable uxa)
-		$(use_enable xvmc)
-	)
-	xorg-2_src_configure
-}
-
-pkg_postinst() {
-	if linux_config_exists && \
-		kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "	      i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160417.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160417.ebuild
deleted file mode 100644
index efa294048cca..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160417.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=dri
-XORG_EAUTORECONF=yes
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="debug +dri3 +sna +udev uxa xvmc"
-COMMIT_ID="81029be07380090195d165fab91d3e1fe1d84bb9"
-SRC_URI="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
-
-S=${WORKDIR}/${COMMIT_ID}
-
-REQUIRED_USE="
-	|| ( sna uxa )
-"
-RDEPEND="x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/pixman-0.27.1
-	>=x11-libs/libdrm-2.4.29[video_cards_intel]
-	dri3? (
-		>=x11-base/xorg-server-1.18
-	)
-	sna? (
-		>=x11-base/xorg-server-1.10
-	)
-	udev? (
-		virtual/udev
-	)
-	xvmc? (
-		x11-libs/libXvMC
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6
-	x11-proto/dri3proto
-	x11-proto/presentproto
-	x11-proto/resourceproto"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable debug)
-		$(use_enable dri)
-		$(use_enable dri3)
-		$(usex dri3 "--with-default-dri=3")
-		$(use_enable sna)
-		$(use_enable udev)
-		$(use_enable uxa)
-		$(use_enable xvmc)
-	)
-	xorg-2_src_configure
-}
-
-pkg_postinst() {
-	if linux_config_exists && \
-		kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "	      i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}
diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch b/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch
index 78c2c05f95ca..b408dba94156 100644
--- a/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch
+++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch
@@ -1,17 +1,18 @@
-From 6eaa9b0dc18e6ddff093c2e99a3c7d5eeb9c8f5d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 15 Mar 2015 14:42:25 -0400
-Subject: [PATCH] Backport some git master fixes for GL/GLU detection to 1.2.0
+Fix broken multilib gl and glu detection
+https://bugs.gentoo.org/543050
+https://bugs.gentoo.org/578482
 
----
- configure.in | 313 +++++++++--------------------------------------------------
- 1 file changed, 44 insertions(+), 269 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index e5b678c..5aa1b7d 100644
---- a/configure.in
-+++ b/configure.in
-@@ -502,274 +502,58 @@ AC_SUBST([GDKGLEXT_WIN_EXTRA_DEFS])
+--- gtkglext-1.2.0/configure.in
++++ gtkglext-1.2.0/configure.in
+@@ -139,6 +139,7 @@
+ AC_ISC_POSIX
+ #AM_DISABLE_STATIC
+ AC_LIBTOOL_WIN32_DLL
++AC_PROG_CXX
+ AC_PROG_LIBTOOL
+ 
+ platform_win32=no
+@@ -502,275 +503,59 @@
  # Checks for OpenGL
  ##################################################
  
@@ -38,45 +39,23 @@ index e5b678c..5aa1b7d 100644
 -  GL_CFLAGS="-I$with_gl_includedir"
 -elif test "x$with_gl_prefix" != "xauto"; then
 -  GL_CFLAGS="-I$with_gl_prefix/include"
-+if test "x$gdktarget" = "xx11"; then
-+  with_gl=x
- fi
- 
+-fi
+-
 -if test "x$with_gl_libdir" != "xauto"; then
 -  GL_LDFLAGS="-L$with_gl_libdir"
 -elif test "x$with_gl_prefix" != "xauto"; then
 -  GL_LDFLAGS="-L$with_gl_prefix/lib"
-+AX_CHECK_GL
-+AS_IF([test X$no_gl = Xyes],
-+      [AC_MSG_FAILURE([OpenGL is required.])])
-+AX_CHECK_GLU
-+# FIXME: AX_CHECK_GLU's behavior diverges from common autoconf conventions
-+AM_CONDITIONAL([GLU],[test "$no_glu" != yes])
-+
-+# Checks for some types in gdk/GL/glxext.h
-+
-+# GLXFBConfigSGIX
-+GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no
-+AC_CHECK_TYPES([GLXFBConfigSGIX], , ,
-+               [#include <GL/glx.h>])
-+if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then
-+  GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes
- fi
- 
+-fi
+-
 -save_CPPFLAGS="$CPPFLAGS"
 -CPPFLAGS="$CPPFLAGS $GL_CFLAGS $WINDOWING_CFLAGS"
 -save_LIBS="$LIBS"
 -LIBS="$LIBS $GL_LDFLAGS $WINDOWING_LIBS $MATH_LIB"
 -
--if test "x$gdktarget" = "xx11"; then
+ if test "x$gdktarget" = "xx11"; then
 -  AC_CHECK_HEADERS([GL/glx.h], ,
 -                   [AC_MSG_ERROR([Cannot find GLX header])])
-+# GLXFBConfigIDSGIX
-+GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no
-+AC_CHECK_TYPES([GLXFBConfigIDSGIX], , ,
-+               [#include <GL/glx.h>])
-+if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then
-+  GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes
++  with_gl=x
  fi
  
 -AC_CHECK_HEADERS([GL/gl.h GL/glu.h], ,
@@ -294,6 +273,32 @@ index e5b678c..5aa1b7d 100644
 -dnl                GL_LIBS="-lglu32 $GL_LIBS",
 -dnl                AC_MSG_ERROR(Cannot find GLU library),
 -dnl                $GL_LIBS)
+-
++AX_CHECK_GL
++AS_IF([test X$no_gl = Xyes],
++      [AC_MSG_FAILURE([OpenGL is required.])])
++AX_CHECK_GLU
++# FIXME: AX_CHECK_GLU's behavior diverges from common autoconf conventions
++AM_CONDITIONAL([GLU],[test "$no_glu" != yes])
++
++# Checks for some types in gdk/GL/glxext.h
++
++# GLXFBConfigSGIX
++GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no
++AC_CHECK_TYPES([GLXFBConfigSGIX], , ,
++               [#include <GL/glx.h>])
++if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then
++  GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes
++fi
++
++# GLXFBConfigIDSGIX
++GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no
++AC_CHECK_TYPES([GLXFBConfigIDSGIX], , ,
++               [#include <GL/glx.h>])
++if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then
++  GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes
++fi
++
 +# GLXPbufferSGIX
 +GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=no
 +AC_CHECK_TYPES([GLXPbufferSGIX], , ,
@@ -301,13 +306,21 @@ index e5b678c..5aa1b7d 100644
 +if test "x$ac_cv_type_GLXPbufferSGIX" = "xno" ; then
 +  GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=yes
 +fi
- 
++
 +# GLXVideoSourceSGIX
 +GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=no
 +AC_CHECK_TYPES([GLXVideoSourceSGIX], , ,
 +               [#include <GL/glx.h>])
 +if test "x$ac_cv_type_GLXVideoSourceSGIX" = "xno" ; then
 +  GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=yes
++fi
++
++# __GLXextFuncPtr
++GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=no
++AC_CHECK_TYPES([__GLXextFuncPtr], , ,
++               [#include <GL/glx.h>])
++if test "x$ac_cv_type___GLXextFuncPtr" = "xno" ; then
++  GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=yes
  fi
  
 -dnl # if using mesa, check for xmesa.h
@@ -319,17 +332,11 @@ index e5b678c..5aa1b7d 100644
 -dnl   # force a failed check
 -dnl   AM_CONDITIONAL(ENABLE_XMESA_FX, test "no" = "yes")
 -dnl fi
-+# __GLXextFuncPtr
-+GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=no
-+AC_CHECK_TYPES([__GLXextFuncPtr], , ,
-+               [#include <GL/glx.h>])
-+if test "x$ac_cv_type___GLXextFuncPtr" = "xno" ; then
-+  GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=yes
-+fi
- 
+-
  # Checks for typedefs in gdk/GL/glext.h
  
-@@ -781,22 +565,13 @@ if test "x$ac_cv_type_GLhalfNV" = "xno" ; then
+ # GLhalfNV
+@@ -781,22 +566,13 @@
    GDKGLEXT_NEED_GLHALFNV_TYPEDEF=yes
  fi
  
@@ -353,6 +360,3 @@ index e5b678c..5aa1b7d 100644
  GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
  GDKGLEXT_DEP_LIBS="$GDKGLEXT_EXTRA_LIBS `$PKG_CONFIG --libs $GDKGLEXT_PACKAGES` $MATH_LIB"
  AC_SUBST([GDKGLEXT_PACKAGES])
--- 
-2.3.2
-
diff --git a/x11-themes/echo-icon-theme/echo-icon-theme-0.3.89.0_pre20081031.ebuild b/x11-themes/echo-icon-theme/echo-icon-theme-0.3.89.0_pre20081031.ebuild
index 141be874bff6..77d3936fdff7 100644
--- a/x11-themes/echo-icon-theme/echo-icon-theme-0.3.89.0_pre20081031.ebuild
+++ b/x11-themes/echo-icon-theme/echo-icon-theme-0.3.89.0_pre20081031.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-inherit eutils gnome2-utils
+EAPI=6
+inherit gnome2-utils
 
 DESCRIPTION="SVG icon theme from the Echo Icon project"
 HOMEPAGE="https://fedorahosted.org/echo-icon-theme"
@@ -17,17 +17,12 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	>=x11-misc/icon-naming-utils-0.8.90"
+	>=x11-misc/icon-naming-utils-0.8.90
+"
 
 RESTRICT="binchecks strip"
 
-S=${WORKDIR}/${PN}-${PV/_pre*}
-
-src_install() {
-	addwrite /root/.gnome2
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog
-}
+S="${WORKDIR}/${PN}-${PV/_pre*}"
 
 pkg_preinst() {
 	gnome2_icon_savelist
diff --git a/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1.ebuild b/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1.ebuild
index fb0e7d4dcf5e..130fe2e8ced6 100644
--- a/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1.ebuild
+++ b/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1.ebuild
@@ -2,17 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
+EAPI=6
 inherit gnome2-utils
 
 DESCRIPTION="Colorized icons shared between all gnome-colors iconsets"
 HOMEPAGE="https://code.google.com/p/gnome-colors/"
 
 SRC_URI="https://gnome-colors.googlecode.com/files/gnome-colors-${PV}.tar.gz
-	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )"
+	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
 
-LICENSE="GPL-2
-	branding? ( CC-Sampling-Plus-1.0 )"
+LICENSE="
+	GPL-2
+	branding? ( CC-Sampling-Plus-1.0 )
+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+branding"
@@ -21,7 +24,10 @@ RDEPEND="x11-themes/gnome-icon-theme"
 DEPEND=""
 RESTRICT="binchecks strip"
 
+S="${WORKDIR}"
+
 src_prepare() {
+	default
 	if use branding; then
 		for i in 16 22 24 32 ; do
 			cp tango-gentoo-v1.1/${i}x${i}/gentoo.png \
@@ -42,7 +48,7 @@ src_install() {
 	dodir /usr/share/icons
 	insinto /usr/share/icons
 	doins -r "${WORKDIR}/${PN}" || die "Installing icons failed"
-	dodoc AUTHORS ChangeLog README
+	einstalldocs
 }
 
 pkg_preinst() {
diff --git a/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild b/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild
index ab1cb5c05846..886d68129487 100644
--- a/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild
+++ b/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
+EAPI=6
 inherit gnome2-utils
 
 DESCRIPTION="Some gnome-colors iconsets including a Gentoo one"
@@ -18,8 +18,11 @@ IUSE=""
 
 RDEPEND="x11-themes/gnome-colors-common"
 DEPEND=""
+
 RESTRICT="binchecks strip"
 
+S="${WORKDIR}"
+
 src_compile() {
 	einfo "Nothing to compile"
 }
@@ -32,7 +35,7 @@ src_install() {
 			doins -r "${i}" || die
 		fi
 	done
-	dodoc AUTHORS ChangeLog README
+	einstalldocs
 }
 
 pkg_preinst() {