gentoo resync 04.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-04 12:30:23 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-04 12:30:23 +0000
commit: dc45b83b28fb83e9659492066e347b8dc60bc9e3 (patch)
tree: f09e7ed499dae58267ca976cb1880321611f921a
parent: eaab68ba6a05bc57d98ca12032440835ef905326 (diff)
1195 files changed, 7692 insertions, 14168 deletions
diff --git a/Manifest b/Manifest
index 79f97c3eabdc..473b5ef14ad9 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28830 BLAKE2B 20671ca02e00473ab50bb2d65941e357e64b4f7f28f7281656ec501ce562c09f316de70b087506b6cbc32e1c67029d52de356b8e35458ef8dac52cf6bbb6f69f SHA512 0777ec3ad9bede718cae76f07394f4bc00833e5dafca75b129f41f83796f20b5b46a6d4415caac0cf2f458c0b955eabf2dca65dadba99f2041d43dfc68f85348
-TIMESTAMP 2018-02-03T07:38:16Z
+MANIFEST Manifest.files.gz 28857 BLAKE2B 9e544769f72f9453cb4e19e85eae1e2098de0ae83bf37c615f19820e612533b7d765fc7f08e92450bbe1f5192b3db88e054060f40c6370ff23d4a5493088b21c SHA512 77eacd9fd67517245725d86ea18ee15939c7ecb4c16be5ff254b5676dacff9cd14ef0fc34d6bf5a74b98aed1e93d2edfad28d7b79b40c62826dcfc0cccec08bd
+TIMESTAMP 2018-02-04T11:38:16Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlp1ZuhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlp28KhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBZgg//Ukdr0FQp7Gz9+Wq1E8KERi0PsSBb3jKm2siZa7d8g/3VwEkPOpue5g0N
-AUcSsAB8CLPPfgh+Rjp79YeCXGGElPe7MsbOsAlDjL/BScmE80nGi0YgR6eQ1I6T
-7xO2ee81opy6WAp+Ne8sChezDgpfznp66RdL0FO3ONjrwJ2KLVDpmogaNTgabn9+
-8w8WOFWpu8SYc+1g0A3c0rfe06dOSTe/Xgf/qBE2S30d3iANH6Uuh9vSR+hybW5a
-yiT3saUnc7mFjmxLO7Q59A1N81IxfQptKZKCFrFQCl2sO81BPDPFEOX30RV3Hoaf
-jGcF4RsWBAC5s4UBQ07a36ZrV9Vj8lMZuJVnn7hd8aeN+pGwEqC7/HW0xxh6w2FW
-g3EloVOEWEt9rTKZJAvhEPhkM0532lmwWys6HAq8GiyThg2n56mHSCzR3lTr0wO6
-8ATKMnDjdFzp8QC6AHERX8in28CkkIogeRsnY+8YqRirjVstAA32ZJC6hY5wLcVL
-JW/wheZ9wrQbTe/v+wk/McS5hJhxLVQjq7X9ud9Kr4cVNiqcLSnD0CQWI+7tIvUC
-uTSXVLJzVZwDjtQF9HNtec23+t2NQam7ZBYR+Pu25A3Uqc/uoschh4cT8hGeCJWC
-jht/5sg7BtBq0CJ0QdBun8X5ibUmGB+IhNMt5t/osCYH7c/V+W0=
-=7oIm
+klCyEg//UJPxynIUnqqpur1pPwPjFauZOomu33/ogkI7gkWtL6e/VrbP/opun/ld
+U8MxiOpalHWgOl7WFwwQ+oykfp3pmfmEzZo0W4+cIVJgNp3Ir8r13m2x4iAXCvNJ
+xkbbmlgPhhDlth0TKtykFIeDRd4AGYxEzYNUxFXx1BRb4v2VX/Za5BosO6IV5zU/
+e3sLhvjJedHBYT+JSiBI4wlJf9fiP1Zorp/03AsfmwSFxITsc4wC/YF8jGSNPyhj
+itkohGCfY2fppMSuXm9tYDe7S2ZlkqeUqoMPhTzRdgvyg5tdyx3s5nYiANE91pFC
+LjTtCL1oU7Nk+8yW5j7burMROndUr8fJFs5eAXZ/cxqoE/lepNqZzcGmoLL4O/XN
+M6KNWw0kz3A5XeMin+cELXQvBGCNjDG4h6OSH7YvfA8qcoaJbY8Hz9oWHhBEQwCX
+g+0ki1n1VRmQeCy2IamHZxpDgi1+U5aUUZiW7OcuDT3N++/1HKImlRf+9lIzjtcg
+gXX3j7Va23a0T9molEzLYyTc1Z4d4Yl6xbTw8ZoU/Vv3RnjsxRz6jmUBd4v9Gzjn
+Vg+p7XFvZ/ifaE5SCJRzU5Si5YQ6vyOq077vS4oOyK1WSNulHcccHdvpEkBsiqPL
+QH1YFgGZ8enmdjCfdsvMgtTW8r1/VwOYGXqZZwOl9INbWi7xT6g=
+=l67V
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 5d87a59e3eda..b0e993bd6817 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index ef77902b1618..0fbaa25a5c64 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 6c9d6eed086f..06d4e65b0711 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -4,7 +4,6 @@ AUX logstash.confd 775 BLAKE2B fdcf55e1155c746764aa765350367c421f9ba84b6a1a1cdba
 AUX logstash.confd-r1 837 BLAKE2B dd8362a386c865b44e05dd4a244146c5b593e4497d876c23c64e2f2811155355fac51e1af7ec079a8dad7141c2ad3e0eecf3b58971efe3352d4e61d210b46400 SHA512 7a7dcbfe2a8f80804083099a942ca51b235440cd356c1e2310ed060c9260ca0ee7d970b0f5293c67290b17bab4e9c8e0669bdef98f51ed1a97f83ae444c7861e
 AUX logstash.initd 2091 BLAKE2B 980722c1c3cd0cc60cf440d5a06185c66ac4348c0e8990036812ad8f5cbd4e2561affab3ef1de2482990635169afdd10c0841167494d2bf024b28101a0df45fc SHA512 5592918e82182f638a02f6446f9103f70274fdf615573aa4463fde1dfcfa7955c715b0fdcb1f98de9c19ab86268b439d253a696b27f32e55d830cc3839231e30
 AUX logstash.initd-r1 2176 BLAKE2B 37c05148d3789c69805ae5151bed5e297d71b9d60d71ff98ed411ac59b73c4a2a9462e6223a2c960301c6228c84879460ae0f793a24806768fb727b01d982709 SHA512 392c8297c6429e0384dd75073773e1f8f51dd62fd155b2a524efd9e862df114b13cc63cf37237526aebe838b5ff26a8f26a3ad08058a56a723e25025df9a16af
-AUX logstash.logrotate 103 BLAKE2B d87e7945c35a01e9c62731a4561d0dcbd18413717ba656ba69b449d94c9c4cfc9c690dc2562e348318b93b477f9407e0be5041bcbc55a6797d7f0c0a5cd7be65 SHA512 a5b508d49889dc27722ba82322082b3845449ce99e9e65a4936ed2a49ba2a25a55c0d3bdb31f560da94190d41b39192548f63074ecf5376b9b2b9b73fdaa0ff6
 DIST logstash-5.6.5.zip 109135563 BLAKE2B 6846231439807dd4fc77ae86af849aaefcc9084482f2f88de6148da3d31ef583164da6749ebe0c4def83217e95729a933acbb3e04777db58639eaab91de06831 SHA512 f1dcbb8f67d2f2868e38646b56376428e0996cbf302837300939b8c7ff6d764417fccea40f90559c48441f939e6940e84501ee3ad1e29ad2538969f2cc12b2b8
 DIST logstash-6.0.1.zip 116215793 BLAKE2B 676810b9cd62f578e31e1d63d4aae8c920590905a7344434d5e14607bab0e3ce59e2740e6839491f44ce769b24330a7a060174dcb5e6cb9cf51a31d165ba990b SHA512 395e4e2ff199d9ffc5156901d6ba6ab17771ab8f8859acede74567b2294e2d7ee2a6693e79f7b3e82c8d5c1959ad259bfb22e7992670cdcd3b73c7b72a635a31
 DIST logstash-6.1.1.zip 116335093 BLAKE2B e7a990c2ea0eb3ec7de714f038765817c76eaf9e6cef0e55106f1f1aca406ec95d6be779f24c1fa28e096b51feeef968cb31f416f99c85c2f45d798bb74aadf7 SHA512 a2a420169dff31f3d5d65628a9d1eaad930a8e544fc4e986e3671ffeea3a1d03c8f77f8b51568a0da082588a843568fb7aefe29c1c90365882f429f9536f9240
diff --git a/app-admin/logstash-bin/files/logstash.logrotate b/app-admin/logstash-bin/files/logstash.logrotate
deleted file mode 100644
index 013c8ea921b9..000000000000
--- a/app-admin/logstash-bin/files/logstash.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/logstash/*.log {
-        copytruncate
-        compress
-        missingok
-        notifempty
-}
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index a719cd26e5a2..fe74defce754 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -29,6 +29,7 @@ DIST systemrescuecd-x86-5.0.4.iso 501141504 BLAKE2B 01acafdb8e7ac8343f0e30ed7be7
 DIST systemrescuecd-x86-5.1.0.iso 505047040 BLAKE2B 3653bdd2733cfe214275ab8d3a95a1cab142f72a12da7fa7f76af8faa1801a1ab4da74493efeb2e1b759e871b1ddf8a847825a4f37ae6c3b009fd90e4dcfdd4b SHA512 15d019bbb91019f1b6d1847fc786e6c02f3f768826241e0823842bca9745ff1fa48fe7d32828f899b90845b2f4ce948a1f98e093edf8ca4c0c39cc0da72b4aa8
 DIST systemrescuecd-x86-5.1.1.iso 517359616 BLAKE2B f139a521076f0345a65bddfd999f7dd4479a9fd26e3621f2c419804228922af53f2e6d99a97919db0041e4199a95ea745d674a7b0a61f86dc5d9e10ff562d314 SHA512 a4063305da50ea8b73fb7157f46bf386b80d3ef777adabdcdd944814c801d078fe63778f166b80788b0851549b35bf6ada5940ca5a40a6c1a3e0f4c66efbea91
 DIST systemrescuecd-x86-5.1.2.iso 523479040 BLAKE2B abf6f1e3e05e382b48dcfd4ecde9f70896462418cf36057e3a42dc2366e0b56133deeb6f00363d15d94238c22fb8ac5c88b57ca6c213c9dcc299fa04def5e2cd SHA512 516e60632459dd5408f83035aa265ed4169b13f978a23960a85837c9c8b5bbab70776e22a6e6727184bd9df81cbbeff4a5819d5927ff0ff3a79036bc4c54cfdc
+DIST systemrescuecd-x86-5.2.0.iso 569669632 BLAKE2B fe31a68df650b46bd875b91c643c8f1daaa60042ea6c59ac452bb99a2792dcdcee62f1b60c329a70c95689af22c1a0fc52a966631af347258d665f55d2f6d8c0 SHA512 42da80a419aa27bea891339dc163a62bff8ba34d74c202a7fd0317592e8870a71ddc7fa9e9ded5e9d2f75dc36ec8417673074ffde60ea472815405456e34876c
 EBUILD systemrescuecd-x86-4.4.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
 EBUILD systemrescuecd-x86-4.5.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
 EBUILD systemrescuecd-x86-4.5.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
@@ -60,4 +61,5 @@ EBUILD systemrescuecd-x86-5.0.4.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e
 EBUILD systemrescuecd-x86-5.1.0.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
 EBUILD systemrescuecd-x86-5.1.1.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
 EBUILD systemrescuecd-x86-5.1.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
+EBUILD systemrescuecd-x86-5.2.0.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
 MISC metadata.xml 585 BLAKE2B e0ce16c78e84339e1171bbf2e0aee7e27c3c32d4f795b1d176d872596330c531e6f960acd52526707464da2ad8d058035c42f3b9ff440bce139ce4b5703933d6 SHA512 51a7820398c4c637017c4a38bc0cd7b8b157e5dca57af0495a05c3df0bf09662287954bc04b24995585e8ecf3ff510177561db4dae3fadc64490d184319c18b6
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.0.ebuild
new file mode 100644
index 000000000000..7bfc35a7dd27
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+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-crypt/Manifest.gz b/app-crypt/Manifest.gz
index b2bc4a12e580..54706bc58836 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/Manifest b/app-crypt/openpgp-keys-gentoo-mirror/Manifest
new file mode 100644
index 000000000000..95ca67af09dd
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-mirror/Manifest
@@ -0,0 +1,3 @@
+DIST gentoo-mirror.asc.20180203.gz 3054 BLAKE2B 4904aee11e80aaab7113356eba5aa8fcaced960b253bf5ba40addc6e4026fa7342319517af3549e902c547d42775fffd8713f1873ac9685d5dfe0207655bbfa5 SHA512 429e1226c535b1c3e0a87b471bf03a6c216086a5d801f77b5061b8f00b44a597e5569b5be58ca3a01aaa2d18c1e323532587e7403ab5ef51d718690d0bad2059
+EBUILD openpgp-keys-gentoo-mirror-20180203.ebuild 600 BLAKE2B 298ad89c2541312023283c0ef39342244c6611c0d9fea252417be1dfda81418fe70a2be86ef3410edc196cad37094e97cc5cf7c92f5ad642a3f737a3b9c8b4b0 SHA512 3e6d5c63648664253dc6b07e25b1dcedf6af316f19587d6e024be6c3c397769ea15737fd836f6873313ca12bf5d8a1ea780959ddb8d4a143dd163129bc1e36e4
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/kde-apps/kdebase-data/metadata.xml b/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml
index 2fdbf33d963d..0319eec4c8be 100644
--- a/kde-apps/kdebase-data/metadata.xml
+++ b/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild b/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild
new file mode 100644
index 000000000000..fc597b55ac39
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP key used to sign gentoo-mirror commits"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Repository_mirror_and_CI"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-mirror.asc.${PV}.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins "gentoo-mirror.asc.${PV}" gentoo-mirror.asc
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 7beb53e64575..fc280a329eb8 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/circe/Manifest b/app-emacs/circe/Manifest
index 8ecc76fd5e29..ac9f8e13fd6d 100644
--- a/app-emacs/circe/Manifest
+++ b/app-emacs/circe/Manifest
@@ -1,4 +1,6 @@
 AUX 50circe-gentoo.el 84 BLAKE2B 256e2b96a42e5662222eeadfb0fe7277a09eec8119903ea6e3e9a1dfac3157e238d383051b0738b1a8d555250181db67546da50743221314a0ba1353474ad81a SHA512 3f3c92f02e0a6ee760e83b83c4685a6b7f3268d0cb99abc9be56bdee8dd794d177f865582e45e90f895d1a2d9bbdc2ce39a3a60c7fc4eb973021eab66d8dbe47
 DIST circe-1.3.tar.gz 118776 BLAKE2B 61ffc7df022be50beaba29a4025fde6d7cbde5cab28d0661e2e3388f712281f8d9370b92e8c56b4eb49984573d5a2f7edff308a7d1fe74ff630620f0867b1441 SHA512 60bbd752c73e875f2306877591ad8de324db0a7446bbfebf460e44ef19c0c28d40d08c8ed9e0caa4062859b07545d310d86380377a479eb6bc38c72decfaa213
+DIST circe-2.7.tar.gz 237375 BLAKE2B d9978cc3e0c6431dace919efbd323f90e36ce40debb6e03c955b8cdfbed60ac0bbe27c68dcebfe2df9aabd2e7198d2d6da993c2ad41b5ede0b5d1b142217ec8f SHA512 6f4e0925381ad051e4680b5413eed000a6796d2e9bef35a052464a07968f67edb19d99f74be93620359e061c044a910e35afd1f88608453d264bf37826e10af3
 EBUILD circe-1.3.ebuild 478 BLAKE2B 2d00904395640bac227e8d91ff29d9f052054a9c95d2d0c241fab9a1bdc227092e077d03f279daa11b0e5a62824efd3d49a97fde1f49bb7c522a93076ab0bdd0 SHA512 e947fce19df80ccf481355d8f1dc52d624f365d86bdc7fe649ba761ffab3d8b76cb05dd797680a1e5a399255297dacebf1f8384b6976ade25fedbb370c0034f7
+EBUILD circe-2.7.ebuild 536 BLAKE2B 1fd9cd5beedc0ed87239b73fb7854bb151bd315c82606a2975335aea76b2df195151023360f65c63c926bd76a4bac780421cd23175451cb1a11523c594287f52 SHA512 9f645e2bfb0238b57e233090bc257230ad232903cd005445e37123f0f3b7f011db41a0b3167f9668bc7b9c358f8bb01cc6d4f0f15b327bd2529322cc3563b2ad
 MISC metadata.xml 342 BLAKE2B 4f3499a5d6fb9d4544670518fc375872e727539f379013feedea42161cacda04c5d52f97e8ee8abeb95b847dd3ff6c3e8616358ed3131f66575994d9d3901479 SHA512 2c104d64da8597b5a4da39d6e2c08e4c186de9d622bbb6b767443984accadc5c4ca9d7cc70265b39ebb9d9165d5e1e9ff72b0106b9015eed4ab8d3b87a7f1021
diff --git a/app-emacs/circe/circe-2.7.ebuild b/app-emacs/circe/circe-2.7.ebuild
new file mode 100644
index 000000000000..447bd4da3a03
--- /dev/null
+++ b/app-emacs/circe/circe-2.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A great IRC client for Emacs"
+HOMEPAGE="https://github.com/jorgenschaefer/circe
+	http://www.emacswiki.org/emacs/Circe"
+SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+ELISP_REMOVE="circe-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="AUTHORS.md CONTRIBUTING.md NEWS.md README.md"
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 91e4801bc761..e095682cb694 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index 9d15f500db4e..15d52ecb3c6c 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -1,7 +1,7 @@
 AUX laptop-mode-tools-1.71-wireless-power.patch 943 BLAKE2B 6c8539037d0e6bb5808df169f95868aeff0029566be47a4fc3232f41c93a3f2763561b738b3839c8370e937ea0c81b4e5c830af22431a23bc1419313e1573f71 SHA512 cf61599d5f9240e20bd6acec8b7b200cc33cfa21712bf71c5fc2053d344d2c9336a01ba4f3772caac441144c5c40880d61209319c9e58307e0ee0504a2191f97
 AUX laptop_mode.init-1.4 1059 BLAKE2B 24dcf91d75df6cffe13cda1c8b9c85c016dae393f79f14ac0bc37c293e0d40e7e7cb34bc31b1c387c10ee74978d1c030fafad60f4e2428a8fcadf03163d5e48a SHA512 4242cda1df6b55cd0bee66dfb9137b6f63118bc31c5f703ed44c42738f47dc794d7f1ed6dd9ba5696b606c4bf624428e8f21e1683cb698d8dda249833a4c5f68
 DIST laptop-mode-tools_1.71.tar.gz 118833 BLAKE2B 21e6399d35d3f35dd75e5640eb50d679de87bf40435484e0c7cb67dcd0f2a794b5f14b48e375c302ef749efc38677b8abbdacfd3612206fb0125c52b9d67a89b SHA512 67ef4ed4c80f3a64ab9f0f9003d415f9e8759fd0ee1c7a82837d423a0e7aeb03ab95724afd89ae223f954ae0baec5830c8fa600bd6e2e351aead83a656f9b665
-DIST laptop-mode-tools_1.72.tar.gz 121392 BLAKE2B 7aa02fa546d04423c45c27afd7b4c79ce10cdf8e7ae986d66fb664ab5bd6a05c6ac188a456f3afd46780cec7ab74d2cd83b4ddf1e14f6dbc517442d03bb960a6 SHA512 9135df29d4076dadc805470d742007b1a25be962f4181235126d1bb697b362c646cb9c4839b57e92314b8207e23eba3618b2d985802836bcae22f6a4aceb66a5
+DIST laptop-mode-tools_1.72.2.tar.gz 121437 BLAKE2B 1fdcdb88183156e4983b4561218164df5dde9fc91e85ab0ec1e6a401d3e5c5e70597a97e16c476949e80a674c34683eac6429e64e76c7921bd28f560e4ffe3cb SHA512 9a3960bad518aa73350b72ce30aeb80f3cbb1bf0fd6a11d5afe396b25c2b73f3b3d2fe7de0741eb94c9e3467c85a99741dc7acfd85339b9eb1daca09d3f8c56a
 EBUILD laptop-mode-tools-1.71-r1.ebuild 2599 BLAKE2B ec233f70a291a8a9d06348add2192d394c9a9ede36ad9eaffd5f9d583f81bae08681efb26eb1f587244763f7dac2b0516427fbe6299f99d43151dab50c857b4e SHA512 ba5534e5524bb4215a8a6c7ea2de896e1d3c3e6af014a96793e8706695d7fd1df87810ca8dcb05a63b4f3c973a288112c5add486d5001ea352093c91f87bc339
-EBUILD laptop-mode-tools-1.72.ebuild 2548 BLAKE2B 2380f1bbdd85f5d03930116f774904d283016a458313defd6efdaf24b1d6ac5e12f859bb1d0a6a6dcb2f559fcccdf8a7dfef9262e3adf6043468095a3ed98935 SHA512 374c853d1003c288fa2877bf7e1fe075c80ebedbc0fb869764327d8e9106a0b595a3449a5a03540bd0726309d37162d18d152683bf3ba05183e42b8f8ffcffdf
+EBUILD laptop-mode-tools-1.72.2.ebuild 2548 BLAKE2B 2380f1bbdd85f5d03930116f774904d283016a458313defd6efdaf24b1d6ac5e12f859bb1d0a6a6dcb2f559fcccdf8a7dfef9262e3adf6043468095a3ed98935 SHA512 374c853d1003c288fa2877bf7e1fe075c80ebedbc0fb869764327d8e9106a0b595a3449a5a03540bd0726309d37162d18d152683bf3ba05183e42b8f8ffcffdf
 MISC metadata.xml 436 BLAKE2B f89deae094b0a595dfc688ce45461a20a8b4b66191de36b3a40d01ee570c34ef59dbfae2fd14b6e4e7c76de4277907a74c21e7139d2f0c56d4eae50d4fcde32c SHA512 869ee9290fada409da987a2ecdd962591a425e43f89403046a208dee46802f3b0071c099590b486e4fe09a60dcf6de802088f153cedf44a361a58e7d9395d193
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild
index 8e38fc45f3d4..8e38fc45f3d4 100644
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 70b4885c18f9..8321b359c1ff 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index 112f7106a423..992f623b4168 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -1,6 +1,8 @@
 DIST ranger-1.8.1.tar.gz 227415 BLAKE2B 111da01dcee27a80da7d52ca7b8296386e1ddfffb49e70ec586e6c6a16af6663450639a9699630271a9062f96a406ddf8509f35cb91dad6a278ca5953c651ab4 SHA512 40450d4e80017ac62d60ea6de231c10496fec1680f15a14006d3b87aae7f34cb2dbb6b810ced89527a4cba2975dcd6c037217e86fa806a0ba3cd39dc7dee8f04
 DIST ranger-1.9.0_beta5.tar.gz 235886 BLAKE2B 730169abfb19ee95fb97d8ee95752a6eca6afa2795896db011e7bd44b6d95b01de747b3ad590682f97d7a6f2e3445c52a045f8d4afebd5abe2b94909f1f626a9 SHA512 728efd93630e9c8bba67f7d567200a0cb21d19d8d1b5dc4ec63a454b1169de9427c1b0477754eea1ce5b0d0ed8e79d964b4804587152e30205c1e5a73f938e0a
-EBUILD ranger-1.8.1.ebuild 887 BLAKE2B 2a6aa2c0ce9a69b3c48fcf93039945b5094dc146cabbb8099ec628a2d2652289f76aef94cf46713072284cdd079e779a88f42e0bf84298b490a04d3a8209c083 SHA512 03aa94552ef555ba29bf6771df039a4ff36396e88bb1b48b49323f9172f268248cb58332152399b1185d35c0ee6d6fc4db651613888214b4f0fa699c6dd6732a
-EBUILD ranger-1.9.0_beta5.ebuild 1120 BLAKE2B 39612814897cf89ab2b95dbaa6613934706edb4ca5b186a1a547193cdeceb8920395b21b4167e09d6a0aa92e96a3ae8af10536310f4b3fa95bd967094577cb65 SHA512 876117bdd48930abe0fea28092775ebd29e962ff58f9562d3353eb8d070d87260e0249b549cd3cb8bc1221b873ac277c22e97075ff3fc364edef398754cc329f
-EBUILD ranger-9999.ebuild 1022 BLAKE2B 363976c6202d2418352bdaedfab554f62bf082bccbed838cd70905fe5d6b79679703d0a41cdfe2638a3eacb6d9473ae0099abb71ebe787cbd31eac1fff2a4a7a SHA512 05b5b6e40329215f3062fc09f40a47a0406b77982430c76480d604ee6d0c6a765223ab9cd3cb904ee771fdb2f77574088547c2fd3b6dad6d706270d811146cbe
+DIST ranger-1.9.0_beta6.tar.gz 240948 BLAKE2B c0b04769aef7d5939d6b8042a7ffeaee8e59c08d9965ce72bd643dc8fc5ec5a28ec0079a21bf9e6ce4853752cb942a02a06e3c559a106c894e4fdf5f41daceac SHA512 4598f813d8505ba040397b504642061bc61ebbeaa73eff86841a1976f281e6565833dce57ae1754e7329598ad1444a0d96d5bf6fc90af56d75d747e30da54996
+EBUILD ranger-1.8.1.ebuild 887 BLAKE2B eeee3bb45d132f4602091a278a0706a0510722ff81ea9fbadf2ed0adcecd95e5a0dcce9fb8c4855445259f24219a6560069815d3f032c7d36f701c933790f96f SHA512 b2a9e9d613e92efcee3c87b77e36d1577cddd0ba0e88295971bf1e62d0e6f115ca27bb9aacbaa07f90e794087ebf82c605a82e7f5eb99141244f1ae5b87b6b56
+EBUILD ranger-1.9.0_beta5.ebuild 1120 BLAKE2B d43a100c9531d76d51f5e63de11dab9b45ed7eac6ba2cc336d7a78338d2e760db1daf8a3dc6dcedb8872636aafd2fc8f7bd2f50ec40b706fb003ad10965630af SHA512 359fe404649aee1ad24078dc740f4094520e8137d8c5e684b31adefaf9d3a7055d8f3f23182f8f9854d263159b56524d25f625ad82bf8f35ae5d396169f3de1c
+EBUILD ranger-1.9.0_beta6.ebuild 1120 BLAKE2B eb74b1560eda590f6781001a3ee9020fef8fbd55a6c249973c63bffd9fe4c6197cc9d87251123f03aa84fbf9adc97d879cd340e3cffb05a4965364bc4d8815c8 SHA512 50043c251c94ce850ddd2e0beb4f4f2f6ebf43ed698b7644e2a437450c7486904ba2ab896b16d16124e85500668a31d5ae1ca4ab555567395d7299eeb6f08816
+EBUILD ranger-9999.ebuild 1057 BLAKE2B bc5214a1b7b8b532be1738a7f2c9965fed1cca22176799959f9faf66edcb0b2a738c8b8c12a3fe3df0b60a928e04f17b19aecd07d51b666a697273da53f21041 SHA512 9355061867ce3a78b383cf0bb960d478e5c0f44f7c2efaa1488380f04abe9689335c5d725b398a2901b0e42659cd3ea54b4e82647e08aa73e0448f0c2e0d38e2
 MISC metadata.xml 694 BLAKE2B b7b43401693937cbe92d0737972b55168f10ad3e8c9b1cd66db850bdf1b1517445c6c0258f805f5d3f8f4a00a27efb4e5235d46739dac7daaada1d323d08b19e SHA512 d6a97f7a6342dc1f1e14fbb14f2c0d28b5c2d2f148b0ac4078421e85f25273b38d489009c1780570326d374196a1a93cdb4aa86de55265db643092affe610e54
diff --git a/app-misc/ranger/ranger-1.8.1.ebuild b/app-misc/ranger/ranger-1.8.1.ebuild
index 0a85b645758d..a5bc233b9fec 100644
--- a/app-misc/ranger/ranger-1.8.1.ebuild
+++ b/app-misc/ranger/ranger-1.8.1.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="A vim-inspired file manager for the console"
-HOMEPAGE="http://ranger.nongnu.org/"
+HOMEPAGE="https://ranger.github.io/"
 LICENSE="GPL-3"
 SLOT="0"
 
diff --git a/app-misc/ranger/ranger-1.9.0_beta5.ebuild b/app-misc/ranger/ranger-1.9.0_beta5.ebuild
index adb43f4ea259..92d244bf1345 100644
--- a/app-misc/ranger/ranger-1.9.0_beta5.ebuild
+++ b/app-misc/ranger/ranger-1.9.0_beta5.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 DESCRIPTION="A vim-inspired file manager for the console"
-HOMEPAGE="http://ranger.nongnu.org/"
+HOMEPAGE="https://ranger.github.io/"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="test"
diff --git a/app-misc/ranger/ranger-1.9.0_beta6.ebuild b/app-misc/ranger/ranger-1.9.0_beta6.ebuild
new file mode 100644
index 000000000000..7056b9156b43
--- /dev/null
+++ b/app-misc/ranger/ranger-1.9.0_beta6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ranger/ranger.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DESCRIPTION="A vim-inspired file manager for the console"
+HOMEPAGE="https://ranger.github.io/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="virtual/pager"
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# use versioned doc path
+	sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Ranger has many optional dependencies to support enhanced file previews."
+		elog "See the README or homepage for more details."
+	fi
+}
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
index ac8d37af176d..a078aa0428c5 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,12 +11,12 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/ranger/ranger.git"
 	inherit git-r3
 else
-	SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
 DESCRIPTION="A vim-inspired file manager for the console"
-HOMEPAGE="http://ranger.nongnu.org/"
+HOMEPAGE="https://ranger.github.io/"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="test"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 9da1c6f27e58..f21bf078b190 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index a29b66a6e641..af490ad9ef1d 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -36,5 +36,5 @@ DIST x86-debug-libreoffice-kde-java-5.4.2.2.xd3 518297724 BLAKE2B 580d482859c27a
 DIST x86-debug-libreoffice-kde-java-5.4.4.2.xd3 530430093 BLAKE2B 5619d7179d1bbbac296a7d91403d5ae09f63ce0548a1c90fbdfee481c3595221e6428061e5cd59aa94454a587fba6e2a0f0afed799fb5de26f01e708d8e4a230 SHA512 67c3f52cfd06cfa7c9133f4c829b8457d38b7ae83f663cd8b185105959fa5e022bd037ada8bb9ead950dfdc7437597b8ac4c98831d20d2422b4dcda518613aaa
 EBUILD libreoffice-bin-debug-5.4.2.2-r1.ebuild 2678 BLAKE2B 1e8f25ddb594c05f9e4e496b83fe5d0aae84dc55a13d770200fd72d7be6a0edd3824bff9e651af61c9b96e4a908d7aa9a0f339af3f1cac33c3d8bbd22261cfc3 SHA512 997eb0c415491c844ec8c2028501e9fdb23cabbe4159e74b575ca4c790c8600120afe8cbbbdf96e571195f88621cdabf138b055d7dd3e3f1b0c5dcf15021560b
 EBUILD libreoffice-bin-debug-5.4.2.2.ebuild 2678 BLAKE2B 1e8f25ddb594c05f9e4e496b83fe5d0aae84dc55a13d770200fd72d7be6a0edd3824bff9e651af61c9b96e4a908d7aa9a0f339af3f1cac33c3d8bbd22261cfc3 SHA512 997eb0c415491c844ec8c2028501e9fdb23cabbe4159e74b575ca4c790c8600120afe8cbbbdf96e571195f88621cdabf138b055d7dd3e3f1b0c5dcf15021560b
-EBUILD libreoffice-bin-debug-5.4.4.2.ebuild 2679 BLAKE2B a312f9286441c3868303f94806ef8ab85eb14e30fb47973ce5bdf3150b9fbb9f85aa1db31a7decea5fd5402717eebc712df1922474db9248c9cab3c03808c3de SHA512 be667472fe792323f833a07bb0405a6d59b2468b3a4fb3252f486cb6f1fa8fa7edd847eb6eb6374ed929722f3ac301cd12b67b04f3e32cbd760f8a6aa5a18447
+EBUILD libreoffice-bin-debug-5.4.4.2.ebuild 2678 BLAKE2B 5edbd7665312997ff123d2f29b654a007f3c23f780fc79b259ae29c95d1073fd39a8a14d71f60959f92f8a931feb17f0c6fde217fda135a90e9a721afc49e627 SHA512 f65b7b9109b221fc5769c3b13edd5057cf3f2ca4c0a9b41b16a04e2bf262c0d36f4fd2e06b21fe79191c69b9ba42123145c1f2a4080886bfb8448f6e70fe51f9
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.4.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.4.2.ebuild
index f8723d429dac..c88a1b8ba61a 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.4.2.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.4.2.ebuild
@@ -46,7 +46,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
 
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 23a63b0f87ac..83109d8e6059 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -37,5 +37,5 @@ DIST x86-bin-libreoffice-kde-java-5.4.2.2.xd3 24919539 BLAKE2B 7da2fcad2eee3d35a
 DIST x86-bin-libreoffice-kde-java-5.4.4.2.xd3 23590122 BLAKE2B a8f9467ab022a0181db8bceed85596ab1bfba49c4c629049aeee6b1b65a2b1a0f6bef82a46f0b5f8ce93ef2a3f977a818be90d72680a6889db4f2efcdd0f6aa1 SHA512 c574727bc3a0c9d9d0a97f20c2afd48e947dd619ae400ba76f8fa2844b84392da5fd42d0abcebb57ae6beb34fad84782f6f5d74a718d284e262796ff826ab1a5
 EBUILD libreoffice-bin-5.4.2.2-r1.ebuild 6393 BLAKE2B c5bb2ea55b0df8a91e9b906488f123bd552d946e9b1fb21447cbfa2d1b95e1cee212ed794ff189c5b5af3775435a7805cc48d2d64f72c7657dcb8b6f0d0c1830 SHA512 a54bc65f79ea2d19650eec7cb9bb15dd4f546aea928f597941904f36e286cd379fb15911d766bcf96515e11fa19d0d0fe5f3a96d8913b76a898efae86963b41a
 EBUILD libreoffice-bin-5.4.2.2.ebuild 6412 BLAKE2B 6b614e6784bb1f465803a7bf22547e0d8af203b092b882a503f03acf01e5b303bf1c27f6e609301673d3fa1ff1f6a3863e4e2cefad4be099d168c4e3335877f6 SHA512 cfe89c42af3682d6cfae9d27bc75ba93d69477a8b0ddc77f6d4511a2a9e31d7a9ee299e91627d86bd8cf0de2e7d9c40162f8482bc9547f34cef230749681fbe6
-EBUILD libreoffice-bin-5.4.4.2.ebuild 6515 BLAKE2B 6a803099a76d431fc35eb8991ac4f4de415c6d64a0dfe8c7acd08d7ac2d0a8a16a275cbe43f31410a000341ac72b83176a45f372498b2896766ba33fe0043973 SHA512 9d012cd35378ce9c53ef9d077e0781965fbcdd670b31d047365b4fcad02cfeef8886c2658d63fa6ed9d691ae1a500dac08e33c74a30fe23911b69d5a50e94df4
+EBUILD libreoffice-bin-5.4.4.2.ebuild 6514 BLAKE2B 435a3058beb92c7d8218a8432c2576a0ccdeb055475737891d9b4468f1fd3375f057d33857776ed782e2661347a791721daa3dd47ecfc3059e5618770b7e007b SHA512 599098552bd26aacb859731121a3bc1099abbb5be78b309a06d1d75580c956cf07c0bf6583797d41f6bd6afbaf14a9586ce0425a207501f6c6b9aecb091d7e6b
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-5.4.4.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-5.4.4.2.ebuild
index 83d8a7c62454..f741bac8e42d 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-5.4.4.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-5.4.4.2.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 BIN_COMMON_DEPEND="
 	app-text/hunspell:0/1.6
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index e7e8751b925f..363b232f2160 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -504,6 +504,6 @@ DIST LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_zh-CN.tar.gz 794478 BLAKE2B 6474
 DIST LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_zh-TW.tar.gz 795551 BLAKE2B 7faa1bb5798357610c61c4bf3e53ea178c4d3bc5706651f903a5754172c8afa38bdcf40ebc6d4b9f41cae4d928857a8982a5b6547caefe420d19e767c021037b SHA512 b63cf9aa1fd749c1c7dc14202ef89c9c55c7581f55424a680d30092752eb21153875d736dfc557dd7ea160e5562489c3f202745bea47c7931256a89abbb66afb
 DIST LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_zu.tar.gz 326199 BLAKE2B 31073f39e05680cf851e6e35b6a41d28b72305d4fbf7b3ed19c9174330d4cb4ac2cd221948e95d8b4065536ff88eb7d7801b1b42d8d10ea91007d4b0259ab2bb SHA512 6f2dbbad9802eac72eba74b7fbd6161b03bd594a1cea11413e1bb5c48433265e524fb09d3789d7bebb470d4207ce9a75701d2a76bd27342a6955a05783e38981
 EBUILD libreoffice-l10n-5.4.2.2.ebuild 3378 BLAKE2B ed62a2f4db3d43fdc21d98d572bec6e96dc3730de60dbc20d29b6f8d34120790d87f064d9285173793f948f9e2ca1dd20f0bb8bd8833d2c073671358dc98d1bb SHA512 90bc19cfab3bce49c5b32dfb046ca1f260237def3981de67b49efce47da0943b4f9ea5cd690dde0c4f819198210ae6efc5f98cfbf893e369a40a6364f2abe14c
-EBUILD libreoffice-l10n-5.4.4.2.ebuild 3366 BLAKE2B 0ed31a22ec4998d1b2eae8a7ca9cf8aa8c3c9e4d532c50323b34ecaa809facb8ea78c2e9a672b9839251842fff8e73dbe6fc165f2f961bcc40e4b2a7660ca836 SHA512 472083f47a61d640a0067fe0f780fe860d0b8c067b30c6d5a7c9ea7a1ab073c20bef4c6c6d72a5f581cc6fde6e91b8d959a859f68b79b772b69f54900df8bda7
-EBUILD libreoffice-l10n-6.0.0.3.ebuild 3381 BLAKE2B acba35c6617836017ee6c712991665536577cf0e11522a3eb9659742f6415132c43ef886806277e81ec2d386c73cffd0b6e8b021770e1048c01738396700a07d SHA512 bf4f8a1948f3079b1645b2d95f9b76f227dcd266663edbc361b58f6274fc0c8044d3d7f5e511fb3c08e3c5b938378c620e60110ebf5756752d920c41e3ae869b
+EBUILD libreoffice-l10n-5.4.4.2.ebuild 3365 BLAKE2B ac42e9f05e88133d0adb56e0c8e7288ea1d79c19a2359c8afa51620615f49d0921337242903ca134a8760030ed5a3c7a2171561dbcd6e7b3f04e58951825c165 SHA512 e7c0f037d6e9ffaa42d286fbebefdffe0f21d3f6937bb7d2b55cef9ef7e4c2557dc4b6f30bf9411740f3fabf4063b7b1dd5714148c5f2698419247448f2d95ea
+EBUILD libreoffice-l10n-6.0.0.3.ebuild 3367 BLAKE2B 6182f0d27145926bbac711586b7fe3eb6dfa41b4d4b9b0176ae983643db76f35911b43e286e7ec23fee5cfc20a9e6d93297b8dc3fd9789386074d579c19e6082 SHA512 99f77f3898305c0c9526bc983c1321093d9ca81aa261fbf9b8ae703eba2d625f367aad8987d2d5cc077da7468c1e77b15e8fd8b71b5b8e398b985cbd13821b78
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.4.4.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.4.4.2.ebuild
index faf035fa0b83..eade0e87ec02 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.4.4.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.4.4.2.ebuild
@@ -14,7 +14,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp"
 
 #
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.0.0.3.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.0.0.3.ebuild
index ab346a61f133..969f07348c91 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-6.0.0.3.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.0.0.3.ebuild
@@ -14,8 +14,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp"
 
 #
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f0446832490d..05c1fdbe22e4 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -10,18 +10,15 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
 DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 BLAKE2B dd66515fb2835c40905f91338a89921608f6aa96f0df2a0f2396d8ce397c2fd76173e1f72eff437d0167d5f831b3dd6b3050d5590ed88131921d269d0c63a8d2 SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-5.4.2.2.tar.xz 192795940 BLAKE2B 35672c2d7c78b5aca71e4f492dd41475f4da0ca01433c0d05a811bfee39467c037e510552258b149f463f0c05dec83d2d7109342b88bc7d7775a51bf6831891a SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c
 DIST libreoffice-5.4.4.2.tar.xz 193657116 BLAKE2B 1be8565481bbdf930f6bbbd894dbe5d0be7faeba068517e15a2b23acfd2d8d06960e5991fd9d990c49ad13857177020e22fdb5c272587bc25cac4bdf23bb7fa1 SHA512 f7142fd73aa037b0bbffd3fa5af58049ab6688900976296ba2e53956227aef8920cb229aad4eec05ff36c8dde584415f7893893cc81cac72b305f67b80e36882
 DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9
 DIST libreoffice-6.0.0.3.tar.xz 203284136 BLAKE2B 2d8190499439addddfa017f12b22c4b80001169af5021a546cdbf5eaea3c47a2ac1d190e98efe5022050431805417824c29295068631ec596a6357b13528c52d SHA512 2b2c0fafec5db23317a2c3236b482b0cef9c0edfabab94495a0fd3007b271eaa1dbfa97711819b3b8fb2e2375fbdfb4c662df4ffc8c519255ac84357b4c45e62
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92f367101f84c8639b84d86a1b8c2386d8aeec61dc01706078cbb251ad81abebb914acc7f5e977aa17fcd1f55db65c0861814e2 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112
 DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226
 DIST libreoffice-help-6.0.0.3.tar.xz 2972556 BLAKE2B 6805f6a28cf29c6d55732051763f12ad2dc2c76c27c518dc40b85f2ef8f7ad4943de3a55629da4de77ee1ebd3b62a8e225e0ee260081f3c25cbffc60a21970c1 SHA512 9058edf71e34e55e23f5559af94d12d5f12c38385b30d75919283f435eac07dfc790d116b556aca0d0aa30f5119aea39f07a123a1f1e5ad172f5b19b3f7dc4b0
-EBUILD libreoffice-5.4.2.2.ebuild 17284 BLAKE2B 2f1c4a8f7a661b36fa3eaa8559eeeb9e7140cb3e1cc71ca1f4272512e3a268c7e24e60bebd9088a76f06e546bf0307a6e18626fc2e4fe55f04f7ad081befdc27 SHA512 3fde8087bbe39bc3bbf6509bb2faa9635a9e7ced06df58c67f143de24fc49f9e3742d5e61001a28fa9a0d600e8bb5ff72fb578acdd5637ac37c51679408cc810
-EBUILD libreoffice-5.4.4.2.ebuild 17360 BLAKE2B afce5248e9dd29d697ff565cab9331317ed619a55a5e7b8f4291d29bcc0152cc703d11f903e5ae1708d90467aae61d1ee784f59b8a13dec21d16009fc8a8658a SHA512 0f64e3442ec4df67c4a35ad9a8edbaa543c3a849e29bfbac90891dd0fa69c287b6255eb1b6a2bcb361f999ea79b70de0801e89016e80a637973873eb3f3b0343
+EBUILD libreoffice-5.4.4.2.ebuild 17359 BLAKE2B 98eba91fb6a2cec8b592808b7c4d2e77df4fe4f858b3ff37f7b89f93faa0a81edcf68e89fae3b8a6acba803cc5cb4571bddc25df63b6131c42ae5059469daffe SHA512 11d73295add5952d7e70d920ee21ddd8c21b09b0eef8e110d28a760a863d227d5f45ad4ab7ea1a36a511c1ded51046c944a6d27453b18c35711e8747f823d8d2
 EBUILD libreoffice-5.4.9999.ebuild 17313 BLAKE2B 1701bda68e2ebfdba50ed889d6d13a261a6e8127aa2f47aae68a4e7f39d771f716983f8beee7c927244e101783ba9e50512f35a16c959c979d1475c2baff8b55 SHA512 640c75d7e9b1806249d61006b9b6524c28cf68a6b90936effd0dcca45f5b58bc1b327ed2b37fda815d09c827bd3c5805780bf3e65078fea658518d5219e0fc21
-EBUILD libreoffice-6.0.0.3.ebuild 16584 BLAKE2B 578987c8621f47c5cd72830e622f688f62a8a9859d2dc0c9194d1052512aed93211643cbd596ef3b525657680191c66d558da2a1d63934e050ba45764db3c7ac SHA512 e72118b60e4cc70a8a94d7d0404d292759c7b073625bdadafe946a445102b1b9553004e63cb0e5ba11fa07054b384c8d80fd76567d9a7ca8116491f9b841547b
+EBUILD libreoffice-6.0.0.3.ebuild 16558 BLAKE2B 897b19fd23ebf476b3b1e4ae7904416513b3c16690b86d97d040ad8c449f387b5d84ef62f7cf23b678d3f5afa2379c12bbca7443c875ee1b8bf0a78169f91410 SHA512 9401ef29848f63588671e4fb7fbf66ae1caa9db090e355d164c0ad348c1e415989339888425fd6a8278866b5f777f6c102795c505e3dc36895bd726ee495802b
 EBUILD libreoffice-6.0.9999.ebuild 16509 BLAKE2B be4e30efc68c2dbf7d9876a4a6be12090f3203f70513417d9839ffbf229d6f228a4d08039ca402ad9fa0355367389bcd803ac16eff10ff63fcff5c498e54cc8a SHA512 f81162fa524813c036275b191edc404c3c1dc5a5e414b581edbe156c6c233519db0978b71b0c78b095e6c67803e598371c8cad34caf508194e18c0f9e8abddd5
 EBUILD libreoffice-9999.ebuild 16399 BLAKE2B 6d80bd72a3704f1e2e5316999b9b0a80145f1ac9127caaed496e1178e5be43e8b59c097e054dc7af2197fa121bcd1a7b1e8cbaf9b42c7e5a897f0c8e5d3de79e SHA512 5c09becaad0e632822d5a08e18f40a15eb078531cb1eaf54fa33cc31588994a650a44f928d85b73ff67e14f4f8b605dd4c039cea75674ac01719306d048c390f
 MISC metadata.xml 1443 BLAKE2B cbf2c4306fdcde291bcb0692af7dc9f43f1eaf05fe93d6faffbc85833dc4d5ae653cc299a9bdb55dfb335c8aff316893a72ac48488fb372f667f81212648fe75 SHA512 df37d47b0f2f9f9c229b0d558d69fcda897a54b8ef1584d9940a7817885d52aa6b17b1879cf3103a9129fcac0611b4fe49213876bd2e446c70e57735a144b323
diff --git a/app-office/libreoffice/libreoffice-5.4.2.2.ebuild b/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
deleted file mode 100644
index f6e74874df0e..000000000000
--- a/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
+++ /dev/null
@@ -1,573 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-	https://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${P}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libodfgen-0.1.0
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	=dev-libs/liborcus-0.12*
-	dev-libs/librevenge
-	dev-libs/nspr
-	dev-libs/nss
-	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
-	libressl? ( dev-libs/libressl )
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.24[nss]
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	collada? ( media-libs/opencollada )
-	cups? ( net-print/cups )
-	dbus? ( dev-libs/dbus-glib )
-	eds? (
-		dev-libs/glib:2
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
-	gltf? ( >=media-libs/libgltf-0.1.0 )
-	gnome? ( gnome-base/dconf )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		x11-libs/gtk+:3
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/libertine
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-	!<sys-devel/make-3.82
-	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3
-	dev-util/intltool
-	>=dev-util/mdds-1.2.2:1=
-	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/ucpp
-	sys-libs/zlib
-	virtual/pkgconfig
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-proto/randrproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? (
-		dev-util/cppunit
-		media-fonts/dejavu
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	collada? ( gltf )
-	eds? ( gnome )
-	gnome? ( gtk )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
-	# TODO: upstream
-	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-pkg_pretend() {
-	use java || \
-		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
-	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
-		ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
-		ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
-		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
-	fi
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	kde4-base_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-	use branding && unpack "${BRANDING}"
-
-	if [[ ${PV} != *9999* ]]; then
-		unpack "${P}.tar.xz"
-		unpack "${PN}-help-${PV}.tar.xz"
-	else
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${PV/.9999}
-		[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/officehelper.py || die
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	local java_opts
-	local ext_opts
-
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use collada; then
-		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
-		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
-		else
-			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		java_opts="
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
-		"
-
-		use libreoffice_extensions_scripting-beanshell && \
-			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
-		use libreoffice_extensions_scripting-javascript && \
-			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-	fi
-
-	if use kde; then
-		# bug 544108, bug 599076
-		export QMAKEQT4="$(qt4_get_bindir)/qmake"
-		export MOCQT4="$(qt4_get_bindir)/moc"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	econf \
-		--with-system-dicts \
-		--with-system-epoxy \
-		--with-system-headers \
-		--with-system-jars \
-		--with-system-libs \
-		--enable-cairo-canvas \
-		--enable-largefile \
-		--enable-mergelibs \
-		--enable-neon \
-		--enable-python=system \
-		--enable-randr \
-		--enable-release-build \
-		--disable-breakpad \
-		--disable-ccache \
-		--disable-dependency-tracking \
-		--disable-epm \
-		--disable-fetch-external \
-		--disable-gstreamer-0-10 \
-		--disable-online-update \
-		--disable-pdfium \
-		--disable-report-builder \
-		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
-		--with-build-version="Gentoo official package" \
-		--enable-extension-integration \
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-tar="${DISTDIR}" \
-		--with-lang="" \
-		--with-parallelism=$(makeopts_jobs) \
-		--with-system-ucpp \
-		--with-vendor="Gentoo Foundation" \
-		--with-x \
-		--without-fonts \
-		--without-myspell-dicts \
-		--without-help \
-		--with-helppack-integration \
-		--with-system-gpgmepp \
-		--without-system-sane \
-		$(use_enable bluetooth sdremote-bluetooth) \
-		$(use_enable coinmp) \
-		$(use_enable collada) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable eds evolution2) \
-		$(use_enable firebird firebird-sdbc) \
-		$(use_enable gltf) \
-		$(use_enable gnome gio) \
-		$(use_enable gnome dconf) \
-		$(use_enable gstreamer gstreamer-1-0) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable kde kde4) \
-		$(use_enable mysql ext-mariadb-connector) \
-		$(use_enable odk) \
-		$(use_enable pdfimport) \
-		$(use_enable postgres postgresql-sdbc) \
-		$(use_enable quickstarter systray) \
-		$(use_enable vlc) \
-		$(use_with coinmp system-coinmp) \
-		$(use_with collada system-opencollada) \
-		$(use_with gltf system-libgltf) \
-		$(use_with googledrive gdrive-client-id ${google_default_client_id}) \
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
-		$(use_with java) \
-		$(use_with mysql system-mysql-cppconn) \
-		$(use_with odk doxygen) \
-		${java_opts} \
-		${ext_opts}
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=helpcontent2/source/media/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || \
-			ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# bug 593514
-	if use gtk3; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
-	fi
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	# Remove desktop files to support old installs that can't parse mime
-	rm -r "${ED}"usr/share/mimelnk/ || die
-
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
-	# Cache updates - all handled by kde eclass for all environments
-	kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
index cfeb8bc1a4af..bef92e433b7b 100644
--- a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
@@ -71,7 +71,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
index c42d12a1a852..fb3e9b376d04 100644
--- a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
@@ -70,8 +70,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index e5c2c42853fe..8b1783ed438c 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,3 +1,5 @@
 DIST skrooge-2.10.5.tar.xz 19309980 BLAKE2B 388e4c4b13acfd1b5f981dc88a9763bc2eb23f7cf8d7cd3f018746964639557768b3654b9161a1b79e1752aaa1335264607bc4475148a755fa5a4b282a36d60d SHA512 02fdee00b430ffba8c05222b87da31f5d2390634e816e141806fc4e3cceab83134ccda9619ff944f70eb704af4d2ee08338bf196ad7dcea8221a05d13e1b4c8e
+DIST skrooge-2.11.0.tar.xz 20677024 BLAKE2B d8995746a64489cf9b6c824c8d6349f2ef10a57fcc086c97db0ce1b65e31f72fa4c41994b4dd4ab85df008e2721bd84a029a9f71ea219d6203856e314895e2ef SHA512 088ef94d2eaa866a1cf3f55ed960bccf27a80e3a1138855b35fa301c799468b0d0594a03310872a9b3ce2513d1ac9a8df3fa039636517f7b2b135fda65a67e00
 EBUILD skrooge-2.10.5.ebuild 2337 BLAKE2B 3cb33aa4cb282d327abbaa59c72dd3cdbac9226e966637d0abc26cbfe0af63c51cbea897283537b2903da5cd061789840de1171326bffa4bc27e4f203b790fe0 SHA512 59f5a8fe2e2c9e6381d5d4b87f298d858e6b9baf3da723592f667e4ea2845c79330537b59159971ad838178a5f3151e85c1dc903dbee89334c253fd15daa39c1
+EBUILD skrooge-2.11.0.ebuild 2367 BLAKE2B e4045cba2290bad7f903e9ff81615f7f5f443a0c3dd42ec82a6e1e43e7e9ef421737fa06a799d76c63e1801ea2ce43cfb74fb5b1dc959ae6cf1cc96125ec2773 SHA512 9e2ceacaa2ae8e16864cf3fe4de6dea5d261ad24f42af0e6499b7f1be88afabc3c40ee178de0ff12eb8c70ac1d1d58d73d912d55ea785d2f4739dab35e1bce5c
 MISC metadata.xml 400 BLAKE2B b0f7a87e2c2fda05271f731d2c3a6d9a490cf94dd7a742ed60e21aa44964a50bad1218c6ebd9ad16d87a8814f34b70792f7d80bd1e03d80845bd9f1c9292a95c SHA512 50120cec8f5798f6b104c6e1fd05b831f2f280e2f3bab8aa66667a3da1bb351a955b671d16cf4e30b44b0738625424fe4a32bb8a677947d147031964e108dcb0
diff --git a/app-office/skrooge/skrooge-2.11.0.ebuild b/app-office/skrooge/skrooge-2.11.0.ebuild
new file mode 100644
index 000000000000..f5110fcfb096
--- /dev/null
+++ b/app-office/skrooge/skrooge-2.11.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
+HOMEPAGE="https://skrooge.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities designer kde ofx"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlcipher
+	dev-libs/grantlee:5
+	activities? ( $(add_frameworks_dep kactivities) )
+	kde? ( $(add_frameworks_dep krunner) )
+	ofx? ( dev-libs/libofx )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwindowsystem)
+	dev-libs/libxslt
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	designer? (
+		$(add_frameworks_dep kdesignerplugin)
+		$(add_qt_dep designer)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/skrooge:4
+"
+
+REQUIRED_USE="test? ( designer )"
+
+# hangs + installs files
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=$(usex test)
+		-DSKG_DESIGNER=$(usex designer)
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package kde KF5Runner)
+		$(cmake-utils_use_find_package ofx LibOfx)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=ON
+	)
+	kde5_src_test
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index e47655451886..174b261dd771 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 7f1bffb854ff..9670bfc493e3 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,5 +1,3 @@
-DIST libqxp-0.0.0.tar.xz 337292 BLAKE2B 16b59353f35d8a93d57600e0ad185755f5f072b41568886197684f65d9f10042e376ae3683f229ba9e526cc8af81b1c1c423defa00eccb3448611765eed7dbf6 SHA512 c92cb6298ea4643e29145732ff3b6df806f2d30c86ab4967e445dcbc8c43b6d9fdd17c30a3e6131b4f0f2a42135caa0137b61aac2ab2722528a08e1fd6c02df9
 DIST libqxp-0.0.1.tar.xz 340184 BLAKE2B 759e5d0fb5886485f4ebe4a6caa34d1d98dc623c0ae124c6666a1be5ce7fb73686fc83360712d59d020e4788b39aa57d32149b7641d71b73dde917df46617f17 SHA512 a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607
-EBUILD libqxp-0.0.0.ebuild 729 BLAKE2B cee28b3178da4ce7c6af4f2c6e068ad8639369d25e42d211b5d06886362e16e657a46aeea617286e7c56759a68624d7b742340b36109c2d92c589aa49bb6788f SHA512 d53e5c523bbc5fd08f428fe65a6a6b099588a5cff60399bee9718378e82038a0b167cbb084ae097faf373a50f6ffffe4bb73015a9002b00dab01f18054c67ac5
 EBUILD libqxp-0.0.1.ebuild 729 BLAKE2B 9622c30476ab4f488ace1ab438c287feaf133ba24e393713727b49f5d4a9bddcbbb86b3df590b27e0b9fce35ab664dccd775ee9172e962585555df175dc85d75 SHA512 f3f4acd7a71093f0f9e355f664e9d6b292401af486e4f62a24e00f7ec471d8b776d914134bce1907e6dfd000ba499cb6c95a40f06f2734095a75a5c53581c60d
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.0.ebuild b/app-text/libqxp/libqxp-0.0.0.ebuild
deleted file mode 100644
index f38c8f335ab0..000000000000
--- a/app-text/libqxp/libqxp-0.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library parsing QuarkXpress documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
-SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test tools"
-
-RDEPEND="
-	dev-libs/librevenge
-	dev-libs/icu:=
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	econf \
-		--disable-weffc \
-		$(use_enable debug) \
-		$(use_with doc docs) \
-		$(use_enable test tests) \
-		$(use_enable tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index d621888e4d4e..2d92084e92a2 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -23,6 +23,6 @@ DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 6749466223d3bb0e891c6b26c7f1faa5c774d
 DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
 EBUILD poppler-0.57.0-r1.ebuild 4336 BLAKE2B 1278223b785dbee353822f3b91f28cf17c33b4e34016ff1d7191453131db50c34b345e8789c9a50a0a217fb00b4666db5f6bf3239e299e6bdfcb6130fb76a660 SHA512 dcfa207b810d16af609f87485706e7242d132ac056acdf3fdee603cbd98f0c8096b76d490f0a4dcd180819ce96532a18febb83e420733ae8e35b5ed9e36ea014
 EBUILD poppler-0.61.1.ebuild 3856 BLAKE2B 31e10b8db75b10189d684affa9d6cad922305305c0528dd378d3a60753638b79ea957825ad4575ff020d75638be424615b9ae3151896959b13716e58ea956045 SHA512 d2121cea0c4e754926efce3b76d4ad2964bd3e98e50904266235631765e805813336f6ceaa1dd96f1c73dafa93a60c6f10a963b6fd4aad7e0c8d22ee0de2ee4a
-EBUILD poppler-0.62.0-r1.ebuild 3546 BLAKE2B d0b23cdfb37bd729dd58603cdce684e720df71d754821a4e361129901471b33565c11f86b40402613c5896603598b43e8c9511b24514e16f23b2c3d8e690b8ed SHA512 a8c6be1836cc68b47e6f23e179c175367bc9d6cadd5e15640bbe80f088b938d823ff7d842cd3875c97cdbab5f9ad4373fdaaa18b1df6895d9f1f7c3fe03ef9d8
+EBUILD poppler-0.62.0-r1.ebuild 3545 BLAKE2B 444580381e0862f9f21eae7652717692f6d13571ffc287f1f9d37d7a7e2464b5f33772d51fada8b8c5b7875f4c4b6fbfeee268a214091e6324fd2ad184eb069e SHA512 e36fcef4517c527ce37bb872c27840fa8c851823b237b2c716efc4eccdf11ee1bc5c1cdda9c1bb59820c24ac808ebfa2da602dfe2993e830cf2251854fa25737
 EBUILD poppler-9999.ebuild 3517 BLAKE2B 3ffc4a8345489eafac51dad441671279c7ada0dc0f476dcab4eef2be083ce79f026863359cf7563e447b483148f4ea78ed58528f2a68325e5273ff851d213e6a SHA512 e7fdd6efb1207d61917d63b5e8f70f6bddd792ff2835aa421215e2ad286971661397147be0d15b68d40922919461152c11c1293254dd3ba7611275937197b8fb
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
index 8a1f440645e0..918043982720 100644
--- a/app-text/poppler/poppler-0.62.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.62.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/73"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 290db3c7aedc..353d53312b20 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -786,7 +786,7 @@ EBUILD texlive-core-2013-r3.ebuild 11429 BLAKE2B 4acb2e48b6400c1fda6ded3b4e098f2
 EBUILD texlive-core-2014-r4.ebuild 10720 BLAKE2B 2887ea23e06a64622722b5857fd68355decfc87ebc2a272991653b690b337368f69106354739f8137620126db522795b016926e220d2bd2cad8d34387a9f5060 SHA512 efa6656f4242526b174c43eb4349ae2339c9f2f59e68190ac87dba6337b4750fc0404140e5c6df3f61a1cd96ee4a6b48279d3c8e8ae7fbd828264b191d7115f3
 EBUILD texlive-core-2015-r1.ebuild 10925 BLAKE2B 85715b6526c34cb996854834f70687c8602212e6adf6f8b88c040ffea1f667355b6249c624fadfcbd5f2d63691d9e97bc140f347997b618bad10ed39ee02aa13 SHA512 409576c65f51cc4b824c3a98d2b34273c4163b8aee3de426b0b38bde573b4dc4e08c36225aaab15b550842d86778d63780ece0d55fed0fb7070dc1d28d3026ad
 EBUILD texlive-core-2016-r5.ebuild 11555 BLAKE2B a518636f0d5ab05d7e76a5200e2ba94bb8a0c8d76c37193b31789c8176b32bb2142cf5616c5a278732c110914be82636f0598e3e4c9234187d38f049f4cc68e6 SHA512 8d17485bea8ed2f0da0b5a3443c38f8e1d78daba639033042464c609432f42a574264920b673e732193efc6a9522c015c8ca9a1529577b5c6a01551a39864237
-EBUILD texlive-core-2016-r6.ebuild 11563 BLAKE2B db9394c886d4f12b9ec4c58b3b5c3f3ea5d0a10171d09f1d3c49d34b935af6a84c9dd31c69c4f89096826d41b6be11e26ddeedb8ad5bde019a8b574e10f8bb29 SHA512 241c91ff0989ebf7d7c83e7c3b7458078aab9048eac9b16c0dd92595cfa6f25ce54b3a445060e3125cee9bbeddc7cd6f4c395c34e413206af594cc16d6e2a566
+EBUILD texlive-core-2016-r6.ebuild 11562 BLAKE2B f02d8cd42f0a0a3d386edfc3bcab3025be1b76b4c4d86d3f90633de301a22a35d9990aa072f3ab9d317c3485c821f3aa1e307f669e352bdf8b7cbd782028e110 SHA512 aac640f529bea03072baa678cad79567f49ea12470f5940b8e242fb4bd5eceacf037879b8e06fdb6d9ad2399cce620c6caee17171441c92d286278e999aa1ac0
 EBUILD texlive-core-2017-r2.ebuild 11637 BLAKE2B d2b7e0b062a14232492e21e7a7c2d747e054888091da79786d03898d7ab0eda2410ffe9fc9533c79b844c1ec4dd96cc8ac8610ad3428a9e16d1bcaff8421ac15 SHA512 2298ae898b67362cc5bb3c56bec13f105f0124980e26da8aaaca2ffc21edc04eac6cf7a755f1867f85835a98c00865656f9b97e741bea8dec22aac841e2e727c
 EBUILD texlive-core-2017-r3.ebuild 11608 BLAKE2B ba80ebe28ecc87e3eca40399bfbd77f1b48eaa07ffc43b69e660e2644873b61dd282f26569149692ae84b8015e057c278bb679ca50b594b10d1dca4ae09367d7 SHA512 7ff3d1fae91de0ff2c7bdff8368eb310b9746fca80142ef89149669f98d355946a8b9ad96b13732576c8251f7c6e6cdd302df127507ca272880e408006660a14
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2016-r6.ebuild b/app-text/texlive-core/texlive-core-2016-r6.ebuild
index a6af8964aca9..7e376998cce8 100644
--- a/app-text/texlive-core/texlive-core-2016-r6.ebuild
+++ b/app-text/texlive-core/texlive-core-2016-r6.ebuild
@@ -74,7 +74,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index e91434a5659c..d83dfd0c2c60 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 201f3e6a7448..97f6a8e8481b 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,7 +1,5 @@
 DIST glibmm-2.50.1.tar.xz 6444576 BLAKE2B dbbdb79d8de9510f9bec770523ca7f4c93d287cbd9890b2fbc08712f6a2815186ee792f6339820a14aa9e4d49c9d1735c6c6651994cc4e03549f0d96b33f87ad SHA512 4f25c75c1628ca2f4db1c29cebc63187d372603066b06aa6a66c6da792f9e02cb4a413e41f058a81e2d5a2b38d625de13df76115b278f010ce2fc493fe6e6bbb
-DIST glibmm-2.52.0.tar.xz 6450592 BLAKE2B 2ea123bd193c7a745f52b2357c620fdaaef34c6e349100e732c8a1efde921db6bb0c97de3a61e0e300b98a04eb1c218f1b216c01d36e62d60ea9897a075826ec SHA512 45cbbe4ce4ba04dcadbcc3b46159dda194235c10a7287075724b0e1c19db2e4db061dc2a66823205f6884b30e2ef87ceafdf9cc2970212a2424535dbe3b9a262
 DIST glibmm-2.52.1.tar.xz 6451164 BLAKE2B 740178b51a2263ecc4778833fa6f2fd3913cdfc4e93b1a732a1b0ec9d43eb4ed60ab6bea48e02081d75a3ec1f98a149ebff47ced54dcce07e7ae011b2d20452d SHA512 702158762cb28972b315ab98dc00a62e532bda08b6e76dc2a2556e8cb381c2021290891887a4af2fbff5a62bab4d50581be73037dc8e0dc47d5febd6cbeb7bda
 EBUILD glibmm-2.50.1.ebuild 1636 BLAKE2B cedaf300eff88a5df1e9b758ba425ad29547642a5c345715a5196b8904f1f5dba0b5c85fd7d5424c2044c9832cf817758cb0086d9deb92484484c1316a4f417b SHA512 d8c11ace8919ff16e950798269d88f83bdde55377f66ba34e47947acbb856273b42bae549393055997ce02077aaf281b1238f6a2a2d4c706d24293d9b64317d3
-EBUILD glibmm-2.52.0.ebuild 1645 BLAKE2B 8698e80fbb0f777d63f2d6b6a4fbd9b80d3b6d014c53bb43984562bc583e32971a4ae4d6caac344b7ffac37e48847a9a61d4db98ef5d227741f95bca09e1cdae SHA512 903a9087feab8a973851471b0dbfbe485b2b1f7e208982c8113980b5f33fbef8b47a2aaf2a3999404c7a80ed2f95664ca0a57f873da0bda97fe3ee1c0b10762a
 EBUILD glibmm-2.52.1.ebuild 1642 BLAKE2B 344bbf55ebf3dfed41c7f58da95f97f0f3ae3e50410dec96c63b8068b277bd9b375ea2febf21621eb16df91fe474904872f162fc3c100a44db9cdb0ebbab6db8 SHA512 b7c6b3aed26c8dcd6e30773498a7799a4d70f46953deaa6516f9aac7e8f81d6fff6b9447a7e18bd4f7f8a0d1e1639d561285c37cc81b50721dcad953ccfdb632
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.52.0.ebuild b/dev-cpp/glibmm/glibmm-2.52.0.ebuild
deleted file mode 100644
index 6b4fa6640641..000000000000
--- a/dev-cpp/glibmm/glibmm-2.52.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 1 failed"
-	fi
-
-	# don't build examples - we want to install example sources, not binaries
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die "sed 2 failed"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(use_enable debug debug-refcounting) \
-		$(multilib_native_use_enable doc documentation) \
-		--enable-deprecated-api
-}
-
-multilib_src_test() {
-	cd tests
-	default
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-	find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
-	dodoc -r examples
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 8b4bc73df30c..82601873a1ab 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 0dae496206a9..e4318132fdfa 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -11,11 +11,14 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 BLAKE2B 7baf1fc24a7c9aba7e2ddac63fe
 DIST apache-tomcat-6.0.45-src.tar.gz 3494054 BLAKE2B 5dc7ac1c941b3b307ff6ccc53b59ddcd141c5ece00424a89025272d170e00ed14462f9805be0e26750f60ff1eb223e2829e7d215502f526e800bf2ffffaee30a SHA512 d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
+DIST apache-tomcat-7.0.84-src.tar.gz 4713409 BLAKE2B 3dc7766db1492413bbd3f878a2da7392dd4cfd1ca4c3e8a236e380cdfbc0c4ff075665d39871026e61f0bc88e0a84f372fbcef6914af9dc99e6dda05bafc6e48 SHA512 ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74
 DIST apache-tomcat-8.0.47-src.tar.gz 4996505 BLAKE2B 8024ec5248fed57bf1841a320fc23fa8a7a99b2352ea9635f3d4dc903bd363f3a15adc47f48250a4d732ab9c1724443bcb602b459b6ede2e7908051a5c3fdea5 SHA512 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702
 DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841
+DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87 SHA512 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73
 DIST apache-tomcat-8.5.11-src.tar.gz 4996153 BLAKE2B c529fc37a12c14c942f4be23751acc0b7fe91de0c84ef3ad7c5a451499a86572d36fd5973dc60bfc97d07cb7d82b4e9a2d36d55eb31cccf2f6b15b2b3fb5d7c7 SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
+DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415 SHA512 d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab
 DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557
 DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
 EBUILD tomcat-servlet-api-3.ebuild 851 BLAKE2B 9c746f46ebda7ed63c25c2374e3b56e4d09c170faf2348f20897ff5935221d5a244498eb5d535281fdbbe2323ccbbb3671c1fcd7058a288926792bb354398317 SHA512 bfd11aea2c322478caf3b70ea098c9f3fe060e094fd52a81e0bf89e47db33374ae6a13205c065da5e21571269ab678f65f1f0eb0385704a54a955a38f243cef0
@@ -26,10 +29,13 @@ EBUILD tomcat-servlet-api-6.0.44-r1.ebuild 963 BLAKE2B 4c535b70c79c97db06b483d23
 EBUILD tomcat-servlet-api-6.0.45.ebuild 966 BLAKE2B 5d6a7edaee6709eb57ea31b35bc002eefe40a05ead3e7ed0af29378496a1bfe8b85aab9240641f5169a0b3efae32f4165ed76e55d778b343b1965edff6c19b4a SHA512 c934e4d59c753eaa7dfbc6edd02344fef9d682076de0bbe8e1ff7c277ec6155f025b4362160100bbe54a38505780496e4b15a93b409c4208c6a9a60d07f8cbc2
 EBUILD tomcat-servlet-api-6.0.53.ebuild 966 BLAKE2B 5d6a7edaee6709eb57ea31b35bc002eefe40a05ead3e7ed0af29378496a1bfe8b85aab9240641f5169a0b3efae32f4165ed76e55d778b343b1965edff6c19b4a SHA512 c934e4d59c753eaa7dfbc6edd02344fef9d682076de0bbe8e1ff7c277ec6155f025b4362160100bbe54a38505780496e4b15a93b409c4208c6a9a60d07f8cbc2
 EBUILD tomcat-servlet-api-7.0.82.ebuild 928 BLAKE2B 1bde5610507919c8ea5926e62d9f9e8a002e28cd0158847cb12355f9a7ec3bd5ac619f4b31c742e2f0e7fa05f0291f6d8a916fa6f7a121b2620a3138af224e6c SHA512 e620d89395876f3ec079b8793561bd2290a614587fcc3d8b4b251e04b05f3c819ceeebfaa923e414b86e8d3bbf3aa33e8668cf4ee681ea5e1e50d2b68503d341
+EBUILD tomcat-servlet-api-7.0.84.ebuild 930 BLAKE2B 7e92815cb0698cc4ed6c1e735098bb7a3ccdb41a76829c7f34986e98efe838b2832e20e30f156ad1ed77dee187d2b49d0bd2c528554ffc6aa6c04c91616eb504 SHA512 5c2bda0d5c4c4752de7737533bb18a36880131bf0b02951bcbc36e822e261372897b0bbf563d1c3996d480df6917595305bd3da04bb6394a646767fb706af855
 EBUILD tomcat-servlet-api-8.0.47.ebuild 986 BLAKE2B 53ee4734e1be43aebea30162b72d66c058da698e6220c9dba1961871fcf0619c46ad56b3ff4d9b035a68767c13881747670cdd75498d7a7535a2d1bdd74449cc SHA512 0d6034c322f7c5b09c093312b6316148a74261cc8889a6cb6040dad41134e451dbb2b42820c62a73a19645bd652e9f3cf8071235b10c7499fb3053acb464592e
 EBUILD tomcat-servlet-api-8.0.48.ebuild 987 BLAKE2B cd69ed7724756db420f1dbd49912a87c999983214d5c13667b2793d1e428649d1ea341314aae1b14291329935654e6f21b2edd5a4421a2f89cd2ed15876ae0c8 SHA512 099a8a34aa8b90ddc7e005b3d5c65658ec3f112f68144d1ed9dd8085de62ac77472f238edfc7588a43a4f9cd598ff5c491f27cbb54192b3ad5322d6679adb945
+EBUILD tomcat-servlet-api-8.0.49.ebuild 987 BLAKE2B 6ab9e76fa2c44b3165d9f3305d049e723ce65a7ef762751b590f8feca31b58144a1ead453bc44a47af267816b443a4138582ca53486e2dbd3f01eaba5c6b10bb SHA512 794739859244ae76ca9778fbb412f20c0de1e191be7e47de41f6eaf041b109712b545cc649f71bed9a52a68c5855dc15b951dc901a475bcd7e3b6bfda14d1ee0
 EBUILD tomcat-servlet-api-8.5.11.ebuild 1026 BLAKE2B 491898f79d1185a9a0c0580ca30936b5ccceab95eada32b7c12ba77f802bfabc92b22c6bfb253eb2346ab0cae1264c664b4a63efee67ec4b2c66d4cf40881386 SHA512 2832c7f1e4e310ba6e220f7f69529d257e77b655a82dc1cf44e1580032773d31edffdef902c99b139bd8b52b913d7aa1578af2860d5d1967332a5f6a86dff48b
 EBUILD tomcat-servlet-api-8.5.23.ebuild 1033 BLAKE2B 6c5d35a13ac371445d39b9359cf1ac917a7d8d08692d6ea730c1d4c2a305319eac90697305d6d1bd3625478d63af74c4c62f15b78b33638d1f3a5c8d2b328ba4 SHA512 c6c829d08c1b04a737bcc0519396bd97dc52993e33bdfb550c7dcb8e2e8cedba93123e7c852f6c7100f989c9af882b2ab2d81925ce545e95172dd7c3f1a75c5c
 EBUILD tomcat-servlet-api-8.5.24.ebuild 1035 BLAKE2B 45ce444889c27792361db95b35b2d10e235e2778d44b01725f1cdae10c6088d4f3f2b9c941ce9b255505665ac328f1bd86a2c8542b3a8375b8e2de0b4cc95bb9 SHA512 355eee48ce5c0c5b0db44a7d4d0199ed4b11b2f59ea9b2395164673432245511df316e84402289ab7d93df223a3e1ba434ff2edc4aa1085b9a4e92a42950fc7b
+EBUILD tomcat-servlet-api-8.5.27.ebuild 1035 BLAKE2B ddb2b494d6148f56e06c9e0e500216ae3010493f4ea2301a0ebb23c82ac568718c88fb59c76112d64229b9240b270da7c18d8f24f72a537a8ce5ca252083ae70 SHA512 5160119e3907ce6560e1e9e826a1deae7867703c4bee3fb420e5bb1bc94f8f8edcb4cc30c61738e764d44dac527c913b93b24f3551c06b1d42dffb95fbf2b757
 EBUILD tomcat-servlet-api-9.0.4.ebuild 1030 BLAKE2B 6bda3cd784afd3e70a4919028c0d03d521f61ae31591ae6dbdde242c81d60f0b182b9b27104100998eba967aa8b20ee4bac78e4ad9d98c5e3ae177811cad305e SHA512 ea50c666f43f3ab29a11ebddc060269e0650d9f87c4d06baebd1ec71c32b0235d6e2edef90ca0c04ac17a421a63b972d691e73d5dcf9ddda5cb5f5b5d9201ccc
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.84.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.84.ebuild
new file mode 100644
index 000000000000..b0fc5f672cf2
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.84.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.49.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.49.ebuild
new file mode 100644
index 000000000000..71c284a0ed23
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.49.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.27.ebuild
new file mode 100644
index 000000000000..ee8c1d72fb55
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.27.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 72d8f16d9a99..163577d3efd6 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 634ce8d943c1..7e0ff7f160f1 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -6,5 +6,5 @@ AUX boost-1.65.0-fix-python.patch 9210 BLAKE2B 31e32cfbc8fa0c4e8a5c142f56a4a7b1d
 DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 EBUILD boost-1.63.0.ebuild 12466 BLAKE2B 6fde392860974292dccb109facefae5e06632023b361769815090451d8d216e9028e0466843a87bc24e5e24608f595ffe0841b52e32155f7a7fa2facfe72a494 SHA512 c405a5a6e1ea19e4309227a7c2204b5f0f46ff564644925bfbf02cbd43108422e04b378f24dafcdabdb0154f7f41fb5532594acc61666c8c8aa21a024e04db5c
-EBUILD boost-1.65.0.ebuild 12449 BLAKE2B f5a4a3dc783fdd747ce572cc21a8ddc6408c777b9c30aa3613644388e1766786fc8936c913841bb2204f6c481641ff96c304ddba16819efe599a7204cad33bb7 SHA512 fcbe87aaa97a98c7b4e13fc22e946f9b239e53b0c01721f4f239589a5dfc418825bbdb432b2645d7eed4855d78bdb0414f7f22200630d33e8d04a3f4c08a1fd1
+EBUILD boost-1.65.0.ebuild 12448 BLAKE2B cb38a7d66a524328c469b0362a092ba26fb0c5a434bfd5d6a268e81493d1049e77611423d26a58233d811b5bcdb153f19555b8a8baf9776b073be8ef0c929f0e SHA512 be6d9c9e909661dd3ee28cb9c87ed4aef940b7a643eb938a919e112c3d5a03bf9c5bc425d0c1b7e6ca033395d317754cd5e6eb78bd44eb2e3d3119d41cde53b2
 MISC metadata.xml 1526 BLAKE2B 11c2e9eb5b41e3fa0b100d58d672acefe4a949d0fa428b4ce1d100cc8f95eec7c1279c725741033ca50f61cb258b388270c18361a5b714a684398cc3ae1a445c SHA512 4ba131f2492ae41f642a28dd69e5bd1d5d79c013e42a6c18ba135b36d470990ea20c8aa7cec6e3cb1d6ea8d7f6b6a5b45efb4b3dcba198bcf43809eff0f65ae6
diff --git a/dev-libs/boost/boost-1.65.0.ebuild b/dev-libs/boost/boost-1.65.0.ebuild
index e5f8c570c1b0..c19ef1eaa08a 100644
--- a/dev-libs/boost/boost-1.65.0.ebuild
+++ b/dev-libs/boost/boost-1.65.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 
 IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
 
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 27a02a88dd3a..f19f8c339cba 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,9 +1,5 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
-DIST gmime-3.0.2.tar.xz 751944 BLAKE2B e5d8843e209ca589cb1dddb96093fde8727617b8cb6e2012ae047d343c485ee2398398e20be365090af9d7b4afcfe248897ee21181fc79bff376861ac1b4428a SHA512 246f489c168ce7e04fab664b7e9ae7772ae52f0063fb0eac9153460d84fa5d9712457d81fbd1bdcdadb7e03007cf71ed3bad5287f1639214f54167427c9209ca
-DIST gmime-3.0.3.tar.xz 761844 BLAKE2B 5e4a3d0cfc9768b714dc7ee1b80e06d3c2cc0a71269339d43fc9edd341d4b6b269ece347864dc2ffc9e647503e82163bfdd8701036a1db45d278ab169cdc2edd SHA512 7a4c3026a73f4eb5c9b7717fa6dc0010191dd1ce5296792f5fb58c813a843db7377e70c7d36b59461927424f15df2b9ab58cea425b6ce64ca56f75fe8bbfca5d
 DIST gmime-3.0.5.tar.xz 764188 BLAKE2B 71daa5703c7a3e0e209a35908ef9fee40d494a5d2a3819d273408a36caee18dee6852a852a9d8757e2bf9d0b958235acb69cfa7538a8f670deb00c220f77a737 SHA512 658b9008ffdf8055ffa9dfe8a5a6036a487309b0419572a9376397f68a8fc17d36ba6a05d2dfcb2ad23e634dc9e2aedd2479df1bfa0b7f8944d4c294650cb6c8
 EBUILD gmime-2.6.23.ebuild 1735 BLAKE2B 53f9f6f52467235a3de521c880fcf55a6a9f3498000c52557fcac809d7ae118640c35204a61c2f69ac2d99db68b3232c6a672b99dbe658a0d5eac299ea987fa9 SHA512 2fbc586acb1dea60334039199a75f796bdd222ac5451c47ab76b2f8453adb4a2850d52dabb0c9d30af9a31332d5804bcc7891ceff5c58b78a61b2b54d0dd0354
-EBUILD gmime-3.0.2.ebuild 1565 BLAKE2B 7cb85de4a7f06d7e58df10f0c6ee060894c3bea4addea13fc977be57884c42b0c117171b421d7e7b8597882ac2f037a6238c69536ba9f2c3e523201c1f68a80e SHA512 5c887be7059c20a2166771651d5b221e0a228f9b12f0b0f38f1fdf83b00ad3c3d8e94f072c0d00bbff0ee0aef448922acb333b123b5e69f16de75d034eeb8ea3
-EBUILD gmime-3.0.3.ebuild 1565 BLAKE2B 7cb85de4a7f06d7e58df10f0c6ee060894c3bea4addea13fc977be57884c42b0c117171b421d7e7b8597882ac2f037a6238c69536ba9f2c3e523201c1f68a80e SHA512 5c887be7059c20a2166771651d5b221e0a228f9b12f0b0f38f1fdf83b00ad3c3d8e94f072c0d00bbff0ee0aef448922acb333b123b5e69f16de75d034eeb8ea3
 EBUILD gmime-3.0.5.ebuild 1563 BLAKE2B 679f860c55235c49f5a92e5ec36edd7ce2c73bb90453bee7779d9af86f388b68300413b7358bc5f6499b72eef5875dc1c7fc60a2089af50f5956e81dfc0a196b SHA512 5718c00a118e590b92bc9d1bee24304f1da5eb29330d1062e8e87d2c6f262a5d14f810d9726a60ea91c2674286e20b8521f9ead1d9061974074eaf7c2cd0f7b9
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-3.0.2.ebuild b/dev-libs/gmime/gmime-3.0.2.ebuild
deleted file mode 100644
index 8b16292c8a03..000000000000
--- a/dev-libs/gmime/gmime-3.0.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit flag-o-matic gnome2 vala
-
-DESCRIPTION="Utilities for creating and parsing messages using MIME"
-HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/"
-
-SLOT="3.0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="crypt doc idn static-libs test vala"
-
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	sys-libs/zlib
-	crypt? ( >=app-crypt/gpgme-1.8.0:1= )
-	idn? ( net-dns/libidn )
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-1.30.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.8
-	virtual/libiconv
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	test? ( app-crypt/gnupg )
-"
-# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
-
-src_prepare() {
-	gnome2_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-solaris* ]]; then
-		# bug #???, why not use --with-libiconv
-		append-libs iconv
-	fi
-
-	gnome2_src_configure \
-		$(use_enable crypt crypto) \
-		$(use_enable static-libs static) \
-		$(use_enable vala) \
-		$(use_with idn libidn) \
-		$(usex doc "" DB2HTML=)
-}
-
-src_compile() {
-	gnome2_src_compile
-	if use doc; then
-		emake -C docs/tutorial html
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc ; then
-		docinto tutorial
-		dodoc -r docs/tutorial/html/
-	fi
-}
diff --git a/dev-libs/gmime/gmime-3.0.3.ebuild b/dev-libs/gmime/gmime-3.0.3.ebuild
deleted file mode 100644
index 8b16292c8a03..000000000000
--- a/dev-libs/gmime/gmime-3.0.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit flag-o-matic gnome2 vala
-
-DESCRIPTION="Utilities for creating and parsing messages using MIME"
-HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/"
-
-SLOT="3.0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="crypt doc idn static-libs test vala"
-
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	sys-libs/zlib
-	crypt? ( >=app-crypt/gpgme-1.8.0:1= )
-	idn? ( net-dns/libidn )
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-1.30.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.8
-	virtual/libiconv
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	test? ( app-crypt/gnupg )
-"
-# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
-
-src_prepare() {
-	gnome2_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-solaris* ]]; then
-		# bug #???, why not use --with-libiconv
-		append-libs iconv
-	fi
-
-	gnome2_src_configure \
-		$(use_enable crypt crypto) \
-		$(use_enable static-libs static) \
-		$(use_enable vala) \
-		$(use_with idn libidn) \
-		$(usex doc "" DB2HTML=)
-}
-
-src_compile() {
-	gnome2_src_compile
-	if use doc; then
-		emake -C docs/tutorial html
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc ; then
-		docinto tutorial
-		dodoc -r docs/tutorial/html/
-	fi
-}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 0429fa47c42d..d041b2f388f0 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -12,5 +12,5 @@ EBUILD icu-58.1-r1.ebuild 3332 BLAKE2B 951e0963b151c25950a2373a5d68575a14b6f9d06
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-59.1.ebuild 3342 BLAKE2B c3f45fbbeeab2cc2a92cae23b5058783f5aec1c7bbbd28f6922e7e091077e7aece5f43365b8b16a54a60c714ac2bad31e18eda24010b7a7b74ac4cc7ab519e0a SHA512 708ec7e483bb078b1d0f7067ba720197b37280de9a09ba1fb92a944aad3613fd1db93f94cc1d53ce457a2ec610afe88232a040a25128d873bc401b91f0bc5911
 EBUILD icu-60.1.ebuild 3721 BLAKE2B 98e5114b569dd89706c2aac9043d63c97822ad37c7b200fd5591843d9c81e1fefc6550d2f094c132cd5a3fc69f9fd42d4383a1774fb12fc2ede47e46dfaccae6 SHA512 622002eecc800f595b159a125a62306ca94b4d3f924a4ab9c31a50bb5b2c2a3bb2aac38a90384a5bfda13347fbe025a39e5538598e706d8b9d34a392e212a3a6
-EBUILD icu-60.2.ebuild 3720 BLAKE2B 3c1ff6958adf973f251a3d27488a646ab0ea2c45c061091df1f36d1272de054b15c595d5a3344d1bef6723f4042c02f7c53ab3c585026529c53570f04b5671c6 SHA512 092c62680d82394e382b539ec3b322e53f10cda373df2a8888413776d0e0dc55629ba65d96282f6791d3f3f077dc45091418a39605ec11f1a770df4cabbe85dc
+EBUILD icu-60.2.ebuild 3718 BLAKE2B 84cfcc76fc1f02350ce7ef664719c77df3b58dec3885981151dc56c347781675fc0607aac3e42487ec7d9bfef49f16f64c9750be4c47e688fc5fc618e8f0b956 SHA512 39d21e0bd19e922e105ce9e35c9caf32528d42a4a45bffe3cef064cb9f78942a40e39ad015a085663592d2674d8f9044f44c8ef3e25651f529657a587ffd2a99
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-60.2.ebuild b/dev-libs/icu/icu-60.2.ebuild
index bce4879eb694..0343d4e9d87b 100644
--- a/dev-libs/icu/icu-60.2.ebuild
+++ b/dev-libs/icu/icu-60.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 5074b9d998f8..abf2a8b0f9ee 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,5 +1,3 @@
-DIST libgweather-3.20.4.tar.xz 3342220 BLAKE2B e9f58b508e67eae0f76849b37cc7ff955a512852d911dfb473b1f28f14112ec21bbbc7910efd39d3752a473774b6fc04fa5de135903882883e3aeb7a0edf5bbb SHA512 65b28a2bf8e9e7d8b02972d1d2f701ac8668b1e91154ba7ee94e9a08bb98d28ce44e88842e2fe78a13ce9f942d79fd2950d8de266dae28bb262c5fc11328ada9
 DIST libgweather-3.24.1.tar.xz 3350680 BLAKE2B 9265cb3c280446d5f380f62b60efb5578a7a401e3291d12e3824d8e7eacc582761226b0aaebb0439318bd48b9ad5429a1b6d89eb0220a82650c43be8aa337e2d SHA512 564464d7a18a8e0320871ea418b1163163941c950c5acea5ee65a087e44c4d81e019e2e3e4cb6751989f823cbb7c5691713d3dcef72aeaf6ff264e61b6f7b4b4
-EBUILD libgweather-3.20.4.ebuild 1304 BLAKE2B 39cbd9270ef604a4c52a70e76374a004a92b952a7ac91463d015228ba8123f382cad9ca71d80d747345ee38ea228498a2aaf94103aa28d131672bc3882c235a0 SHA512 ab933db3ab16ad69d22d2ac2cad259dfc1ea51d9c9c7c87d9ab3eb49a88bfd13eaac9f895752b63de766d1301b1b67d066c1812ee64a25703e0eb8528a99d403
 EBUILD libgweather-3.24.1.ebuild 1304 BLAKE2B e7ef00a8d93612dffc721875d07ec588f21a70a41b55dd6684106300d9e73a838d39a4670d9d096879e026ca4357aa6726578b50acba76a0fb903bc117408723 SHA512 cc354dae7c6e20c66781a972dd224bc65404ee144ac4133c449a34e9ea68e6c89fc9182492ef9d66f7c72ed3bd6c56223274abe4e315fbbb6af70aadefd5a319
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/libgweather-3.20.4.ebuild b/dev-libs/libgweather/libgweather-3.20.4.ebuild
deleted file mode 100644
index 64344996e2d0..000000000000
--- a/dev-libs/libgweather/libgweather-3.20.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library to access weather information from online services"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
-
-LICENSE="GPL-2+"
-SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
-
-IUSE="glade +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gtk+-3.13.5:3[introspection?]
-	>=dev-libs/glib-2.35.1:2
-	>=net-libs/libsoup-2.44:2.4
-	>=dev-libs/libxml2-2.6.0:2
-	sci-geosciences/geocode-glib
-	>=sys-libs/timezone-data-2010k
-
-	glade? ( >=dev-util/glade-3.16:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-applets-2.22.0
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable glade glade-catalog) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 887ca73de225..8c73ff941136 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,6 +1,6 @@
 DIST libixion-0.12.2.tar.xz 407280 BLAKE2B f8a9307758f1005bd8dedb7aab9fed7478c963e3fd235c3d1efc29dbc51a3e9c6e92ff6972c8b06b2b90122a400d1f907bb39c67c2c20aa55c46a93e0c783edc SHA512 0a85120a08c79c73a252a997c8b3df461fe1f8ce8b2334aee0e50bfd887a440a220b44922edd18fbd402b1c8ea8be629e6181493bc618eda198f35159813ddcd
 DIST libixion-0.13.0.tar.xz 413756 BLAKE2B 04aef61a1cc691bb159d7e8131e2e47fe2590634adc93f2e5771ed106316eb1c92ee7c4aa05ba753a1751cb5e7c55cba9263515671a26f9bc9983a1cfcacceff SHA512 15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0
 EBUILD libixion-0.12.2.ebuild 1141 BLAKE2B fba5cb475f161d3c40f04fff8899fc2911d6533a373927c17339da905446f89a61693407c739b31f1ce77f34267af97506f4df99e145fe158a8b4bfc5ebefff7 SHA512 993232ee16cf3682214bf7b36f1af69354578c0e398ab2e269bb0f511e91ecd622da69ccbdf82187d0bec94bf01f9edad968abdbeedb15202433ab36d756b822
-EBUILD libixion-0.13.0.ebuild 1154 BLAKE2B 06fa4832f2010b14ed49cd3438a5f8b65d87034e07987fb1c556d1e6ad5bf35e391d03302597b61b1375777c0b73fe6b339e4b9caa51bb75a727dd276b00efa4 SHA512 d37e823bdc2226c3e854ed5142c100f300743214ab1ecfc23213bda3dc923c0e26722be301d7e6fa5baeb06109bf376b1327bdc1b9f7c27d189d12c7e5bb3590
+EBUILD libixion-0.13.0.ebuild 1150 BLAKE2B 4484da28a8517c76d373ac787c17394f1f237b3affcf80f45d79e3238b414c00a2664ce86a1af2b19918e3f93a781accb027eacc4785eebc2477a758ebf395c8 SHA512 ea3d4ce8a8cc9b504eed1bf47359fadd7dc850b6c2e3a0f037455b9763b265523b4299fffa99ec4cff2c91faef27b825b5490dbbe0b4a4693ea09a3d637f7a48
 EBUILD libixion-9999.ebuild 1150 BLAKE2B d4d57ba89107e6a3c81ce172ec28a10cf11b133e1423862160ac587fe2de19aca6e216fb8bbfba5620b905856ffcfb73431b15aa9d4af1c31e1fe63145ff4c4d SHA512 46d1e9174374413fa3a9bec611d202420efbfe3e1d6da0da3772775d6a486739cfcc0177c0bf76c13f3a8bc983584a81e3b32c83dd8db102aa67755470d989a5
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.13.0.ebuild b/dev-libs/libixion/libixion-0.13.0.ebuild
index 1cf9c89f9768..b814fbb37ad3 100644
--- a/dev-libs/libixion/libixion-0.13.0.ebuild
+++ b/dev-libs/libixion/libixion-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,8 @@ HOMEPAGE="https://gitlab.com/ixion/ixion"
 
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of libixion.so
-# [[ ${PV} == 9999 ]] || \
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="debug python static-libs +threads"
 
 RDEPEND="
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index f379f78ad7e1..fbc81018e776 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,8 +1,6 @@
 DIST liborcus-0.12.1.tar.xz 1673880 BLAKE2B 6f85f1ce04bd7c797f8fccc9b4d860189b6fa9f51623587a668c343e8897bf17a3e62a5465354776044fabe9347ec35913eb1433dc551e4e509ce260ba92c3b9 SHA512 294b24ad7fccae77070edd9d8e6e1a370f609ec8af9a2c58567431e641fc0f3f27c4cd4b6ac1825a8179a22a1d1a81d84827859eb631d2625194f9e59ca1a8c3
-DIST liborcus-0.13.1.tar.xz 1814552 BLAKE2B 27c31a2a6ab2de392aeb36d72417184c37d6f76707b570a0beed53d4b817fd093758381ad4b0e64258d3d9d7d9d9434dfa0be447d9a6c28f47af6fb7496c1a6e SHA512 1c81332974cada2d3526e86ef564211100fb765b611a2239fe6aaabb8666e38a7c8cb52696e5d7c402794ea5b5ceb23b083f7adf2c4417d2e635007d9baa4420
 DIST liborcus-0.13.2.tar.xz 1816884 BLAKE2B e9e7635969cdeb2dcf7274a9d54774ba3b49a40db203624e7351eaca6dfe8c87605a1a5ff8c844f50faa47b88379504cc48a3aa432f75c1d00e5974ef244b93a SHA512 3f79787a62ee0ab59ee61d5b46e1e777b27529e20d6dde9a98db75c8b6c54a11f5f78fa46d018bb31a9ef9df19a60535936e645e5fa43e71bd4e25d9f3a802b7
 EBUILD liborcus-0.12.1.ebuild 1294 BLAKE2B d5fa81bd750f1376f09116ae40f68c5449ecacc894908bb3e706defbcb3cefe0b0866946e55eab79098d7dba5dbb8feaa39efaed741ea6567609e3f78bd38448 SHA512 86b0e04d7223f2932e913013cff0e42c6c22d1540bbe873a90e59c4828f9a528c3942444a993983aad113e75d4f887160dcd8791a6167e0e750851a37e303df2
-EBUILD liborcus-0.13.1.ebuild 1296 BLAKE2B 3a037ff13bbe11b0128d1c2c76d83544e02eeabe5487ce17578e6faf3a2457f0cec2b509d42e328c4d42172a984d59ca9bdcb9aa1ecf9e390854e2e6f174ce86 SHA512 31797d5cd7192a607d84ad19d7dff3abd1fec016818befcbd31c0fd410eb47fce8f61a0b55c082624aca5cf2733e5ef5033803b6c0efed86d211d7da3c8daed6
-EBUILD liborcus-0.13.2.ebuild 1296 BLAKE2B 44f3a9c2386d50bf86e47e7b4fd8d6c063c10bb66f99d187f4915c731071b7a584ef796b70416ca618c6ea0221f9f76f3f111f611edc078830f30728abe168b0 SHA512 2eed04b7ec34a303c871405a2412f74359afc4376f92eb3e899f6034fe5555dcc8797a2c082300f1e1cfde1230f01482e800b649107565d98abc627bbd1b4fa1
-EBUILD liborcus-9999.ebuild 1292 BLAKE2B 52149e76f11747cc7cb66f05e841038efade9dd9e0b06bf10f93af345461e27f6e9683d7c89d28c83273d153d58f92ba994817f75452f567c249ad3a6cf3430b SHA512 eb81d6e9163ff61123b678f86b4eeee7b7cffb27c8e98e1518e20543c082ac857af9298ea6a997bf69a7876853513b081da755cbbb86c67416741ebef7195e6a
+EBUILD liborcus-0.13.2.ebuild 1299 BLAKE2B 02f09dddd6907115bc5a70523b48e5768b33ef3582b9fe9ca39e23104fbf0aa5f47070df81786ad9857a8049514ec52b91aff527a372c0e60101cb7343bff2b7 SHA512 7db1b63103cae486e1be74992c1094bee3948d86898725d475625e5502987648992441ffdfc25bc796e772fd07a190826023141b863f76a39c51e27229846440
+EBUILD liborcus-9999.ebuild 1299 BLAKE2B 02f09dddd6907115bc5a70523b48e5768b33ef3582b9fe9ca39e23104fbf0aa5f47070df81786ad9857a8049514ec52b91aff527a372c0e60101cb7343bff2b7 SHA512 7db1b63103cae486e1be74992c1094bee3948d86898725d475625e5502987648992441ffdfc25bc796e772fd07a190826023141b863f76a39c51e27229846440
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.13.1.ebuild b/dev-libs/liborcus/liborcus-0.13.1.ebuild
deleted file mode 100644
index 103168023cec..000000000000
--- a/dev-libs/liborcus/liborcus-0.13.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit python-single-r1 ${GITECLASS}
-unset GITECLASS
-
-DESCRIPTION="Standalone file import filter library for spreadsheet documents"
-HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/0.13" # based on SONAME of liborcus.so
-# [[ ${PV} == 9999 ]] || \
-# KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="python +spreadsheet-model static-libs tools"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=
-	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( >=dev-libs/libixion-0.13.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/mdds-1.2.2:1
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable python) \
-		$(use_enable spreadsheet-model) \
-		$(use_enable static-libs static) \
-		$(use_with tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/liborcus/liborcus-0.13.2.ebuild b/dev-libs/liborcus/liborcus-0.13.2.ebuild
index 2f6e72a16cd9..2f6e8414b8d3 100644
--- a/dev-libs/liborcus/liborcus-0.13.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.13.2.ebuild
@@ -17,8 +17,8 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
 
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of liborcus.so
-# [[ ${PV} == 9999 ]] || \
-# KEYWORDS="~amd64 ~arm ~ppc ~x86"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index a4d905a62839..2f6e8414b8d3 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of liborcus.so
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index f4ca04b1ddbc..9104202ce111 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/clx/Manifest b/dev-lisp/clx/Manifest
index f388246302b8..3fe7f91f6204 100644
--- a/dev-lisp/clx/Manifest
+++ b/dev-lisp/clx/Manifest
@@ -4,6 +4,8 @@ AUX gentoo-fix-dynamic-extent-sbcl-1.0.45.patch 600 BLAKE2B c0ac090eb35d552a36dc
 AUX gentoo-fix-obsolete-eval-when.patch 435 BLAKE2B bc03452fd11c521fa553ea47f1ed5de38da81fa2ea923c1f914c6c0987f969eb0c961f17eec2d4ceb69ac8d1b002a4387d13ce90496fc3d76edb5709eacd3375 SHA512 0f3db1aa5d7a2f9a9e88f61d04633d399337fac517f7d4ee17bf88968f9bfe32f3105562dbe454b0bbaf91b4afe48c1361fbb2c492a3c6e4250426ea15a39610
 AUX gentoo-fix-unused-vars.patch 3139 BLAKE2B 3b6b1a8f8634d2f4b4b256dd6e524a4ffd48f13b9b66f4a85a454d76e8628fa50c486fdc6d84daf7f6b2dc11f50ca6d4abaf98b2314f9283cbc15dd798333647 SHA512 fbb4d2e5866568adaed0534beb0f126792fc3d30880f2727fce7b62dcb0d57cb8367e1924ef52beb513a7a84f1b816832fa6d2f1605bda6354c075dc4db2b458
 DIST clx-0.7.4.tgz 444490 BLAKE2B 19ac6976353f254c11639a443f1b5821deae952dfae51bd168642c6a55be9401e38fce388f2d7feac618b00dd1606bc11869531f6c380acf2e4b1d65e187e9d1 SHA512 07f93735bee25c8a6d8cccaa0755efa0b750954cbeab70d9db69bf51f1cf4eb7918c0225b9ae2834b11ebb261a857eea0f60b70e4044ccbe96ecb32c3ac31278
+DIST clx-0.7.5.tar.gz 468904 BLAKE2B 30ce4de52fdbbc935bf5653f54a588537670b7d55dc038f32b4527e5f3d7b2dfe6afde3d28debf7ab5a08994155ec390f1e70dfbe45e8831fe7a977d245c9d7a SHA512 9228c37a99dcaee637c64c58183220c1ed3745e683c877f843c7de5b052d7355a3ddd50687371e8388c05bcedda062008299476b82dc8a3d26b605dde1dfa997
 EBUILD clx-0.7.4-r1.ebuild 1271 BLAKE2B e4c20e74280060264f996a44dd576e983df7457d56bf5ec4427c2e4441faa79ca4e3cdbc6c758d99a1edd1817e8aa9ee94efef48fd7cfb20d877307977fb5b53 SHA512 f8b14cf99f8ed0bd357e323930aa35784a77b32c5925eee9bfb6feb4f647f103b6a20a19428a309d68ce3281eeb03b3d2610ded2c994c4aa5e22f5af93d7e883
+EBUILD clx-0.7.5.ebuild 883 BLAKE2B 9f6a8c53c9b897c611f60700ce3c8c97bc070ba261f4ca1a60a463e7de1704edecaa6ee35325660195d8ed4848088fbcbcd7c300bb51c9e17df5a96c50057fcf SHA512 879b0aab64d4c832527c78d2e8fd8963fbb31f5b89b8ffc9c171f0459aa672d95a06ff3845eb55e54253a69fe652c2200aedd2cd3661ea477a3e9fc604801e0e
 EBUILD clx-9999.ebuild 397 BLAKE2B 5414be6f3e45f41d05c0f5c6b2fce85c39b20e5b305cd329a3afab9f0b10a2e5064a0269f1e4ac7b737457e15c4fc1e486ebbf8d8acff0abda783551c06a5f80 SHA512 12617d9b54692da5bb22d3ce6fa78e443249a0b8dd8b2c2a4c4f561c443bb9436773a685df4cd2aac88ac40cbe48a3ff32019978af84452f27cede98b62a802c
 MISC metadata.xml 840 BLAKE2B 283ee4024f59acbeb52d5db29d133000ceeefb797535b9e264f37af1141c9889dc2e965a7a431978a845194a4388567cb0df42fa7f303757fd0111fab592e79f SHA512 3106a77aee90f41316844316d1c33195f2ea9489f2d45ce6f632d9146a3e820c7c762d9e6fcbb671ad979caa96106435bd2d8f7652b60e75b49b6cbb527d9589
diff --git a/dev-lisp/clx/clx-0.7.5.ebuild b/dev-lisp/clx/clx-0.7.5.ebuild
new file mode 100644
index 000000000000..8cd18ea3e421
--- /dev/null
+++ b/dev-lisp/clx/clx-0.7.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit common-lisp-3 eutils
+
+DESCRIPTION="CLX is the Common Lisp interface to the X11 protocol primarily for SBCL."
+HOMEPAGE="http://www.cliki.net/CLX"
+SRC_URI="https://github.com/sharplispers/clx/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="sys-apps/texinfo
+		doc? ( virtual/texi2dvi )"
+RDEPEND="!dev-lisp/cl-${PN}"
+
+src_compile() {
+	cd manual || die
+	makeinfo ${PN}.texinfo -o ${PN}.info || die
+	if use doc ; then
+		VARTEXFONTS="${T}"/fonts \
+			texi2pdf ${PN}.texinfo -o ${PN}.pdf || die
+	fi
+}
+
+src_install() {
+	common-lisp-install-sources *.lisp debug demo extensions tests
+	common-lisp-install-asdf
+	dodoc NEWS CHANGES README*
+	doinfo manual/${PN}.info
+	use doc && dodoc manual/${PN}.pdf
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ea4ed4685b0f..0c0367b954ea 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/castellan/Manifest b/dev-python/castellan/Manifest
index d6fb22a03dca..ff27f4dcfbaa 100644
--- a/dev-python/castellan/Manifest
+++ b/dev-python/castellan/Manifest
@@ -1,7 +1,3 @@
-DIST castellan-0.12.1.tar.gz 50245 BLAKE2B 93f56301ffb57f44fd89fccafa5a2aaede3a3b8f54bf223e1e2a3cc1f14304b2d153557d62f884140512ef72747268b9f86e1102b067a0810bf8235df2e72a7e SHA512 f5e3a8a6ed6c00caa242d2a2a1431f2ddd56ff0168a62fa825eb90083cc1830fe2d8bc4d21b8ed6d1b5f6d1042cb2ad778d49e6a39b003768a61b9ff4d389027
 DIST castellan-0.12.2.tar.gz 50938 BLAKE2B 03cec0cd85042c482432bef7a0115413a9ea03aab05555dc1d4a65b5cb9893b57e2164a5174fb984c8ffcd190b27f9c26552dc242f9d79e3d60dce5a4a27479e SHA512 11ed1eb7fa1e5721f26afe23299ac7b0d13b4570b1f0670f4b13ac05149bdb9b9daa85cd1b29374f7d67eaa22957088b2f42313e23d8c0adf4edef108f7b44d9
-DIST castellan-0.4.0.tar.gz 49026 BLAKE2B f5c4854ce4837a33c6bca369799da2f6b6109a1ebb2bebf47ee93f687214f9388039c237d474ef401bdddd3f983d18af6e4d84f3d6fe3418d3f8989c6811a3f4 SHA512 2ccb2a757810c6ec125dbb8832cd09f918f9fbf84836ff69c79872471c7e4e40bc8030e305336ad9821de7c3b93617d39917387a6ab8f68443fb09d3f74d4dd5
-EBUILD castellan-0.12.1.ebuild 1437 BLAKE2B 69aba8d6c23bcbbe7438a5608761ea8ba4a0a0ddb010f5e92ca26c20cc5d9e1fddcdbf9c03e55781ff6b133515652354bf724e22fdc0101d2dafd97e047819e0 SHA512 aa3a0b44173a59d3c44007fe0ad573edc2affd4aeb765eda18bc7d208ef15828a61dca39ff5ad234a4a696cdaf26b45ebce726f15bc494bfca9ced57aac4e76c
-EBUILD castellan-0.12.2.ebuild 1439 BLAKE2B cf57429fdb2f914e7cef8d90ce2e89e809e684ff8a8eee0765eec39225b4ed37656ba0e845bb29b43c5a771304ffd7ea1a19a7b084e06594e8fa25c51c0c4547 SHA512 3acff4b72a401b70f8527b70bad7637e465510f98438a2d3d18f951f2bc40a461db4e69cbf3674eee7d2f7b5c279313ee89c2acd39005e03e08f885a4bed1a10
-EBUILD castellan-0.4.0.ebuild 927 BLAKE2B 4970a777ef6a94cec2def40cbdc097b18fe8f001455d86c55f8aebf973aa7a076bb0f415657862828e8a6d91f9cbe0955de9f973f665c977e1779b096f07a60c SHA512 a7e4cf2a25a51e3b2ddf54a182b229ef441e6c2f5925b62c1efd4a457376cc36c0b8cef52691abe0e113c53913a13a0e649ecc3551ddf8c0ffe2529238a379c1
+EBUILD castellan-0.12.2.ebuild 1437 BLAKE2B a4259d9f6405ebad390042c67b437d3dd156dbe28d07eb37dc3e5d2c9551e5395c8782cc33ef23f9846caf1c55ecceb1471f953277c7d62e88c3c97b59101654 SHA512 2c6d7918c1e5987d9df0e777c0a98aceae41cf05c10854e4e32bcff25fb2b8ce7bf1ff54c112b8612225390e33e6e0af9e0dc2def7a29d7500046536c7393a2c
 MISC metadata.xml 326 BLAKE2B 5ce95fc1eeafa570c9910dd492a822dfeb251bb98c5b341281ee99e7402be32234fc38bbca1b7ea0fbb67f8bc88e9b1a1c85da73f79d2a9ffc3a69289da507b4 SHA512 f8d928ab94ac70a7a3c2548b67a6296b8e86b5e239a9c74cc4b1a120f64c1e2e2084612b025e26fa3c02099f543ce156e5419a5f6ea165eff79b2dd77e9a2d66
diff --git a/dev-python/castellan/castellan-0.12.1.ebuild b/dev-python/castellan/castellan-0.12.1.ebuild
deleted file mode 100644
index b2400c1455a3..000000000000
--- a/dev-python/castellan/castellan-0.12.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic Key Manager interface for OpenStack"
-HOMEPAGE="https://pypi.python.org/pypi/castellan"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/castellan/castellan-0.12.2.ebuild b/dev-python/castellan/castellan-0.12.2.ebuild
index cb2b3e5e78b6..1ce8247b5dec 100644
--- a/dev-python/castellan/castellan-0.12.2.ebuild
+++ b/dev-python/castellan/castellan-0.12.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/castellan/castellan-0.4.0.ebuild b/dev-python/castellan/castellan-0.4.0.ebuild
deleted file mode 100644
index aa1c79087c71..000000000000
--- a/dev-python/castellan/castellan-0.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic Key Manager interface for OpenStack"
-HOMEPAGE="https://pypi.python.org/pypi/castellan"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND="	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 12ed764c2c40..a8d1a4b69347 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,8 +1,5 @@
-AUX 0.16.7-disable-pyflakes-test.patch 676 BLAKE2B a98cd4864afdbf5f92bae59e0a5629488d1aca66f71fd9625791a38abebbd2e7b8fbcbd76b8f26f5554916b38e67bf2c61b3348a837b4d49bb09709dd2d813ac SHA512 c3990b256754277d2c0c3c313284f3b41cf39df039cafc6e6b1b99b22d1594fe2851e7f98dc2b93179175981d4fde653dcc85acabdc076dd71994e0277231924
 AUX 0.16.9-disable-style-tests.patch 502 BLAKE2B bc082ee45ac39a3457457d2d7d92809765ef27eb5d160e44546036223a511ce799e6be8abcfa5b7444619dc62188ab0b30f4b23a23b608e93c9054cd93253223 SHA512 1d9f957a74b767db9355380437233167e1c2e6957dd993843ad7eaac3f0cfb9fad739b9238207d60db203bf6daed6f1b5ce9373ef1a4085431845e8f8f9b6147
 AUX 0.16.9-replace-dbus-launch.patch 2851 BLAKE2B ddbfe3ffb7a5b55af448e5312340a83587ec7aa7613111caad4c9c54df4d2c05f6b0efb755262044e749d1d0c6ed2a289b02103f81518bd6ea24da7181bc71e0 SHA512 43fc52f453b086b59f854677eafda955ddd1e6a448579ac60de7288f6f1c8e8e029f5af12486ef6c14ba01f41fd10785c7bb076dcf4968349811be47c0b56073
-DIST dbusmock-0.16.7.tar.gz 70544 BLAKE2B 4b7bcf4207362b61cdabce7752db07e76f8ab1e2ac96d1c9415a143ba6e8f8cfd51ff1bb0d051d58df5f7fddd96c6b871c10e377f975984cd83f2e2f9c7efdac SHA512 749728b966b1e067a0a8bd61ee64c1c7ff22751ccb48e15096d041e78c6e779d787160ee191e90daa3177b92c0ee45c66af74b2dd4e4bcb570892b431ec13467
 DIST dbusmock-0.16.9.tar.gz 71014 BLAKE2B d1c0853cfd06848f1d10afdd8de764814054a44080b44e1ac2ef3a1658a538f1e4c7f5936d65658c16da33ccbc2e94f35d2746f200fc6791f645e1eccc55f6fd SHA512 3aa91f6ede054ed3d3a69f68f3886094e881d266a8f09c7d08a34d10b080a77facde8aae01e75232472c2e643574fe897dae2c3588f5ad9ecf4ec4e67f404f54
-EBUILD dbusmock-0.16.7.ebuild 1009 BLAKE2B dc8525d7f369fc1a3b06f308c2721a3c121b71379533e9b990098da9ff4339f528f9b728c0e20ddb600b6a07b1d0fed82b33004eb9e01bd26b48ddfd4415409c SHA512 2ea59870f377a3c5f0c4cd126ead42275356a576f88e7512ba045dc2258fb37d22bb0df8dd0be0f7d62316e919c31661cde9406a1df56d30b2d43ee8771f90ae
 EBUILD dbusmock-0.16.9.ebuild 1066 BLAKE2B bc2813677add4c33c6590393cb5654f21c9dc6dace277ccaee32713cd59a442e9c1afe578921a72b64430a7d07bdb80f07403aba81821b20485c0e599c365463 SHA512 cb190d5a95fa4cf872e0db606839dfcac7044440571ffa41dd952af4b67b9a469228750c9cd86a8aed38a1cc97c1aa4590f4b882e6358b85f97f704cc27885eb
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.16.7.ebuild b/dev-python/dbusmock/dbusmock-0.16.7.ebuild
deleted file mode 100644
index dbb59680d73a..000000000000
--- a/dev-python/dbusmock/dbusmock-0.16.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64"
-IUSE="test"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-disable-pyflakes-test.patch
-)
-
-python_test() {
-	nosetests --verbose || die "tests fail under ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( NEWS README.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dbusmock/files/0.16.7-disable-pyflakes-test.patch b/dev-python/dbusmock/files/0.16.7-disable-pyflakes-test.patch
deleted file mode 100644
index 160003ce5eac..000000000000
--- a/dev-python/dbusmock/files/0.16.7-disable-pyflakes-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/martinpitt/python-dbusmock/issues/28
-
---- a/tests/test_code.orig
-+++ b/tests/test_code.py
-@@ -17,6 +17,7 @@
- 
- 
- class StaticCodeTests(unittest.TestCase):
-+    """
-     @unittest.skipIf(subprocess.call(['which', 'pyflakes'],
-                                      stdout=subprocess.PIPE) != 0,
-                      'pyflakes not installed')
-@@ -25,6 +26,7 @@
-                                     universal_newlines=True)
-         (out, err) = pyflakes.communicate()
-         self.assertEqual(pyflakes.returncode, 0, out)
-+    """
- 
-     @unittest.skipIf(subprocess.call(['which', 'pep8'],
-                                      stdout=subprocess.PIPE) != 0,
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index 75bf5bb9e925..9b06d55c85d8 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,4 +1,3 @@
 DIST docopt-0.6.2.tar.gz 25901 BLAKE2B b44308bb4a6571ddd092de63401d16e31a9d9b93be9b132fb45503eb9d84273d7c1f20bc5b2e3e2d969506fcf760fff142c37197e0b92dc9e7f6f431fb0abcc0 SHA512 af138feccf8c37b374ee44fcda4938a88107d434df13c173214021b1a3348b152a595095a86982b66ac03a11db8e0f1e9e6a3a65c98deea92330311daeb831a3
-EBUILD docopt-0.6.2-r1.ebuild 770 BLAKE2B 2dc7cf964ad9cbe39654ad0b6494210efca6a4c1c2ec702ebcd0b30af68c972263f01c6d2d696c733afe5e7f638d7f97194c4eed03f78838186a960a10c411c9 SHA512 52bf84cd63cb4db19bd36f5e301737fd0553f3c7d016317bdf09aa14b36b5a790f9ab1a0c4e03d077966a31e4cdabb963c9f2ec673afb2e5a5c905415e6e4806
-EBUILD docopt-0.6.2-r2.ebuild 775 BLAKE2B 1e99c21479fc23084f14d2459ac5b937236a669721ddc15227d11cd3afc7ecf19b2b91b241d3368ed8384ae078cebaebfaf5f694e8746aea8d2d5936e8a247d3 SHA512 7c6dce2a69dbea2c3b08fb1c566cf9bb91e240632f872d1007208106758a6f4bff425eb8ed9153b8fec01b483c16f6a07ed79e912b644c71d8e240104e09d1ca
+EBUILD docopt-0.6.2-r2.ebuild 772 BLAKE2B 7519b8fa3bba6260cc0bb6822218bcd4189839e15ad110e85b3720b71b58de4616fec91aa69495f4e6eb45310298cae635cb110ebbfb566a317bb625a0405cd6 SHA512 41d3d00a5bcbfefd19600836d94a1737ddd85659f4447cee38ef0b19f3c80eac4910b9b34bd9fc0e6d98543d4c3a70b51bdf9bac9838300981fa8951b4c2a0af
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r1.ebuild b/dev-python/docopt/docopt-0.6.2-r1.ebuild
deleted file mode 100644
index 92f692dab4e0..000000000000
--- a/dev-python/docopt/docopt-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pythonic argument parser, that will make you smile"
-HOMEPAGE="https://pypi.python.org/pypi/docopt https://github.com/docopt/docopt"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# not implemented in this version, git already has it
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/docopt/docopt-0.6.2-r2.ebuild b/dev-python/docopt/docopt-0.6.2-r2.ebuild
index 7fa8b5592349..9c8f22631286 100644
--- a/dev-python/docopt/docopt-0.6.2-r2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 690b4fdbe109..d8202c803dc0 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,13 +1,5 @@
-DIST keyring-10.3.3.tar.gz 39531 BLAKE2B cb1f790ab13e30a3cbcb101bbfee0dd3b9b64744edf5ae9a5f2221c3de44a8ea5b60590a0c5868454b38dab9437107cb0da04cf247fdead54fc8787afa74ff2b SHA512 6087b9553d3a8df4abbcc0bacc18d769fda04c092781bd79817ceb5984a2548b5c3a4a2bda15a95040b9db59750a91d8eebbc2420d5f9dbd2fa3d6f10884e26a
-DIST keyring-10.4.0.tar.gz 39632 BLAKE2B c284c42b46ed07b8e7aa6d3cd609887afd7bc890a3390274c719003cca70ddfc9fa8ae3a88d314d1d33e690e8a80718434b608105335beccf0858abad9a5d28e SHA512 34b1503588fedd480b2031d5557349bc6cd70108e68205a38338e091d2865df512f9a9aa3525fb11fbbb9bc06b2cfa759685495ca94b4044ec034070aa3dc0bb
-DIST keyring-10.5.0.tar.gz 40664 BLAKE2B 6a556ccf6819729e68700b58583b9a92c6785100d8f30130bb3778ad74085fcab9cfa4eca3c381ecabedff397649b9dd2d50c8c6a4d6d6c1e22d34b7ac813056 SHA512 da1cd064ae896458b1bfc6906a3d40abaa45b6e69f5760fb87d7f7176eab2c909515bbf6e3f01ecd821e340fd1f967ef2aed02053d4211e87533ea4fd6b4e08c
-DIST keyring-10.5.1.tar.gz 40755 BLAKE2B 0a4914a0f07ac898487258c8ae700ccc6883aea8581d58b3802d971f6079a646fe45467562ac752d965ff39c8b68f7fdbf5daec7f947bf88e6bca6ddb09393a6 SHA512 2e18487c061d67b866390e4f2f740ceb281b75e9ead01c00e2851aec9f56cffb6268334b35d64b498eaa719639fceceb29cf6adf46c6930e3506c04f672e897c
 DIST keyring-10.6.0.tar.gz 40782 BLAKE2B acd327711a8f7deb08d172000294d5f104e2d01b65dc7412fa8ceec1c24405206982af04e75da0dfdb7a224a4f8c9ad6f8d5f37106e68eb1add637d7d5027c4f SHA512 56e9c11ac6d50d22ca74f6d677eb24da876a27c84501d8be4ad0cee44356a67213a7d255e0fdab1343411b75b55e9ab50210d0ae95879ae9f3acb8cbe73f9848
 DIST keyring-11.0.0.tar.gz 40883 BLAKE2B 50ce8bf1265899a3054edf2fabef75694190e06e83a56b5de8e76b3d6c4ea460971d74c1a03d936765914d3b2a1812836bb56363911b706d20d59c158e8478f2 SHA512 d4937e84e6de18ed8fcba02d2d297ecc5a6434623c362f5608141041acbc7bc27fbf94e54a5a503a02b725df737fa8505d0d91e2c3e84298fa4044d7dc99f207
-EBUILD keyring-10.3.3.ebuild 761 BLAKE2B ec1f8073c9a930db5fac94b2bb69c58753cfc42f4dbd148a8de4a5ddef4b5a43fc414f3b65a7c847650bfb52368175a67c7916f0f860853c5eb05ff5133b6afb SHA512 09240d0c2463587ec9656e61e2db74d7efcd2c79fa8bc9428e191e0220cc4edde49092fef638ec74abdf924daeb6c5420b8e28d15e4e34972f7feecc19c3fe9a
-EBUILD keyring-10.4.0.ebuild 880 BLAKE2B 8ffb9aa55b279716aab789f14cb76dd3f6fdad0b37dbc54eb04383dbe22e2a2d4bfdcc840e12ed44a09c87b4c23b36722a4067fa41c830352452bf4ff02352af SHA512 a6d152bc4446e1a4d37e152c2bb1011ce7225c2fd3609533b73abf33bed6f18a5a0f38dbecf765e91f40cdf47fe126e34bf6c4730b926cc3c3bc21978847a802
-EBUILD keyring-10.5.0.ebuild 932 BLAKE2B e3106520824b8b325d519f71353ca31d46d0f522cb5ff6d11cab88185e4dd9d4005e2b939ef9dcef4f2a91a097e5bf5749f8095a5145decd4d296cf93ee7af43 SHA512 0343f6b0fafa81dde6771476a63f6262a275be55322e177f12b19fe2b414ab2a8545b670852d6c2738f9269b8ef63f80880d9564882c6ff8525d45ec0f3c3792
-EBUILD keyring-10.5.1.ebuild 932 BLAKE2B 391598d0994a6980630e8a9fbcc8959de0727479ee10a41e36da38a540ca1d01e5e1e1465eaa82da8e9c5a17f5ed1f5812b0b051e56041575ee18edc2edd89ec SHA512 712802fc1856f0b9f07b0a035c950b5fd44e5d9f74c0be353482ea2a8575eae50b4acd60f7ab37b5db9e8a1863b0d21b0f89d86f5dcf19ed054dd122133b55ef
-EBUILD keyring-10.6.0.ebuild 934 BLAKE2B a5a350c2c92d166b9a4b2789b9a47cad5fa16dec5384dc2e6e38da2a50a7d240131d61563276b36c545c93deebec1ed3977612cb05554a5b664482a172696990 SHA512 cbd0df38056c13d8e0b18c78768f291ced0887a8619d7c3323136b0359e8d5db82accc62bde2090e4f1b39f2cd429c92e71c5a2ea01944710cd30f3e9f9021ee
+EBUILD keyring-10.6.0.ebuild 932 BLAKE2B 391598d0994a6980630e8a9fbcc8959de0727479ee10a41e36da38a540ca1d01e5e1e1465eaa82da8e9c5a17f5ed1f5812b0b051e56041575ee18edc2edd89ec SHA512 712802fc1856f0b9f07b0a035c950b5fd44e5d9f74c0be353482ea2a8575eae50b4acd60f7ab37b5db9e8a1863b0d21b0f89d86f5dcf19ed054dd122133b55ef
 EBUILD keyring-11.0.0.ebuild 934 BLAKE2B a5a350c2c92d166b9a4b2789b9a47cad5fa16dec5384dc2e6e38da2a50a7d240131d61563276b36c545c93deebec1ed3977612cb05554a5b664482a172696990 SHA512 cbd0df38056c13d8e0b18c78768f291ced0887a8619d7c3323136b0359e8d5db82accc62bde2090e4f1b39f2cd429c92e71c5a2ea01944710cd30f3e9f9021ee
 MISC metadata.xml 672 BLAKE2B dc2296acdb196c85c9cd2c2badc6ee991258e43f340576990610fb975837dd9e24c0f2aee0d24c6b8e79e17436719b17e5ef3a4d9c356b08ecc5f33881cff2bc SHA512 19e907e069f6e6092791babdd8b914791d1c52c32187747edc127ce4c80ecad2da1edcdf6e6387c15f9c2b041767b9072668197087afc3644b7713837d5f2ac9
diff --git a/dev-python/keyring/keyring-10.3.3.ebuild b/dev-python/keyring/keyring-10.3.3.ebuild
deleted file mode 100644
index 2ed6a9125603..000000000000
--- a/dev-python/keyring/keyring-10.3.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-python_test() {
-	py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-10.4.0.ebuild b/dev-python/keyring/keyring-10.4.0.ebuild
deleted file mode 100644
index 50461563b99e..000000000000
--- a/dev-python/keyring/keyring-10.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-src_unpack() {
-	unpack $A
-	# This is an interactive test.
-	rm -f "${S}"/keyring/tests/backends/test_kwallet.py
-}
-
-python_test() {
-	py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-10.5.0.ebuild b/dev-python/keyring/keyring-10.5.0.ebuild
deleted file mode 100644
index d1fa79d56236..000000000000
--- a/dev-python/keyring/keyring-10.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/collective-checkdocs[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-src_unpack() {
-	unpack $A
-	# This is an interactive test.
-	rm -f "${S}"/keyring/tests/backends/test_kwallet.py
-}
-
-python_test() {
-	py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-10.5.1.ebuild b/dev-python/keyring/keyring-10.5.1.ebuild
deleted file mode 100644
index 129607227e0f..000000000000
--- a/dev-python/keyring/keyring-10.5.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/collective-checkdocs[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-src_unpack() {
-	unpack $A
-	# This is an interactive test.
-	rm -f "${S}"/keyring/tests/backends/test_kwallet.py
-}
-
-python_test() {
-	py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-10.6.0.ebuild b/dev-python/keyring/keyring-10.6.0.ebuild
index b72d4c521d08..129607227e0f 100644
--- a/dev-python/keyring/keyring-10.6.0.ebuild
+++ b/dev-python/keyring/keyring-10.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~arm ~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 310b32b0501b..7f1b436651b1 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -2,6 +2,8 @@ AUX miniupnpc-1.9.20150917-shared-lib.patch 723 BLAKE2B 0f88b59fb039802c2d7b8177
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
 DIST miniupnpc-2.0.20170509.tar.gz 86055 BLAKE2B 7da640c4baac58aa26965a670877953b4c2d27aff08b604366bad6913b30c152d52120099f37c6250eeed97396ff412a4dd6000179070a82eebd3c052596b0d0 SHA512 71ec052ef6c8ad0d529e467ddae6eae19a93b9816174eeac753aa90e036cc2f00cf7e8d1cdb188ef8280849a988fe2995e37b63f8e2a361e021c1d1b306bff6f
 DIST miniupnpc-2.0.20171212.tar.gz 86607 BLAKE2B fce582c4125192f74f6ffb174295020af1c9b574b2094f5565a5e49641820a2d9cef719de59cb94bfd207182505237c22cf58425e1a7b47f5dfe2eb84c07d3c5 SHA512 d25708f4e2ef7311878ba6d17cb506f4bfe5c9cc6b7a79e4168f143ca9da8b96beb018c42dd735f0b23806668eba2308b7de26d1b506d91c23f79c7ed77399a0
+DIST miniupnpc-2.0.20180203.tar.gz 86772 BLAKE2B 6959d7033f12d3cbe52bbe1ec2178c068a448441d22501f44a7228b2050b53ff5e955d390ff03071e6f34df2a652040bf5ab23c59aca16dc4379e380dd46fea8 SHA512 b8ebf02ed01c5217a789397b7c224ba21d233cb544ccdfd907fb9c6f49adae6864eb17963b9b9f654ecf3fde864c191fd7d00c5cf614771a7137a030f341f226
 EBUILD miniupnpc-2.0.20170509.ebuild 714 BLAKE2B c5de8d25eb9c8219ac4d124c53a8af8f62b88ace08d12084a0110571ec00b2518c3a163c54dd6b2ff3fcc215449fce8b0ffa58549c7458259ad57bf86bc6da94 SHA512 a145554f2dc93f098f6a4bf70f2505d8878de57ceb44fa74c894bbd1a6f7d27e57b2ed2f2e2d1144503444a1c25ef72a244139748db7dc5877888d785c1f330d
 EBUILD miniupnpc-2.0.20171212.ebuild 759 BLAKE2B e212f55992753b9ab838cf5085b1f5ddadd8bbb37080d26b0599070674a3be1a16b4e2a01dfe7f3b17b55392df118f989ddc58b7dd085a189aca29f4e5dff37f SHA512 9cee2e5c32c934a5b63a5c38b74605cfb48b58ddd9d6afac1544f7a79b8e5543fa63f606c662e29224ca838779a9e139967ce61fad19ba3424656d4191840f1f
+EBUILD miniupnpc-2.0.20180203.ebuild 759 BLAKE2B a7eb0f7a95739c12bc7d598af88739fbb8ea89b653880f90ff93b4512270caea1beff3db54b364458ee899f533f2fd30d508bed7d1e626306735b46f48418850 SHA512 21446a2e52a00e5671cf7270d07eff3a797b14afc97573dd06caedb123d1b825e31e269f3144fb1004ea69c73fcf6cbb85d499c37420801467442b6e3577ad71
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20180203.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20180203.ebuild
new file mode 100644
index 000000000000..dd70b6c5a34d
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-2.0.20180203.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for UPnP client library"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/miniupnpc-${PV}:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
+)
+
+# DOCS are installed by net-libs/miniupnpc.
+DOCS=()
+
+# Example test command:
+# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/onkyo-eiscp/Manifest b/dev-python/onkyo-eiscp/Manifest
new file mode 100644
index 000000000000..a4c437521fab
--- /dev/null
+++ b/dev-python/onkyo-eiscp/Manifest
@@ -0,0 +1,4 @@
+AUX onkyo-eiscp-1.2.4-exclude-tests.patch 453 BLAKE2B 966418a94703f5af908a19d7ad7aeca907f5d4aa91eb5955e632b8abd23f16b58e57a7a223545ff418c58e3a2a3c71ac0db579da4cb8321f0623586767deac28 SHA512 ee529c6d8a096014a4b2acb2a5fe9f3f7b9086f11dd3f43f280b0f95a2b56edd2fdade60118f6d043303cba76ddd62f775f8969854b02eb9fd3a0a7f4f4f4877
+DIST onkyo-eiscp-1.2.4.tar.gz 41394 BLAKE2B 09bd0d91290fae8452b5ad8db36f85aaedc2286335b766a24dc1da6287f0f28eceb112e09709fc0a2b8d3d0e8c1d6e3f46633e263c7037d853786b1cec1990aa SHA512 77aba800bb7472ccf4a32f116d13d04ab5339f77bee9a86c16522e77a11d991d7fc10d0fdb16f75afcdd5b84b4d063de7962e72cf4583dfbdbde69cd15b65a73
+EBUILD onkyo-eiscp-1.2.4.ebuild 647 BLAKE2B 5c7b8f8114f0ef2f949b8d80be501d89ced02cc9b14482f85977f43948cda09c34ac33cc41dd3b36348e7b763faec7c788cb39de534d1e38059570ad65d11e56 SHA512 b53ee9efaeb0a0c9274eaa10db623f69dd10139ad020bb87526696022d9e12d7c5e806512a54a1a679923a5ab4e2db88c6df93cb2ad915ad01d7a53a199d10aa
+MISC metadata.xml 381 BLAKE2B 66cc4f148b9ded0452971c614536bdd681d8e0279ad9b7dab1795eeaf503ee383056ff3bd574fd53291f7a6ced9d95aa9636381a4211a3f478e42aa9b21873a8 SHA512 974fd1d80260721251f781d060526f7b545ab67cf93d1ac3fbac176c48d496c72be817b053278f7e8ba6e28ea4ff7519fb23c181cf51def1980b028080d576b1
diff --git a/dev-python/onkyo-eiscp/files/onkyo-eiscp-1.2.4-exclude-tests.patch b/dev-python/onkyo-eiscp/files/onkyo-eiscp-1.2.4-exclude-tests.patch
new file mode 100644
index 000000000000..03baf2d475b3
--- /dev/null
+++ b/dev-python/onkyo-eiscp/files/onkyo-eiscp-1.2.4-exclude-tests.patch
@@ -0,0 +1,11 @@
+--- onkyo-eiscp-1.2.4/setup.py
++++ onkyo-eiscp-1.2.4/setup.py
+@@ -19,7 +19,7 @@
+     author_email='michael@elsdoerfer.com',
+     description='Control Onkyo receivers over ethernet.',
+     long_description=long_description,
+-    packages = find_packages(),
++    packages = find_packages(exclude=["tests"]),
+     entry_points="""[console_scripts]\nonkyo = eiscp.script:run\n""",
+     install_requires=['docopt>=0.4.1', 'netifaces'],
+     platforms='any',
diff --git a/dev-python/onkyo-eiscp/metadata.xml b/dev-python/onkyo-eiscp/metadata.xml
new file mode 100644
index 000000000000..257521c026af
--- /dev/null
+++ b/dev-python/onkyo-eiscp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">miracle2k/onkyo-eiscp</remote-id>
+		<remote-id type="pypi">onkyo-eiscp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild
new file mode 100644
index 000000000000..355a69afdc99
--- /dev/null
+++ b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Control Onkyo A/V receivers over the network"
+HOMEPAGE="https://github.com/miracle2k/onkyo-eiscp https://pypi.python.org/pypi/onkyo-eiscp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	>=dev-python/docopt-0.4.1[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}"/${P}-exclude-tests.patch )
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 25cdb158b78f..98c9a4efe89f 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,6 +1,4 @@
 AUX pyatspi-2.6.0-examples-python3.patch 791 BLAKE2B ad8130ef64605915b3124dd268bb002e8e4a32c7c3e3e7f4445a5ee7e6a899b1caae25e1ecaff417d2d121063361d3dd983df08bafa666ab03aa6746fa21151c SHA512 7171f77080fed4ef235d1d3380821939d5a41e919b8509db8dcbe211d63b7b390e66389152c7275128cc8372c2a7fd1bdfaf179fc93b8fa62ed76a6edffd11ed
-DIST pyatspi-2.20.3.tar.xz 297368 BLAKE2B 47b82bc5fffd513eb9c9be608172df2b434c6696567a7fb9b78393e5e591a88ffedb8d398bc8fc537ec0d8d1e693ce06e9b9f45bd89e3a5465e18ba09fe83224 SHA512 87f9dccb0be1b85ed850abaf28270c2fd5e52a43dcd94e452f650d6aea8a52bb59d9b9e9d4312bd0fe88d549812c1ddbbceb05955687134613ecd6e1b7af4ace
 DIST pyatspi-2.24.0.tar.xz 298228 BLAKE2B a1c989df5431a9fdf0b35c5fa75a12b9c083c6a979052e3a621685feada611f4322195b30bc1f4f56cd35f305087756cded31a445cca07e74262ecd807926239 SHA512 ea0c3e5a5a417c4d494cfe33ccfcca1996f417e51f5ccd3508372a0df636fb186b9940d7832681af9b353aa50a9aabd64c5477fdabbc5016794a502396b3d67a
-EBUILD pyatspi-2.20.3.ebuild 1297 BLAKE2B 3ccef24a4bc566a5c0067ab60a13a484bfb06dc758f365f0910a28d04423d4d4e86b1685ec6c55b7509dbd542ed05011939da2b4cd6c86811b4d294789306be0 SHA512 5dd9c223ad665b88ce9e07cb52d07c5249746a52e702194fcb8a337aae4defcb18899a3a4ba589a93dab5c75c925aea43cb2f635c84a5a30a1a9ef9adc00d97a
 EBUILD pyatspi-2.24.0.ebuild 1297 BLAKE2B 232974954d137d16728d738e2ed0e4f3c206ba1c608a1e5997e9868f02a4cc6e9d825480bec8b1d3af7a9961a101f2e2514eb51ed5687dfae3369ca11a94ed5e SHA512 07a7cba527f24318267f80964953cdf5201a202db70dc096e117249cdb562a64e854056c90915ba473867443c7e94931834217c7f0fc7d21608da8cfa56ef15d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.20.3.ebuild b/dev-python/pyatspi/pyatspi-2.20.3.ebuild
deleted file mode 100644
index 18ee017f27fa..000000000000
--- a/dev-python/pyatspi/pyatspi-2.20.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Python binding to at-spi library"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-# Note: only some of the tests are GPL-licensed, everything else is LGPL
-LICENSE="LGPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-
-IUSE="" # test
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/atk-2.11.2
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/dbus-1
-	>=app-accessibility/at-spi2-core-2.20.2[introspection]
-	!<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=689957
-	"${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
-)
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	docinto examples
-	dodoc examples/*.py
-}
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index e126434273e3..4e1d555dec50 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,3 +1,5 @@
 DIST python-gnupg-0.4.0.tar.gz 43987 BLAKE2B 59e72f894c5d554ba2a7c348ad3625500798ad6ac18332a3bb668b42559f52b58e3cd0f8b79ef1a99f37e796b48169d0bf36414e938e9039784cede4303cbb03 SHA512 f486ec97aee01cf46d055421211ff5704093a382155043b7ced6f809dc15d7669d5869038a1b26c5f1831076d85c929d781bc22e35ab293a14bc6e2f5f27fa32
+DIST python-gnupg-0.4.1.tar.gz 44534 BLAKE2B 0b58312b9f094b29f7009bb7a44ea3607be826ae2fda958dae0ba9dd5a2d7f81843fe23a6fe336b9df85c059e5b114787dab372df42b14b83cb73fb02abee919 SHA512 0920a1de4d98a745f7747280672975db04c40b59ea4436745cdbefa86a0c88bfdc086d6dd312c82a0a9e9f8cafb5651f8e17d86e0ee37282b5fc36e7ac8d1a1e
 EBUILD python-gnupg-0.4.0.ebuild 667 BLAKE2B d8591b491c0738f79f1ce357f1ce9daf6e8d95eea689949ce12f613504980d2a8b97ad821de7a78091ce0a3d5c2598ff118ab76ec8c6c56c9db3e5e6137cb36b SHA512 b0682ddb95ae0d737eae11080dc4cc87562a36367ca40290731be2c6b0c965d9ac427a88d4d2845eaf84e1bca9d34f6ac3d0c8eb8393353340bb2b8164da8c7b
+EBUILD python-gnupg-0.4.1.ebuild 649 BLAKE2B 915c24f18b6b4f56a5fecbe210bb81d241558d0c797e1ede4d0b3dc26acccc6f6b9dff27c977aaea473edf57befec3b37cceec35590bf100478cc31d7912009f SHA512 68965f9f2f3e5ef123843d021ac1aa1928858de66a79e9fe04f3789a049b3a7079bec0f2bde55211cf8f0ae18388d7c818d3e571761401cdc004e1a9922ed3a3
 MISC metadata.xml 445 BLAKE2B 56ffcf8992cab03ab335e7fe21d284b46a0335b0a978b5bc7ed3dc38f6df0ffbf8149740aba592011a766eaa0970241bcbc777e74007acdc04063775266223e9 SHA512 4f934dd056cef7f43b98985a52a42ba152c891890f360eb2942167f2ee69ef7fb03476bfde87be8e4e8c178fb7db429d23c695f81dc5d4c3fc266d3a84e827f8
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.1.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.1.ebuild
new file mode 100644
index 000000000000..505d46b3c06d
--- /dev/null
+++ b/dev-python/python-gnupg/python-gnupg-0.4.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for GNU Privacy Guard"
+HOMEPAGE="http://pythonhosted.org/python-gnupg/ https://github.com/vsajip/python-gnupg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+RDEPEND="app-crypt/gnupg"
+DEPEND="${RDEPEND}"
+
+# Tests are still hanging.
+RESTRICT="test"
+
+python_test() {
+	# Note; 1 test fails under pypy only
+	"${PYTHON}" test_gnupg.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 62828b6e54d8..fc892e10e4be 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -14,6 +14,6 @@ DIST wxPython-docs-2.8.12.1.tar.bz2 2331363 BLAKE2B f3d640bb8a7da2880e8ec5c30797
 DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 BLAKE2B c56937a0f582ab123f5e6019aa8b84a56d04d6d18ccec6ab103c7443decc68f008585f71137e6da25c5d1d5c483845e688e5e175712312bc94b03876d0a986e6 SHA512 e114b2b44a7fd3ac292ca9735fb2e075459211384bc98d62ff2ba49e45111825101e74abd4af2ab0e5e52ede7b831641367c11a5c80e79f2da6ada3442463bfc
 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 BLAKE2B 33b3feb5f1182948badcd5695b35a68c673e36694a2db8c77b0b031b185c94c9f8bcf4753d9cbf8937e99a72f4c393d6f79850ed3d730af20a7263b97c620386 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
-EBUILD wxpython-2.8.12.1-r2.ebuild 5582 BLAKE2B 4dccbbecb7cf7b9254fe2054307bf5a65e47c4235bcf131279c086b9bbfda9a52158684f280a1f3ce608df8001ee144e76a12495e127af79704af45eaf6b0e1d SHA512 adecc3c972afc2ecc6a1c377a59589c0d7d7c5512cd063d21b299831e51d450893686922d1c4cad5bd5e933a20fa8b664885e1762025fd9fb1f57808c88306da
+EBUILD wxpython-2.8.12.1-r2.ebuild 5583 BLAKE2B 8d695242d7d869b86dc4c19466dd2c0f23e4d1705b357f20f677f14d1bedf333efe5fc4f8cf9867d87de07d3dc169e3fa7f198702a587ee6c696de68dd0a60b9 SHA512 c06cb4d647b395b2d3b5747f95c734d1354c8cf4bfc40be48111b75130582a83c4501cf7c685e85cd2f584d35706507c8847aa298dec3d991b0d7a66f0688874
 EBUILD wxpython-3.0.2.0.ebuild 4607 BLAKE2B 9fc253616df9ce7f73e9be44845ed263064c5f23db112b8b9d42cec9ee3af534828055da1dd3b8448ae8628dc392678bbaef32af109fc60b33b9e0b8d3b44946 SHA512 fa4c4287c2d6f9e913eed285a0995346c2202a54724647e0c1fb172f40333c6b4223676430712a072e4083ecef6a81e08f9e684a0c1d6291f5413553d8037d52
 MISC metadata.xml 628 BLAKE2B cd6b4734fe77e07a83b2958e37affaf6151976306d517ad6c356524c79307eff9a4121bde26a21b8053d4c2b87d49d4aa888ec8892816eb8c2bf3e7d8db783bb SHA512 d081019f4f78f5099d0c5fabd250f42ee1865231aac95124c28a6fa6354d568b900bf0733178b415c0159054fe6ab13feeb7b97c554a76b67b66b9bf27bbf168
diff --git a/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild b/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild
index 928b517c6341..bb3bb88a6dd3 100644
--- a/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="wxWinLL-3"
 SLOT="2.8"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="cairo doc examples opengl"
 
 RDEPEND="
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 66ee1d1b2a91..bc4f70bcce2a 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 8a68363225a4..2c0c766c491e 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -3,7 +3,9 @@ AUX disable-webkit.patch 872 BLAKE2B 3856945120fbc7c27a32acc0663e74ec8302012c2c6
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
 DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD assistant-4.8.7.ebuild 1477 BLAKE2B c722e0a293112ba58f292566de3d3730e5a12430e107f9fe95ed45841e55731340a298b23dda9bbdbfcd29e3b51342077e7fc3f632755ee54fefab72f72dcb05 SHA512 2f01f97502f9990a048b3dc974e6295cdb8f97f2804f0a20a9f515e7a8a04611718d680778ce35ddac45b6406dfb4fcf05a60a7f24acdcbfd3787c3e2961eb6b
 EBUILD assistant-5.7.1.ebuild 749 BLAKE2B 1b6cd7fbcbad8dba7f72a0a4b9604ccbf3c4e97b194a4d2ba93d29731219261f44964b97e0647ffe0ee46bef04c6c1c1f2a24f11d31011f3dd8f05f446088a94 SHA512 a25bcd1d1737a0cc3368d38e0dc91a224bc37205547be3969b546a4ac6104157296e0b568a39056f1340a2c248a5867a74ec27ce3b9e965a75da89c7c3cc4f45
 EBUILD assistant-5.9.3.ebuild 756 BLAKE2B e759da77629e7b34a75580463ad04b79674b6d0d6c6a9997c7d735926835f8c35d1e95cf15861e8a8fd2415d3039a66af2ef1d69c89d7a09a787ab84b4f29652 SHA512 1e48ce8cee9555fc85bc5775e960b7367c8e1a832bad1bfdefcfd7195caeb73b5d4c70397694f0464044e8031f557f9e7b8c6d53c6b9dad417408210efc88c2a
+EBUILD assistant-5.9.4.ebuild 1198 BLAKE2B f2b40ee9a585e0a0fcb98b6999728b633a3c9cf3c9bfc767ba2f5d6948156684596bf02aa9e006008f50474def97051562faa6baad271662c33c78095e1c7f39 SHA512 cca326bf91461ef72f110f6c0c23ef13c65eb0fa51eebdce468797e89f5969846dff93ce75a93ed1d1f699044e7dc3a32b0659e922f26531b71702390f6f318c
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/assistant/assistant-5.9.4.ebuild b/dev-qt/assistant/assistant-5.9.4.ebuild
new file mode 100644
index 000000000000..0fe2bc14566e
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.9.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils qt5-build
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qthelp-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtsql-${PV}[sqlite]
+	~dev-qt/qtwidgets-${PV}
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/assistant
+)
+
+src_prepare() {
+	qt_use_disable_mod webkit webkitwidgets \
+		src/assistant/assistant/assistant.pro
+
+	qt5-build_src_prepare
+}
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 32 src/assistant/assistant/images/assistant.png
+	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
+	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index f6428146b442..51ac788ed6fb 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,7 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
 DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD designer-4.8.7.ebuild 1746 BLAKE2B a6d8990f6498a02e3bc67d420ea5bdf2c942b20167e9ab9856ded2c48c115773464e4f932c7fd4fe5ec39b84055310b2758c4cd8df29f8bf55a75b1f5f4d2eb9 SHA512 69c7c89fde7f2bfb98ee87f0fa3af6bff2a815c0bf71436fc32a5d1d2e8dfa0184f2383b341be942c6581c0c218ad7d2ccef2ca2406da9b046180a7e79aba191
 EBUILD designer-5.7.1.ebuild 864 BLAKE2B 026e933a2f0b48df1361bf84062a2b66da71727b8025586dc69c78c0e32d35c4641c1375f99c0b13a34ef1b8bc729c22044d4950db8de3180faea78cfafad756 SHA512 83ff83ebc13fb2063ef779306a3739d2acac28447821601a1e2544288bb360803fd6e59a42c70fed5f3c99835122c56a9856542b5089a4b007feb87dd6f79fe8
 EBUILD designer-5.9.3.ebuild 872 BLAKE2B 732d561488184127c53122cbf2ff3cf645b4024321bbbd689f8de3e79203456bdbe09ab44a67f975e1b5a2cec7736b1ee3cdea0ee67cc1a74b476a6d968f9787 SHA512 b23acad0c04c06bba34906b1d6b0a9e9320b19f0d5542905feb78865f891952fa17cdfa1a45d805a257c2eb348123ccba7273e638c3148c382689203b25c942f
+EBUILD designer-5.9.4.ebuild 1232 BLAKE2B be709736857a63edbb041f60695eee38939b6be1d8b95eb2a364da0790c777cf732d4ca4bc90b49b291604e34ed3b0857975dc6219aa90370f900f9fbbde0eba SHA512 159e871d902f0a52af7f123ab212f47aaacef128a1d4306007440f32de7c01857cfaae9002b9e13f8097daecca4728eb77018520955ace95ba1dedc2259f2ad5
 MISC metadata.xml 879 BLAKE2B 4d8a4c31c5cb415d18d59f54243bdb9b49bdbd6c374576d7294d2db2ce6505e31fa8da57966b04d9223e9a474d06f7078bab7432051629fa0a5dafdb9ca59152 SHA512 fba36502504141e09462fb211dacbfe43db6cb6e750f699058c757c1fc24072eb5ed50bbbb20e2bbacb831f165a58c20cb9c012ccbe96665969e1fc8fc153489
diff --git a/dev-qt/designer/designer-5.9.4.ebuild b/dev-qt/designer/designer-5.9.4.ebuild
new file mode 100644
index 000000000000..5b0fd82278a5
--- /dev/null
+++ b/dev-qt/designer/designer-5.9.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils qt5-build
+
+DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="declarative webkit"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtwidgets-${PV}
+	~dev-qt/qtxml-${PV}
+	declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/designer
+)
+
+src_prepare() {
+	qt_use_disable_mod declarative quickwidgets \
+		src/designer/src/plugins/plugins.pro
+
+	qt_use_disable_mod webkit webkitwidgets \
+		src/designer/src/plugins/plugins.pro
+
+	qt5-build_src_prepare
+}
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 128 src/designer/src/designer/images/designer.png
+	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 814274ade47f..e053fd6aa904 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
 DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD linguist-tools-5.7.1.ebuild 676 BLAKE2B 891a6b8d53de45067fe730fcb40a5481dc3ed7a72f013558fafd9d085514240bce60ffa5ccf11d34583f393548061588a66436d42e871577515adc3ce2c7920d SHA512 cb62fb1f219d8ee064952132b4f208a4cd0be6d208564a26f60df53ce6f0d3f60f8b20ae626b9f1cc5edd1101d556b002589dec22052863ee37e0b9867edf64e
 EBUILD linguist-tools-5.9.3.ebuild 681 BLAKE2B 12a9ac9609bd93a0f95c0b3a5591129d981781f538259bf2df4eeed68a5b981684264dd13dc92f55f1e931a877dbed7941dc1b56df429290334229990b479026 SHA512 b7106e3943ff5c6a25419e58741a210efff46131a7da9497b16476bf514c8473b2813092f9161c5eb5a9da425f12fc549d69475b4367bac742aaab7799672769
+EBUILD linguist-tools-5.9.4.ebuild 681 BLAKE2B 6f098f8c6c58591a6b55183612cde07fa3daa1e65f5f7b504072ee3559ef717101fba491f3db4de1d7fddb5793452f85231452566e211b1f46c087fa5a35cc1d SHA512 348d9467095cfb55f4dcd3f3629ed44ff371993a4103f894f7cd62a69609bed8cc631ace7c774f8a9309bb73ddcf5bc05f9303a91197fc6fcd916cb74eac4443
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.9.4.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.4.ebuild
new file mode 100644
index 000000000000..10b49fe87da6
--- /dev/null
+++ b/dev-qt/linguist-tools/linguist-tools-5.9.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tools for working with Qt translation data files"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtxml-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/linguist
+)
+
+src_prepare() {
+	sed -i -e '/SUBDIRS += linguist/d' \
+		src/linguist/linguist.pro || die
+
+	qt_use_disable_mod qml qmldevtools-private \
+		src/linguist/lupdate/lupdate.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 11146877696b..a130acb96122 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,7 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
 DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD linguist-4.8.7.ebuild 1156 BLAKE2B 69663d5d63aeb2c60a97fb6fb16124d16683350dec8da4bfd6303d85e4afe0f1c63202fa9ad61c04cb7e18ae2a95ca665f1641124893cd93ccd297ba3af71e84 SHA512 c8468dc810ce46dcc6adbfb0d178b173299ec0bbc19936f6ff85df59759b4e710b6afe270d345653ca209e5c4d541ba03a20fafb596d3c1c83e74f46d152d9f6
 EBUILD linguist-5.7.1.ebuild 533 BLAKE2B bc33f6b78c6aabc73ffbfdb6946bcc33402b29dfff662f09778e548de3d65789a731069351b380a9e3b65c50241d810fc7a17cad523453e65dc9b32d95eebfa6 SHA512 e26d05555ead69ec45d7b748ce7cba2e303c3f133cbfb4c7af8d82be2fbad1fa2d756518658c20fc8beb671a377d351c2a499d1573f0db6c93aab96bec3317ae
 EBUILD linguist-5.9.3.ebuild 537 BLAKE2B 43248f56635dece9ff60246e39cd7a2eabb5a9581fc0025970650763adfc32e2b11e1f445be5f71e6dcdd4c977bd4003611f0c36aab0e70886c78ff92dc386e2 SHA512 b066ddf0be4a0adcba8df4e5c70e6f52eaba27cbd2b05a9f141fefd31b23e8781ee96d86610e7f8548c34c7efe08d814fe1248d46850cb913001cb9cc29b3635
+EBUILD linguist-5.9.4.ebuild 980 BLAKE2B 16659ec2b1d54ca5224e29cae216bd59fb6fa7c2c7f4b35b08712177ce8fdcbfb4428f2442f7173bc7f1ff30009e43ba73ff003ea748104eafa277deef268e20 SHA512 a771483442dd985d5f2028bd9b9010939d689e981d7066d10ba4faf113ddd12340e9fddad0905da9518f50133291377d02fbfed88087b092136b809ade20effe
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/linguist/linguist-5.9.4.ebuild b/dev-qt/linguist/linguist-5.9.4.ebuild
new file mode 100644
index 000000000000..551450ec4f84
--- /dev/null
+++ b/dev-qt/linguist/linguist-5.9.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils qt5-build
+
+DESCRIPTION="Graphical tool for translating Qt applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/designer-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtwidgets-${PV}
+	~dev-qt/qtxml-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/linguist/linguist
+)
+
+src_install() {
+	qt5-build_src_install
+
+	local size
+	for size in 16 32 48 64 128; do
+		newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
+	done
+	make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index cff2a99b9d21..64357e1e8304 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,7 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
 DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD pixeltool-4.8.7.ebuild 836 BLAKE2B c2dadbdf93032d63466f13462c3610a2401effb5884353cce3b53148407a52fa2757d5396a1ee5d8aed80ddbf8aa1e8bf845d82a04234c618f89550c64e96042 SHA512 2ea3e1e6dc5a40b63108785c6e08e59f395194fcf247f8ed77ce8ab874eef04a76384444093a3878ea0d41949344a212a4fa25e84c4dde8e5a26b96a64b94fa8
 EBUILD pixeltool-5.7.1.ebuild 448 BLAKE2B 5bc9445fbe3dbfe34516717038ce5440cf26d3f29d5f5e3cba82d7f20cc305436baf40e8a6ffefa2d89f15a24a5bd622851cf19a42ea6f827e225d9de328f8bf SHA512 04a7923d304f4f6b72e9a445938238c8ab75b4985003a33043e2c34925ebde30abfc8e58548b3d902eac7ae2619947a5b345bd8fa2fc4def8cc3db641df498a0
 EBUILD pixeltool-5.9.3.ebuild 427 BLAKE2B b9ffc5ab2d74f1f186cbc39aad176076de7eba70cdb2a4e029e5ed7bacb223e5e41aae72bb70590fde8d962f51e05c4bffb455a56f20b45f91cb8aa9955fc9d5 SHA512 48da92aa47192de2eea885d84900c2434ff2396f5898c15b2af300c704efdc88e2f7f34f80db5d83cb48749334b7d01c7066c770308a9e100d101c2212862e8d
+EBUILD pixeltool-5.9.4.ebuild 427 BLAKE2B bffe3b0f18b8c401f3a8daeae201c9f43187b515ed2691c938beeb45276bc27b5d24db459f6ae83336775a50733fe41d4166963cda41ec30e9ad451e5728a0d1 SHA512 4efa3fb21649069309421a5fb10f21b474404d02d2a095bd5a978c26d357c62bd45cd8944ddb126a307f849ba5b3490685aa24a88e88b9744b739d35d7491eef
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/pixeltool/pixeltool-5.9.4.ebuild b/dev-qt/pixeltool/pixeltool-5.9.4.ebuild
new file mode 100644
index 000000000000..7bcdc97e3066
--- /dev/null
+++ b/dev-qt/pixeltool/pixeltool-5.9.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt screen magnifier"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/pixeltool
+)
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 3ff641da1e29..38877a854a80 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
 DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qdbus-5.7.1.ebuild 467 BLAKE2B e216eef121f71203f76aa2dd44921d227a75ba16f00303949a42fd5e88200fb6aa1c98d3367fb898d5154dfe740ab57e4d68e0f9e9cf4c153c222608fab70b34 SHA512 539e4cc0ffa8ba1bdead79b03fab0aba1db8b1667b2b3a1472319a63db3fe6337e2e9335d33e18d247ef125dbec770eff3b8c05fc687d16dc436f3d41aecc137
 EBUILD qdbus-5.9.3.ebuild 472 BLAKE2B da668efadad98d80a9e4b803d35b3a2138b685a290677e280da8bd1eef3f3f6cb0b0e60cac7f359a43e67785a1f216b3b84c31ef46e3e6af902889495f133076 SHA512 b2c4ffbb7a4eff8a4fbcc33c08b9bcf3fe3b3a44d6b493e3cf89042765c6699cba97df0060e864f5cd0c8aa3ae74ab11b0ea3eec1778b7ae043d647c7854846f
+EBUILD qdbus-5.9.4.ebuild 472 BLAKE2B 132d4466bda8eaedaf2eb9cf3b25c7e5cba5965444201365888067f53b3377bc57f54139c773f4d9ec7e9704adb187fa45c34ab568f145f8e63abe131d448b8a SHA512 f39c7eecc004e07026934a0b569b9dd0b7e71f57478400d25762f83e52f6b4437f000d3e490e0fc696e9ce773782d4b96563ffc0c88cdc4858ea3a3f4e0ff3c6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.9.4.ebuild b/dev-qt/qdbus/qdbus-5.9.4.ebuild
new file mode 100644
index 000000000000..4736c7cd2dee
--- /dev/null
+++ b/dev-qt/qdbus/qdbus-5.9.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Interface to Qt applications communicating over D-Bus"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	~dev-qt/qtxml-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdbus/qdbus
+)
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index e65bdd5d9024..cbb394b601bf 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,7 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
 DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qdbusviewer-4.8.7.ebuild 1174 BLAKE2B dda9669b7d58f473f583f5141f79df3175dd4830622761345809f2bfe6177528ac2b33958618ab9c7562a7df76384631a45e27e4cd1e5178c906c2d7d90a1630 SHA512 6f08b895885d8216d15a6ac7d35e8b4dccb504a7b2d9740ada1a48b2672eba530345e2af4bf7cdd4e27d01991d16c84177506f370bbf989680b62f711af828cc
 EBUILD qdbusviewer-5.7.1.ebuild 521 BLAKE2B 50b34805a4afc2ac7b5ee5aae2f2a994c7247616e91ef8b8107289e8c4ab94040e840ace1e7ba8625caa5dc78a9eaf444477e8094db455ee42deb920c275f74a SHA512 2ca60a21301ca8f5db6a4a4e87f48edfed84a3de9eef980c73c5a6aaf00410783bbc25a8abe518bf7f1e68568664b174ce2764822f3f1c608da564435668d667
 EBUILD qdbusviewer-5.9.3.ebuild 525 BLAKE2B 4b97a1a0e2ef02cd445e6d86f674b9308232d7425a5d7d022440adb258a5ef370ed1d9130301870a3573a86002c5d416a8de970b88e1e78adfb67cbfb7b8d637 SHA512 e33432316e553d54d5988626b72a88ffaa8622e992c59e5057419be3909486aa161c627e8682dd4b7e0cb0d83e2b525776d38b5ddd1bfedb64a81d7c47cfd1aa
+EBUILD qdbusviewer-5.9.4.ebuild 961 BLAKE2B b3d8acc1ccebb4dceab2cd41c7fc8588ee0a785c0e36012055c42cbd645b5ec6af3da0f92b6d943074f8f1e6e390a5e49e89559f1a669e3b13a659a41772918b SHA512 5cc06692c41a8a63b16226936cb76e5a929f6798f8e677384c51c7a427ee8ea40a943443450b7979132bcc78e69bcf49295ef5cd280588681ae415f95355d69e
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.9.4.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.9.4.ebuild
new file mode 100644
index 000000000000..a5f3db069f64
--- /dev/null
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.9.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit desktop gnome2-utils qt5-build
+
+DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	~dev-qt/qtxml-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdbus/qdbusviewer
+)
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
+	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
+	make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index e0506e81b0f1..d226091c932a 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
 DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qdoc-5.7.1.ebuild 404 BLAKE2B ac7a1447f06626bcb05eaea2b704e100bf8b3a72745e93e3f704cbe6af1e3149169386a80b715510a17fdc3de2640e0bd9b1331920f394b2c50f09a3c520e860 SHA512 64244aff93afc21ff69ce94032b6e722cb68e21842939acaf0971353889af1fa5a8d4854ed2f3cd3c93af5c054e8dcf56a73692be314668c70da1884d36949ed
 EBUILD qdoc-5.9.3.ebuild 538 BLAKE2B 0205074187f00ade024c8057dcec161cef1145f8943e5fdc5334ac9f8a3d0d24cf3cb249da3ee5cd46e725891428cd577dc98ee09d7d89ccfebb410a4cf62b29 SHA512 f043dcba825e6096eda1a61f4a2deb969b93b4d4369999524fe6a0ce2ac05142ae6cad9843f82dce931b3e91426cac5764629a53d5e07211baf7a99aa6397af2
+EBUILD qdoc-5.9.4.ebuild 538 BLAKE2B 717a554d3d094d660b350fd7cad133ab97a695b11c7199e2ec2d1a0a7c0c7188b463b26e3fa3336de270dc103a1341e126056d0917b138f00b9195e4f4e76287 SHA512 d1872b17a326d91cae9e5edb425a0d5ed75ef3802f73f7b30ef5117636d11915686075f54ffd95f2b150cb6a6f2521a6e510a6dab27c8ef12d8c69eb34cf46ad
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.9.4.ebuild b/dev-qt/qdoc/qdoc-5.9.4.ebuild
new file mode 100644
index 000000000000..983d3432a591
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.9.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt documentation generator"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdoc
+)
+
+src_prepare() {
+	qt_use_disable_mod qml qmldevtools-private \
+		src/qdoc/qdoc.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 65a702e75cc5..2ee912d3813d 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,5 +1,7 @@
 DIST qt3d-opensource-src-5.7.1.tar.xz 19474848 BLAKE2B 9d922fe496bb2a44d146d989be1b7f7eaa453ac1e130dca3dbde94426f2bf275d90e4b1e71ffb3d747c90b7fe001c7d90bd8c8be71bb394657691107773f6be8 SHA512 fe124b939709185d9ac755d017f850a3f3d97f7f58c863a3da3df5dcac25391ca79e97830142fb263618e7afcb4bf43f363511539d508ec2a45a8a99f0e1a8a7
 DIST qt3d-opensource-src-5.9.3.tar.xz 28000420 BLAKE2B 6441d217fa8cd23549d2ec2d02f7846e9d0d216bca730fe225fd4ed3e9a4ec13dd76ff6d1b0ed1af5eef0824b2bfa46a4cff8cb1ac2c6d40448ca4c019fd658e SHA512 885cd32b707087e710c0630dbf30a9638aafcb278e6312e53b850f26bf0f18b1c980d6206d33290418cc6c0478215e88022129450dbf1608c9a74d08e3cd7822
+DIST qt3d-opensource-src-5.9.4.tar.xz 28007244 BLAKE2B ea38270a01460045e7cb57ee5c750149553fc3eab5ca7773ea68104f97a12c81a8125c9375edf5f8c35e2b13ef0a56da01c0370a6acc2ff9f0a03d0cd40d20be SHA512 1887d9e4e2669b15e42ebc2db9c040e1f344f14a4cb2691821be2773c70d63bf6ec152a3dd0572748f77a09aed8067e6bff022fcd5dfc4bd5108af75e626d829
 EBUILD qt3d-5.7.1-r1.ebuild 598 BLAKE2B 96fd958dffe64740980f5b4f91baa5656ef9a220c1dcea35ddce489b0a46962369c4e8ec13992f1407e3c236ba218b3bf47b74d02827b0d2f16702c9cdca9e4a SHA512 cc06b602224b4f7bc375de93765419ee2a211ce8713e35d81e50482f3ee0a5702b357d6a20872a852de8f1dba753da1e5e4955ac7975b727854d806082ab8040
 EBUILD qt3d-5.9.3.ebuild 641 BLAKE2B 93f3c2a9e2cb39d95e0f9193a51382bc3cce8fd7f257ec6dfe92bfe2029545a145958a1599c0cf081f1fb3a40bef82a0eb4d13f3080961a448e00c8ee01a8103 SHA512 41c24cfd97ad7ff7b91c0b395e7f7cb83b84ca70d6344b8f5cec86c643f137e00e1208abb356b08f8c182e92a33c0ae2f8a610fa23afcf2bd3104e65b56aca29
+EBUILD qt3d-5.9.4.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
 MISC metadata.xml 622 BLAKE2B 0b8c25838c12efaeba3d6db640fe658b6c1bc12f4a6bacc06c88e405c16498eb0f7db196efb1b09b46476c0c9c4cfccc64666dd43f31366dd28b7ecaa8018757 SHA512 3edf4c4db2c08652dbc1b62aa216f62b887190e2e0bbfd0cde7410911ddf1e0ea8cc9a27e91db07a78dd6078fd4b1ad23b27f0dba37607771d3b6c2497552607
diff --git a/dev-qt/qt3d/qt3d-5.9.4.ebuild b/dev-qt/qt3d/qt3d-5.9.4.ebuild
new file mode 100644
index 000000000000..e65630904901
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-5.9.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="The 3D module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# TODO: gamepad, tools
+IUSE="gles2 qml"
+
+DEPEND="
+	~dev-qt/qtconcurrent-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	>=media-libs/assimp-4.0.0
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm -r src/3rdparty/assimp/{code,contrib,include} || die
+
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index e961412c732f..7d6fff652c9f 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,5 +1,7 @@
 DIST qtconnectivity-opensource-src-5.7.1.tar.xz 2690688 BLAKE2B 4e9d0c11408224f03e6d0a4ce0b54b1c28cbe760459d7be3eb00477ee3f87b3108a8f4d3d84777944913c17ff6529c1c79eb80c84a37e045e9c6942f9c43c2b2 SHA512 3550be2ce365c7eea2adb41b6db63d0867ff1eaae15d6f4d22345bfdd8e4ac9c2f3983e5d3e897d5c4d7d32e466929c2cfdfac0921c0927c3955f021d37d9e61
 DIST qtconnectivity-opensource-src-5.9.3.tar.xz 2723456 BLAKE2B b3b18b90d09b612789b65a14937178ebde2ff423ef7931d2b4272f5f61b7fc9df52645d888e10fa135d03a72fcedb398ce95ddd7916a8382b35d6bc3cf79a179 SHA512 28fe6ac8e9480e52cffec7bddd6db95ed4bc96858e7b7e6f1ecb325f2ebb48442f7ec3e820579e9c0654aac48ee91ad734e51f0eb65faeaa592eb7a0875854f5
+DIST qtconnectivity-opensource-src-5.9.4.tar.xz 2724048 BLAKE2B c401cd0d3a5b064667f7114b2e95a6bedfcc3b686c37a9962527b4c8a5e73f194a2f07b45408756c38550e4c09f79321f698f017556a33ac2cc7af40dfafea9a SHA512 d4cb67279555872f8f0ba0a9d746774f393711727aec058ab9ee59c783a645d53fc76a8ddcd857b0beed1dfdbc16ee7b4a214b3e95e1d5ba23e66e942d041a2c
 EBUILD qtbluetooth-5.7.1.ebuild 636 BLAKE2B 8c6c8393c94cc634febcb426340b342a558c51a4aa0d57a14f95619ab4099316bf2b0811a0a83d91352e13a881fa403f98a65cc5fcbe27f8692db4cb4206b7e4 SHA512 ec143dc4467c7d38946d360622bfbb94c23e22ec35d990985c45fdff6c06c1cf509784833bd126b71da73bc0eb095e9a3dcceca9a8a1dca81e1f61aa27e17d37
 EBUILD qtbluetooth-5.9.3.ebuild 641 BLAKE2B 0f20fa0940eb16dd5cf571b979956c5eb2e6b2b2688a492fa57c685f510422a246d59979b00e868b262250adc80cc49d646c50ba6fd3ae879ded3b6fd85cb698 SHA512 9c93e43ecd45455c09d311f6f4778bd177edf71e179b2b35cb0f005c9e4e7eb04d010d339eaf05ded16d80e4663b47b61628cff2842470f5694f245faf800f9c
+EBUILD qtbluetooth-5.9.4.ebuild 641 BLAKE2B 922e93e07d44ed1f07466bf8f52af6908c2732894630e3920b8046727b03dfdfebe7841c03e66a5f60aaa69502595691748241d76469ece63250ac3fdc6bca16 SHA512 ea8e27764a21856845dbc2b805136b4f1b9386c60b1859d6782f7dd986591eba6af492887b4f56438599e8fda57c38dd64a04019a42c612aa94d463d0e7cffac
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.9.4.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.9.4.ebuild
new file mode 100644
index 000000000000..7f4a8b1b3eb7
--- /dev/null
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.9.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtconnectivity"
+inherit qt5-build
+
+DESCRIPTION="Bluetooth support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtconcurrent-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	>=net-wireless/bluez-5:=
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+DEPEND="${RDEPEND}
+	~dev-qt/qtnetwork-${PV}
+"
+
+src_prepare() {
+	sed -i -e 's/nfc//' src/src.pro || die
+
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 5210fc8ce0d4..627691d1a35c 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,5 +1,7 @@
 DIST qtcharts-opensource-src-5.7.1.tar.xz 4086256 BLAKE2B 21b8e072b11955ec6fcb05355c3cc5903d916e8476a13529b2b71fae23aaa5f339fa56afe305ed39510d088d3db54cb142b069334257b7ee5c3e0dd454fa58b1 SHA512 2db2c5a956e84b4e080df71f6ba8bdf48ad3a456d334f59d50525a10cb7358129d7cf7855a11342192d03c10ab1cb84d94faaf94ce02f6786d32fe655bc8558c
 DIST qtcharts-opensource-src-5.9.3.tar.xz 4157772 BLAKE2B 9f1c783e89848bde42978a8f4a307cd8ba8e4d5bffd012f3e1953b8825a598f12f4fd6274bcdf9e719c0130a1e0e33dcc706789ef7017cc2645426e0725a03d5 SHA512 394806f9e2abfe5c36772efdbad576f7b8372f8cdd3e171bca320b8e35159f11a8022752f789038f98a63c448473200fcdc8b636781af8a417dce30184402355
+DIST qtcharts-opensource-src-5.9.4.tar.xz 4158264 BLAKE2B 6e6ecfe3e8b7fc87f1211ef2a03fc7310cc2f4cc6b9711c9da69d8ad83e062137a371c74f6ca882143a5adf516e4caf4dfdab31a40c036fb79add2b80022156e SHA512 4d93d2f3a3c51967e0377a1fd1397109b0cc621644ca90ed587d45950b9a49971738132223a55b45d6ed45685d5bb8e77e159505bd96148ac495047178a4f35b
 EBUILD qtcharts-5.7.1.ebuild 521 BLAKE2B f2eb1cacabd96e3995125de8cfc7da8d451b1b41021b97f88021183e47795102b91d2b392106bc1eeb94bb6523efd39aaa530ba9d4b1c2a64317193eb7cbf91a SHA512 5dbc46795ec80a1dfd98d3aeae5e54e37582a1e26fcfb7d3b48531e1652fbfcc25872677a61683458c733e4dbb376f4262a3a186f460e5e453b93afdd0f39c10
 EBUILD qtcharts-5.9.3.ebuild 521 BLAKE2B 8f9d2ce61fa67edad269f8e89904502dcb18ea91e26507cbf7e9cade743313d24e4c78a6d1ff46a22de813ffb6d8003bdbb41b8a0827cc2cfd48bb4174a95b19 SHA512 e43774aee68235c06734967248ad655ffa5657fd6fe1e89691999037f76cbb8ff0e782d4b14fa45fcd39400bdc006411dba1d4d69667cb0c11764abe4bd4ee13
+EBUILD qtcharts-5.9.4.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtcharts/qtcharts-5.9.4.ebuild b/dev-qt/qtcharts/qtcharts-5.9.4.ebuild
new file mode 100644
index 000000000000..ff3df69c0911
--- /dev/null
+++ b/dev-qt/qtcharts/qtcharts-5.9.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Chart component library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 464066e1fe4b..df8e6e0db478 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
 DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtconcurrent-5.7.1.ebuild 434 BLAKE2B d70d97815a7124d999c113371707607a8f6f81c41b09f25456c9c8e36b1e67bd1a95d7dba22f53108cf833f50275619d1c2dab0bb858a41eccf62adc088b7a91 SHA512 a426a48a5c65b76fc2acd8d02a8f3efb14663b476ffcfe5474bb2079245d564b8881f017dea0b3a7b3437b673e66e9dbd57ab28ad4ce7f85ccc88271b41b5fbc
 EBUILD qtconcurrent-5.9.3.ebuild 439 BLAKE2B bd8dcf198ac0b72c86e2f8e05fa95c13254cdd4d7a8528a99e0d0a68b6f53ff59582d2116978e0582672c674ffb3153a6b8bae230fa02fbb9bc05eac68123123 SHA512 ad76fe37bf7289c57a1415fde23402c394e6c5733ae18096aa57e4dabc8fe17ff12f0c52288ba9d97efdf1d32ff7ecf2224e41f2b491922bc9b6260338f6d09c
+EBUILD qtconcurrent-5.9.4.ebuild 439 BLAKE2B e11d39dfc7a138ef50ee4a52fdf2a6f19da545a5ce941f5820137e75b9d913edb167aa6998169b46a844c5a8377541890eb2b00e35ef961b9aaa605a6db9534c SHA512 e500e5042b2015c235ad25ee2b9a00420a6f8bbbb43b7e8cbf7ff7952290fe6ad46f22b0458c94bcf057e72ccc7355d56d4b6e4319971a58e8e141db1afb8a3b
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.9.4.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.9.4.ebuild
new file mode 100644
index 000000000000..94b16f536b78
--- /dev/null
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.9.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/concurrent
+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 641c1988010d..2e29b8680993 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -10,7 +10,9 @@ AUX qtcore-5.9.3-avx.patch 2740 BLAKE2B 9af6d58583e9bb49217b76e54c139b7c13dd7ddf
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
 DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtcore-4.8.7-r3.ebuild 2866 BLAKE2B 323682baab556e3eca23f3c31d872fdb0b7d06d95be41b132b76793d4b3c99b983fba67861629a2cbef3f997b6d46c22816a43c30031f3f9fd1a399c72e9cfc0 SHA512 fe03ae3835572bf39090010e9740e3174c0b5eb2d1ea92b5fadc7d498c29c8ebfe21d86bc9b2783ab2c6957a28f0e65f1a57c36b903ce16bdb9e2cb0328e1875
 EBUILD qtcore-5.7.1-r3.ebuild 896 BLAKE2B 5d6c21f0a1de4db39fb89d34c2112fbb4f88130f884d5dc2b9bb8b4d4ceec7d265c68a210689b3ca7ac48c726954846e6512bacc0e4707fa51cdd7a3a8c12791 SHA512 bd5fd8e6a9a189773f4c5473d0073709f034b661a28296a8f4d3cac4d26eaf63f04e4b0d08028810b77ca10bfe8c67aaf6c4cf2da7a436e2b29f9b04024cb158
 EBUILD qtcore-5.9.3.ebuild 1431 BLAKE2B 31e75dd8b0faab83f94e367b53562d49ae5f54d674420d025f5538978263924dcb3316175c8148556e49e9ab0f2869f99d9c5b33da66c153e4a6a89d70e0c762 SHA512 df1750e83202647e21abae00b5e01eaf206d8c3a98005fa81f7ea48db1d91a8451a48de6b2085990ed944d87c944620efc3ed982ca85fe5c4c2828a1300fd541
+EBUILD qtcore-5.9.4.ebuild 1456 BLAKE2B 683bf2694e07d7b2001d2fd54c75f8b02e7dcddb8c0039afcfbcc1e24b0a10926a4e3d6996972cc483110705cee145fa31b21514775d78fa5417faf69323dd3b SHA512 f36f179bb03923aa32b5d42f6ce3e9bbe62372bc43ca300c1d9d5eb1c143d1a395ce7595fcd245dcddbce57d683bc846af21eb0badf6f75c1cd1d146ea484c8b
 MISC metadata.xml 924 BLAKE2B 6be074e378d4e63efe0c6ff55cb99c3ab1318c1d05d8208f4deb8a54a3cc9ded99b63e788336d83633b03eb5d857394e189472a374184d852d3c5851e27555b6 SHA512 c9786a997109a6156ed4879cd94e3e368b7ce095fc43fced168bdc5fbc846411c145318020d0eab7024aa64003403435a6cad222ab3569d838b9450c526c8ddb
diff --git a/dev-qt/qtcore/qtcore-5.9.4.ebuild b/dev-qt/qtcore/qtcore-5.9.4.ebuild
new file mode 100644
index 000000000000..54eb30f5d38f
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.9.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	sys-libs/zlib
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/tools/qfloat16-tables
+	src/corelib
+	src/tools/qlalr
+	doc
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	!:network
+	!:sql
+	!:testlib
+	!:xml
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use icu)
+		$(qt_use !icu iconv)
+		$(qt_use systemd journald)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	local flags=(
+		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+		HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
+		XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+	)
+
+	for flag in ${flags[@]}; do
+		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+			#if defined(QT_NO_${flag}) && defined(QT_${flag})
+			# undef QT_NO_${flag}
+			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+			# define QT_NO_${flag}
+			#endif
+		_EOF_
+	done
+}
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 88db7d5d6148..0320fc7736f3 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,5 +1,7 @@
 DIST qtdatavis3d-opensource-src-5.7.1.tar.xz 5155740 BLAKE2B bd0fbd04367dfbc328d1d63fe5e2557a491f8d2dddbca4efadc190bdfa640f3ae2c7db1b29ec9ff07e3b8e03cab2b4caa4cae2ffa396d82d4db728aff252dbbc SHA512 2739f7ddcf81fa53a2673e7073c1dac54ea15b70175e19697c7711d652101f0f9a41dc5f89ea33bc5675605ba760667ead8cfde10940dbad8ec75f6897c67b5a
 DIST qtdatavis3d-opensource-src-5.9.3.tar.xz 5163104 BLAKE2B 22502bc5c365afd1d1e65ab0c01d1aa744ec78413714d16c5ef6611b07f797f075b20c59d31ee80d30a5b20c68688e9222597305634355f79296593ab3837634 SHA512 2e549ed5dc6aeb92325c3a26a3084865ba6b6bfbb48c3e415dd8dafd54f248a8b61d4a49e376c77eae214fa91df55b3f960ad6400209fbff52708382e154c873
+DIST qtdatavis3d-opensource-src-5.9.4.tar.xz 5164120 BLAKE2B e8e9586da6e261f22ac6dba12b530755b1b6914f702a33d196968f7c8812e4d5a6b86dd7584c109385fa2e9bc33fcfc067b2538f8d4cff69d3a0624a26822a8e SHA512 8e314d4b0324b6d9aa9a4a63bd3e21010545ce7ffa250614ceea6052b37d7519036a4e13ce1b3cd264e5ce00453bceb774234932cf3c3a49bcded0988d4110c2
 EBUILD qtdatavis3d-5.7.1.ebuild 625 BLAKE2B 83a990e7da20777008fa1f8db5ef6e0850d0d1764ae763cb0063e7b8198277225ab00ffb6895317fe6800c34bee77f08f76177a690020f72e382ef0d9889c5e6 SHA512 6498e8bc0b6baaf227a22c047e9e2587d08b632d3bd9ed747af513b8ef607e2bc7faa420a0147cc67be744ef8468696488863282c4ab23824bad42375a0b56eb
 EBUILD qtdatavis3d-5.9.3.ebuild 625 BLAKE2B 5bfdfb3600b882ac63e22ea74f69855b6a2b48af98806eb6731a659395ab46a2bb8abfe397fa781e660efaa7e03a02d0225620ab87183fa73a34ce77adc212bb SHA512 971fe6b40e1f7beeea40feb2b2234c5d6727f1cd1e4abbcaf1b67a713adc88ff0b117564677d86cf1c7fc7b03d341ebad326f79490c28552de6d858aab82fe67
+EBUILD qtdatavis3d-5.9.4.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
 MISC metadata.xml 634 BLAKE2B 00d75cb45e34923b64e3f841adbc930a8615b627ffb00e0a013965d6c7feec165d6124069241987341c43274f46ae54a3ad913a2ba46c3b7d4e51637baaaf07d SHA512 cf0c7257d0c332cdb2dd6295c26afc38f40eb2710e197c3767c7d828cafbd545faa1926f4cff3500a1b0cee1630399690ad107278a2da129cd682c771599bf32
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.9.4.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.9.4.ebuild
new file mode 100644
index 000000000000..647770499acf
--- /dev/null
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.9.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="3D data visualization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="gles2 qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# eliminate bogus dependency on qtwidgets
+	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
+
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 82fb66abe64c..694b803c4c4c 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -3,7 +3,9 @@ AUX qtdbus-4.8.4-qdbusconnection-silence-warning.patch 997 BLAKE2B 079b0ce31ab06
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
 DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtdbus-4.8.7.ebuild 856 BLAKE2B 45206407be68ca357eeaab6a5d6cf5e6f614c333bf7f094e54d32468d6dba97cf86042ca2230ad98d71382e35ede4609f1e2fdb2d64a0b4f1c2fec998727d594 SHA512 5e1a3bfa62a290548f111fa9ad6bcda6faf67a718cb689a8420bebc4154d8d7d194ba5de5485219f77e7e844ccce897b5f34fe3bca3d9b0ce8ab87f336ed2a4f
 EBUILD qtdbus-5.7.1.ebuild 626 BLAKE2B 0300dee0d4e838bd29c16e098ad3362d9dac83de816560334469ecf4ed75550deda4ae6f487a531ddca73e4620d33095ab6a8b975d6a44795a3cebd8f211895e SHA512 73b433dc98af92d58dd0aec68dbfa73afe1830068790120fe0e809562ef41fa413145d0d917e07d7c8861bfc7f4ca34e7db0b3c6947f19a32b86f089d23134d7
 EBUILD qtdbus-5.9.3.ebuild 631 BLAKE2B 9b78e9e769c572cf2a06527aebd28149ae5782c7597414e2ba4ffc69a4b01269b0389b3fff86e6f4d40788d05859fc76474ab7e99f34ecf4b3c99b456c2179aa SHA512 d70446d80b998541d703312c0dcb5db8957f8ca6e086f57754030745d1ea37b1fa69f277142fd6ee0c462976cc5c77b4d8e9573b5e2901ff041185869ec0b1c0
+EBUILD qtdbus-5.9.4.ebuild 683 BLAKE2B 95a9165bb2b85fc66d91e466726fa19fa220da5af71f5891b184428df67d2e3fb292fd37cf551554cef8e212a8ddb1c3733b184519ff5b6af230f411245fdd35 SHA512 af48f9a79c34aa67541505858dc6154989a76aae8c83eb03b85ebd79925834ac75dcf91be04e831d3972b223f3ae8e1dd1c97683ffbc31fdaffdc0f4382c3d9f
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qtdbus/qtdbus-5.9.4.ebuild b/dev-qt/qtdbus/qtdbus-5.9.4.ebuild
new file mode 100644
index 000000000000..3cf363401517
--- /dev/null
+++ b/dev-qt/qtdbus/qtdbus-5.9.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	>=sys-apps/dbus-1.4.20
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/dbus
+	src/tools/qdbusxml2cpp
+	src/tools/qdbuscpp2xml
+)
+
+QT5_GENTOO_CONFIG=(
+	:dbus
+	:dbus-linked:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:dbus
+	:dbus-linked
+)
+
+src_configure() {
+	local myconf=(
+		-dbus-linked
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index a287d89ab3b8..c6ffecddad18 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -2,8 +2,10 @@ AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbf
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtdeclarative-opensource-src-5.7.1.tar.xz 18976920 BLAKE2B f451622bd896445b21db99c0896a58051b8cd78b98062ff9ae71285ea66a692b7f236e0c8b69ee9b7a2685f46344525554caf73f6a9d5b45ef7d6df15f8e4b17 SHA512 8c56099a13103f4831a7ceb29223722c1f8efb0e9a87a4c1fdf0b55a3c5b4cedfdac6e06960ea5d03df4184b3d1c6bc3f21bdcdbd2400591143930aa8e32a2ab
 DIST qtdeclarative-opensource-src-5.9.3.tar.xz 21443328 BLAKE2B acf201966b55f748e516d0f32c2fae0c3990d00ff5b2f31d72d012840ecff4328ba693eb96a800fa6eaefad285a72edfbaae93343e4d664792c561e78ba56882 SHA512 933caf5848437cde45b4bbf0c70b6cafbc690657c651508b28138b2f90d2f823f4842bc709f4726e2c88d3913a92240b0dcd9248d83af0d06d7127b9a8211b24
+DIST qtdeclarative-opensource-src-5.9.4.tar.xz 21454140 BLAKE2B a7e792406c2eb42422aba1b779e2249f081840c8237a119cf4d9a001fa34d1f5e48e30216c08be431a89bca52dd56d4241d92cdfdb8b684b0912449bd0c9301e SHA512 e9e425665df42826c2525566e08b3588aa73b0efea295eed301ba5caeea7208b90c5a91a55cc16986ea9e0ceb9c6658bd59f56a3a276601ad5780f2c67f5ad5c
 EBUILD qtdeclarative-4.8.7.ebuild 1493 BLAKE2B 1fc9ba56b9dd67fb840611e38e19a5bbc4b5f50d16cf7afbf9f384367ea03728f2d44aa1d14adf11ab44f8fba5532ce5f742803a5139f3ed25cf4f404e117d51 SHA512 b01c643b5d27f41e862260743be6701464ed145063ebb6642f5887b648b2f6e8c92c960d81e221a46c8aa7abc9461588953756390f080a7c6a02c53011338ca1
 EBUILD qtdeclarative-5.7.1-r1.ebuild 1599 BLAKE2B 4eb6b7c1e0908d58b3d2d354c46896abb86a82166ef36283465ee5738949584fd35ea8a613e383988bf2910faf5f0bacadeeba032c7f29b7e9451f8a5498b907 SHA512 6d73bf168ea19e07999cbc9b74957415485e176597c5d706afe55f884aab186bda425bc247aaa343fbb04c1d3836d973306441c05dd213c5d119cddbc2dc6864
 EBUILD qtdeclarative-5.7.1.ebuild 1327 BLAKE2B d9cd172eda38ee091a4e40d603425f2d3abbf0a8850c06676fabe94dcc09867f9944239fb3776c8ce942cb5dd0f1bd96e425ab25d48a5a7adaa06356d201a0ad SHA512 64f80c5f910c30dd09967e2b3dabfb21a4d7b4fb109bdc6512ded41ab6922f3a4034bb4567a7efd065ddd28eb2ca8a9763c283e82829d26e3e44600aa9880942
 EBUILD qtdeclarative-5.9.3.ebuild 1315 BLAKE2B ccb4987e5e25a416e766d1d072684c6d37e693d1d986be94cab18aad30fffdc9204aa936a8554b8bb99cc5789d73f9898a20b2d4dd9d8b04f242c2f4ab0b2d72 SHA512 669613878211da2684dfa59a72a69a932e0a984dc8d2eb4a38b8868e7d6f6fa15d8ab5a45366d3fd2c42123db3eafa7e72bd5fce288aa89b6cb0319b8dc75ffc
+EBUILD qtdeclarative-5.9.4.ebuild 1315 BLAKE2B a73070cd34611690b47802758d80f00d5d1343e5b3515282cf77d5492045e115670d0ae9d292efe1afd291816dcd015950b494f1e6863fe04d04542b23557879 SHA512 befb7a05f78cacd0ae874746d1a0fac905b7e3a9a2808fbaa78ea465ba50e64cb2c99f2a7799604722e7fda956e2c131e7ffe5eac5868200b5cfe5094ce8e549
 MISC metadata.xml 1154 BLAKE2B 838bd6238e0b647adb40c4e0d73221104b2f26f160039a014c4576fbbbf51648ec1497e1833987ff298c4d42159c8ad2b2264b8f8a1a5c1d509e321e543709fc SHA512 fe0fdc462c9337726df24de8b8a13660da81a2cbd7cd3d122fadb3a6926e2cd6213d8eedc12185bf4dd1012ab1062ac59fa3cad3055b32e71012072aa31ef415
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.4.ebuild
new file mode 100644
index 000000000000..985b692396c8
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="The QML and Quick modules for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="gles2 +jit localstorage +widgets xml"
+
+# qtgui[gles2=] is needed because of bug 504322
+COMMON_DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qttest-${PV}
+	localstorage? ( ~dev-qt/qtsql-${PV} )
+	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
+	xml? (
+		~dev-qt/qtnetwork-${PV}
+		~dev-qt/qtxmlpatterns-${PV}
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-qt/qtquickcontrols-5.7:5
+"
+
+src_prepare() {
+	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
+
+	qt_use_disable_mod localstorage sql \
+		src/imports/imports.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/qmltest/qmltest.pro \
+		tests/auto/auto.pro \
+		tools/tools.pro \
+		tools/qmlscene/qmlscene.pro \
+		tools/qml/qml.pro
+
+	qt_use_disable_mod xml xmlpatterns \
+		src/imports/imports.pro \
+		tests/auto/quick/quick.pro \
+		tests/auto/quick/examples/examples.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 7568101208d9..5a2f0b4550d7 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
 DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qtdiag-5.7.1.ebuild 485 BLAKE2B 6314a5d4ce429af5278ac7882322a8695b7faaec8f26a29c6db4a8c5343890286bba1a68e3e2f8c8bc9d354411543e7e63978ad15f68b5d4fb5047c86ef37d1f SHA512 42d93ab515ab238de2bced22e53d32087a878617bac64357748ca727d8f83d99c7a585bc8cd17633592762c676cf65bc86417250902725c768c62ca8bf67f283
 EBUILD qtdiag-5.9.3.ebuild 716 BLAKE2B 1ca31612dac6b9c94402c56675169439aa9853f8a2e80bdb1a75e540a13cd4df4851aec8c50eef08c9580377902a31cc33408898c3621e439ae656d12dbcb5de SHA512 9cb162951d86e733622162630d6258458a7053f4ba7a3dd2fbd63feffb3e0a361091d45c10c0bf182c4aefcd7e17815f84908ca98b291c6331adf18902a9c74a
+EBUILD qtdiag-5.9.4.ebuild 716 BLAKE2B d55f92d3fd1e005b7e156404d74d09137ca66da313e26b387e14780da28ff157957d13c6e460a36bdfd9167fe876fce79ff57618ea4e5a3375527dcddc7f27a5 SHA512 d795a0f96ca8fce4d58f8d5e79544956784f507a6b5bc35e141e104486dae1b8c25a8ac27b26726a44b9fa391897bfcc6dc55238f68bca2db1757224e7716f6d
 MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/qtdiag-5.9.4.ebuild b/dev-qt/qtdiag/qtdiag-5.9.4.ebuild
new file mode 100644
index 000000000000..85c0174e71a2
--- /dev/null
+++ b/dev-qt/qtdiag/qtdiag-5.9.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="+network +widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtdiag
+)
+
+src_prepare() {
+	qt_use_disable_mod network network \
+		src/qtdiag/qtdiag.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/qtdiag/qtdiag.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 7d3fdedd02d3..04e86f8f6caf 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,5 +1,7 @@
 DIST qtgraphicaleffects-opensource-src-5.7.1.tar.xz 14486948 BLAKE2B 62e0f19fdce08561848ab87768bfc56502d6f243769ee1b847dec018cbc231b1b64f95ca4032bc2fb1e6a73fb7f85dc51ebde2d551ec8be3b6571d07bfcd97e9 SHA512 2eb5fa078be65fbf1b57aca7106cd77c840aea3f13671445552ea4a5e0c6ff1625e30f58ca4919ea6dd76229931a307a77f172b604a55fc115569c4e446b5a3d
 DIST qtgraphicaleffects-opensource-src-5.9.3.tar.xz 14480348 BLAKE2B 187e048db6cefa7a862c291f11c5490788162dceccd14cbf772c61ac530292ca95e2b18f4da53aa3fbe1ae38fdd3fc6d45a120b3d768313afcc6f12f3e408664 SHA512 4695f91b03feba279e62653d5794e175d436c40e1a0acbfd1e3caab9473830f3583dd2a9821f2fd0e0b7d354ad6ae8dd486eb95893118caaf1518cdc64f7a03d
+DIST qtgraphicaleffects-opensource-src-5.9.4.tar.xz 14480512 BLAKE2B 1ec184f4b42bdd775dbeaf627844670c0f6316469f269d66845c84286b21dff94badb50e2f5a7e0f4335db0b04b12e37ae2b220cfee950e3eadbd6a2c2efffb1 SHA512 efe4d0fc022bff8e9f20b1224ed624a9499bae069576db957dd73c1da98922cc98e4c1e556180bc3512215631116581d1f76030b11ac9ece4f29a64564fdc6b7
 EBUILD qtgraphicaleffects-5.7.1.ebuild 446 BLAKE2B 9a1d9b17096ff197c0eeaedce020777d32846ab0c08e87f2384c4902fca9cf6d07a25f8a3d05bddad6b4f622ff4463a7e29ee831ec199947a35bc30afa2b11ad SHA512 30184a13d86002cf18b3e9d5929021210134de9e08aee6e5a7c204ddb8a999fb5dfc936871f2d6720e69c19c03794a76678f6a49a80cedf4b520e4a2bdb7d210
 EBUILD qtgraphicaleffects-5.9.3.ebuild 451 BLAKE2B c2c7bcdb0f7728aa79d1fa47b9629dfdbda2c25c5a27a40c29a7e9af33abcfb8bdaf1d153c088dab817f21d3e918cc56b0e6d28665bb550e1e416d73b068a116 SHA512 edeaecf449d131818ae4b2a82cb6a0a8824d5562b32ccd13e4eae739a97e6627d1267b1543fade38dc8e5c5da8227c3c58d8159e0d7b4337873731e1c46ff470
+EBUILD qtgraphicaleffects-5.9.4.ebuild 451 BLAKE2B b46592374ae4e7fd7c3bb609ec72b9718f62fa502148fb48a83fccf1e702d84c36a41fae24ed7365928545afd8431f28830116ee3a9557bb08321b109153a32b SHA512 ac77df06caaceac667ce524e3d22fe6a5831cf2d0cc9c2d59105e3b67b4983bbc426a6745eb7253effedf5472f1b7a4271679936608327fdccfe0ada5b4aff97
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.4.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.4.ebuild
new file mode 100644
index 000000000000..51a225a5a40d
--- /dev/null
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index c5afb9982af2..0db86677415a 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -3,11 +3,15 @@ AUX qtgui-4.8.5-disable-gtk-theme-check.patch 1166 BLAKE2B 638fa282166a5ede48ff2
 AUX qtgui-4.8.5-qclipboard-delay.patch 1135 BLAKE2B 5972ab258ba5c60346f83a0c402edd39ea3c1fa777c59c6691e793d300956f1d966f37f6f35c187c95074872f8ccfb4b4cac8b255da462ddd3744cc67bc21108 SHA512 00c901fc9b9bd5b8ce45e8bb4dd4eda8832df7eda104ae1614d7cdac681d23f0daad543d0480f1d9366e2644833db680e0526660472a6cf1a907b803acf76517
 AUX qtgui-5.7.1-qclipboard.patch 1791 BLAKE2B a7753b78631bab6774ab5bd20deba153ee44dd41202531824571ff0596f9b731958b125a75fe464d8039bc327e5588f53f70b3be4c5a4eb640bf77af554d5552 SHA512 c765e7f1cf2e10b4fa90b2c4e3a4a39c9001996d4837eb86c1d298531dd30fc1f6a215addfd1bec88526451d7b2ff3ba8a53a330776c94851e79b1964336759c
 AUX qtgui-5.7.1-x32.patch 1161 BLAKE2B 5d475369d8a6312f0a2ab205b64739c9d7fd8b44132b10b00d29fb774ad837c45d6f50b4af776f7fa5fc2b19de9068922d1df5951084c5770e8a23f57b14f9c9 SHA512 61f6cc40c2897e17c0a71cb1d79bf8e6c69cbacf6409ae0d96f485584bd6a930484ecff709c208ca78335418e022c68151d096505f5db2179cb6c4c8b065c116
+AUX qtgui-5.9.4-qsimpledrag.patch 6887 BLAKE2B 9da87acfe69c1cb8b1dd92b05a7b919d01227d0aa1316adfe97261bd59a7e0eb3b1e6d9b0896cc2f6a6a64eac3f31f72039a3acc2767998a668656acc8d8ffc2 SHA512 8229b87a40287c3c6e74d5aec9bfc346a1e0f7002687ba661573566ff5f700c99819850fc97f07d3a36d63ba83348f2ab315f835e44abce22242b4d1f29e7c7b
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
 DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtgui-systemtrayicon-plugin-system.patch 51377 BLAKE2B 2b57d485c9ceb2b7e23cd6f8aa3be955e70d779ab0ca849148435e2a212a2db48948dc689c06eb8aea484513081df56d86584cb98ad4d64fb86ceb15eb802f38 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679
 EBUILD qtgui-4.8.7.ebuild 5656 BLAKE2B 4f91f3c72d65000c97d04dbc443b0a1214486f0c429a70592d19cc338ebca5052fe52a3b0a68f30094fa0610b85ef6ad9fc0a7899211cfc22b9515f579f6fddf SHA512 2298d7ef9176166dd21f24ce690c61d7ae4c0d5016908a9c4119f1c8f66a51d143cddf8f6b5bb4232815f5e2bf842abe0de72432bd487629b3cb6ca938d7cee7
 EBUILD qtgui-5.7.1-r1.ebuild 3792 BLAKE2B 0a65c076358bcacde64a74df90e471d4fdde27308b88556c7dc66563f9ffaafae2cf2d073cfd6232a31a488f240f357960a9daa8989c203bc904b710b8d7555f SHA512 f8d57932f30b17ea72cdebe7aa268e022df15a29bc3c3e2789f8c68b54a29e89d8c9b9a489cd6d5492e88dbc6f35cd9872d02ce920ef7b8d17878bfbfee10a7e
 EBUILD qtgui-5.9.3.ebuild 3501 BLAKE2B 44db6447d096a35dc08e6faf86fd7b72c311710daa7c0804bb4ea97b44b4a063c7b44cdf20cfe5c1c0fb2caa060327453d66d023c7a3e3e2afed3f00742bc9e5 SHA512 9c770692dab57be3a295ef287885928ae337ddc4aa0976147be3b808e9b2b8ff1700de8a2f2250eb503e51d4f0aafed64073e7cb035540fae0a836e3294b2b8f
+EBUILD qtgui-5.9.4-r1.ebuild 3610 BLAKE2B 0b8403f242e97209bca6e2fad465b878d24be22e1616b5b30c01a15c6ff08de8843eaffdc7e3b3c74ab942c2b8a4e77ea833a529740801a3b878a39672ca53ab SHA512 03d925259cfee10866fecebf77db94f022c29e28321668c28ac7a29aad4eae444e30084ef8871161821f520f54dbec609f1298931ab57dda1b9a8a20222f8041
+EBUILD qtgui-5.9.4.ebuild 3545 BLAKE2B fb542e056bdc514c590b44916fe4b0cd7abbe482e5c01a684414a75071bfada21aa1af2ebdda35ded51f9aac4ef065411ba9e7f5ddddb818980479ff4205076e SHA512 5a23e97f9b44365c28ebc73cfde6f2656c78a2b0fa18073f4107e2bec61b4147771cf8a87f59f29e8ae39385a389f92150b7881a54b6ceb9fb45b110b5221df0
 MISC metadata.xml 1862 BLAKE2B 062b123eab07ca09b1b6d63a9ce814a921b523c1861552a4f12903ccc8f627cf78e240d322c52b3a404ff154822a9cb42f894da5bc74a924d89dd51a42576115 SHA512 cba45629873eba71f152885640e51ad324b0dbb702c45811b4a1785a0af3baa7ce39923dfd0dbf7748d604e9a053d6580defdad75ad5ae228d37424d9b54e530
diff --git a/dev-qt/qtgui/files/qtgui-5.9.4-qsimpledrag.patch b/dev-qt/qtgui/files/qtgui-5.9.4-qsimpledrag.patch
new file mode 100644
index 000000000000..60d2ec424f47
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.9.4-qsimpledrag.patch
@@ -0,0 +1,170 @@
+From 4a7771f206d4b29be549d3827c36a46679d90de6 Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein@kde.org>
+Date: Sun, 7 Jan 2018 13:02:01 +0900
+Subject: [PATCH] QSimpleDrag: Fix mouse release coords for delayed event
+ transmission
+
+On platforms such as XCB, the drag cursor pixmap is shown via a window
+(a QShapedPixmapWindow) under the cursor.
+
+The mouse button release event at the end of the drag is received in
+this QXcbWindow, but intercepted by an event filter that QSimpleDrag
+installs on the QApplication. It then resends it unmodified(!) after
+the drag has ended and the drag pixmap window destroyed, causing it to
+be delivered to the new top-level window.
+
+The local coordinates in the unmodified QMouseEvent are local to the
+drag pixmap window and don't match the window it is delayed-transmitted
+to.
+
+This ends up having fatal, user-visible effects particularly in Qt
+Quick: QQuickWindow synthesizes a hover event once per frame using
+the last received mouse coordinates, here: the release posted by
+QSimpleDrag. This is done to update the hover event state for items
+under the cursor when the mouse hasn't moved (e.g. QQuickMouseArea::
+containsMouse). The bogus event coordinates in the release event then
+usually end up causing an item near the top-left of the QQuickWindow
+to assume it is hovered (because drag pixmap windows tend to be small),
+even when the mouse cursor is actually far away from it at the end of
+the drag.
+
+This shows up e.g. in the Plasma 5 desktop, where dragging an icon
+on the desktop will cause the icon at the top-left of the screen (if
+any) to switch to hovered state, as the release coordinates on the
+drag pixmap window (showing a dragged icon) fall into the geometry
+of the top-left icon.
+
+QSimpleDrag contains a topLevelAt() function to find the top-level
+window under the global cursor coordinates that is not the drag
+pixmap window. This is used by the drop event delivery code.
+
+This patch uses this function to find the relevant top-level window,
+then asks it to map the global cusor coordinates to its local
+coordinate system, then synthesizes a new QMouseEvent with local
+coordinates computed in this fashion. As a result the window now
+gets a release event with coordinates that make sense and are
+correct.
+
+Task-number: QTBUG-66103
+Change-Id: I04ebe6ccd4a991fdd4b540ff0227973ea8896a9d
+Reviewed-by: Eike Hein <hein@kde.org>
+Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
+---
+ src/gui/kernel/qsimpledrag.cpp | 32 +++++++++++++++++++++++++++-----
+ src/gui/kernel/qsimpledrag_p.h |  6 +++---
+ 2 files changed, 30 insertions(+), 8 deletions(-)
+
+diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp
+index a1e25dc..87d3ba5 100644
+--- a/src/gui/kernel/qsimpledrag.cpp
++++ b/src/gui/kernel/qsimpledrag.cpp
+@@ -58,6 +58,7 @@
+ 
+ #include <QtCore/QEventLoop>
+ #include <QtCore/QDebug>
++#include <QtCore/QLoggingCategory>
+ 
+ #include <private/qguiapplication_p.h>
+ #include <private/qdnd_p.h>
+@@ -69,6 +70,8 @@ QT_BEGIN_NAMESPACE
+ 
+ #ifndef QT_NO_DRAGANDDROP
+ 
++Q_LOGGING_CATEGORY(lcDnd, "qt.gui.dnd")
++
+ static QWindow* topLevelAt(const QPoint &pos)
+ {
+     QWindowList list = QGuiApplication::topLevelWindows();
+@@ -94,10 +97,10 @@ static QWindow* topLevelAt(const QPoint &pos)
+ */
+ 
+ QBasicDrag::QBasicDrag() :
+-    m_restoreCursor(false), m_eventLoop(0),
++    m_current_window(nullptr), m_restoreCursor(false), m_eventLoop(nullptr),
+     m_executed_drop_action(Qt::IgnoreAction), m_can_drop(false),
+-    m_drag(0), m_drag_icon_window(0), m_useCompositing(true),
+-    m_screen(Q_NULLPTR)
++    m_drag(nullptr), m_drag_icon_window(nullptr), m_useCompositing(true),
++    m_screen(nullptr)
+ {
+ }
+ 
+@@ -161,6 +164,7 @@ bool QBasicDrag::eventFilter(QObject *o, QEvent *e)
+             return true; // Eat all mouse move events
+         }
+         case QEvent::MouseButtonRelease:
++        {
+             disableEventFilter();
+             if (canDrop()) {
+                 QPoint nativePosition = getNativeMousePos(e, m_drag_icon_window);
+@@ -169,8 +173,25 @@ bool QBasicDrag::eventFilter(QObject *o, QEvent *e)
+                 cancel();
+             }
+             exitDndEventLoop();
+-            QCoreApplication::postEvent(o, new QMouseEvent(*static_cast<QMouseEvent *>(e)));
++
++            // If a QShapedPixmapWindow (drag feedback) is being dragged along, the
++            // mouse event's localPos() will be relative to that, which is useless.
++            // We want a position relative to the window where the drag ends, if possible (?).
++            // If there is no such window (belonging to this Qt application),
++            // make the event relative to the window where the drag started. (QTBUG-66103)
++            const QMouseEvent *release = static_cast<QMouseEvent *>(e);
++            const QWindow *releaseWindow = topLevelAt(release->globalPos());
++            qCDebug(lcDnd) << "mouse released over" << releaseWindow << "after drag from" << m_current_window << "globalPos" << release->globalPos();
++            if (!releaseWindow)
++                releaseWindow = m_current_window;
++            QPoint releaseWindowPos = (releaseWindow ? releaseWindow->mapFromGlobal(release->globalPos()) : release->globalPos());
++            QMouseEvent *newRelease = new QMouseEvent(release->type(),
++                releaseWindowPos, releaseWindowPos, release->screenPos(),
++                release->button(), release->buttons(),
++                release->modifiers(), release->source());
++            QCoreApplication::postEvent(o, newRelease);
+             return true; // defer mouse release events until drag event loop has returned
++        }
+         case QEvent::MouseButtonDblClick:
+         case QEvent::Wheel:
+             return true;
+@@ -349,7 +370,7 @@ static inline QPoint fromNativeGlobalPixels(const QPoint &point)
+     into account.
+ */
+ 
+-QSimpleDrag::QSimpleDrag() : m_current_window(0)
++QSimpleDrag::QSimpleDrag()
+ {
+ }
+ 
+@@ -373,6 +394,7 @@ void QSimpleDrag::startDrag()
+         updateCursor(Qt::IgnoreAction);
+     }
+     setExecutedDropAction(Qt::IgnoreAction);
++    qCDebug(lcDnd) << "drag began from" << m_current_window<< "cursor pos" << QCursor::pos() << "can drop?" << canDrop();
+ }
+ 
+ void QSimpleDrag::cancel()
+diff --git a/src/gui/kernel/qsimpledrag_p.h b/src/gui/kernel/qsimpledrag_p.h
+index 0b8a0bc..bbd7f7f 100644
+--- a/src/gui/kernel/qsimpledrag_p.h
++++ b/src/gui/kernel/qsimpledrag_p.h
+@@ -105,6 +105,9 @@ protected:
+ 
+     QDrag *drag() const { return m_drag; }
+ 
++protected:
++    QWindow *m_current_window;
++
+ private:
+     void enableEventFilter();
+     void disableEventFilter();
+@@ -132,9 +135,6 @@ protected:
+     virtual void cancel() Q_DECL_OVERRIDE;
+     virtual void move(const QPoint &globalPos) Q_DECL_OVERRIDE;
+     virtual void drop(const QPoint &globalPos) Q_DECL_OVERRIDE;
+-
+-private:
+-    QWindow *m_current_window;
+ };
+ 
+ #endif // QT_NO_DRAGANDDROP
+-- 
+2.7.4
+
diff --git a/dev-qt/qtgui/qtgui-5.9.4-r1.ebuild b/dev-qt/qtgui/qtgui-5.9.4-r1.ebuild
new file mode 100644
index 000000000000..97069b8f2c4e
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.9.4-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+# TODO: linuxfb
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
+	jpeg +libinput +png tslib tuio +udev vnc +xcb"
+REQUIRED_USE="
+	|| ( eglfs xcb )
+	accessibility? ( dbus xcb )
+	eglfs? ( egl )
+	ibus? ( dbus )
+	libinput? ( udev )
+	xcb? ( gles2? ( egl ) )
+"
+
+RDEPEND="
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}
+	media-libs/fontconfig
+	>=media-libs/freetype-2.6.1:2
+	>=media-libs/harfbuzz-1.0.6:=
+	>=sys-libs/zlib-1.2.5
+	virtual/opengl
+	dbus? ( ~dev-qt/qtdbus-${PV} )
+	egl? ( media-libs/mesa[egl] )
+	eglfs? (
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+	)
+	evdev? ( sys-libs/mtdev )
+	gles2? ( media-libs/mesa[gles2] )
+	jpeg? ( virtual/jpeg:0 )
+	libinput? (
+		dev-libs/libinput:=
+		x11-libs/libxkbcommon
+	)
+	png? ( media-libs/libpng:0= )
+	tslib? ( x11-libs/tslib )
+	tuio? ( ~dev-qt/qtnetwork-${PV} )
+	udev? ( virtual/libudev:= )
+	vnc? ( ~dev-qt/qtnetwork-${PV} )
+	xcb? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libXi-1.7.5
+		>=x11-libs/libxcb-1.10:=[xkb]
+		>=x11-libs/libxkbcommon-0.4.1[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-qsimpledrag.patch" # QTBUG-66103
+)
+
+QT5_TARGET_SUBDIRS=(
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl
+	eglfs
+	eglfs:eglfs_egldevice:
+	eglfs:eglfs_gbm:
+	evdev
+	evdev:mtdev:
+	:fontconfig
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	!gif:no-gif:
+	gles2::OPENGL_ES
+	gles2:opengles2:OPENGL_ES_2
+	!:no-gui:
+	:system-harfbuzz:HARFBUZZ
+	!:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	libinput
+	libinput:xkbcommon-evdev:
+	:opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	tslib
+	udev:libudev:
+	xcb:xcb:
+	xcb:xcb-glx:
+	xcb:xcb-plugin:
+	xcb:xcb-render:
+	xcb:xcb-sm:
+	xcb:xcb-xlib:
+	xcb:xinput2:
+	xcb::XKB
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:gui
+)
+
+src_prepare() {
+	# egl_x11 is activated when both egl and xcb are enabled
+	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
+
+	qt_use_disable_config dbus dbus \
+		src/platformsupport/themes/genericunix/genericunix.pri
+
+	qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+		src/plugins/platforms/platforms.pro || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(usex dbus -dbus-linked '')
+		$(qt_use egl)
+		$(qt_use eglfs)
+		$(usex eglfs '-gbm -kms' '')
+		$(qt_use evdev)
+		$(qt_use evdev mtdev)
+		-fontconfig
+		-system-freetype
+		$(usex gif '' -no-gif)
+		-gui
+		-system-harfbuzz
+		$(qt_use jpeg libjpeg system)
+		$(qt_use libinput)
+		$(qt_use libinput xkbcommon-evdev)
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use png libpng system)
+		$(qt_use tslib)
+		$(qt_use udev libudev)
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon-x11 system)
+		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtgui/qtgui-5.9.4.ebuild b/dev-qt/qtgui/qtgui-5.9.4.ebuild
new file mode 100644
index 000000000000..16af003c8d1f
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.9.4.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+# TODO: linuxfb
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
+	jpeg +libinput +png tslib tuio +udev vnc +xcb"
+REQUIRED_USE="
+	|| ( eglfs xcb )
+	accessibility? ( dbus xcb )
+	eglfs? ( egl )
+	ibus? ( dbus )
+	libinput? ( udev )
+	xcb? ( gles2? ( egl ) )
+"
+
+RDEPEND="
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}
+	media-libs/fontconfig
+	>=media-libs/freetype-2.6.1:2
+	>=media-libs/harfbuzz-1.0.6:=
+	>=sys-libs/zlib-1.2.5
+	virtual/opengl
+	dbus? ( ~dev-qt/qtdbus-${PV} )
+	egl? ( media-libs/mesa[egl] )
+	eglfs? (
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+	)
+	evdev? ( sys-libs/mtdev )
+	gles2? ( media-libs/mesa[gles2] )
+	jpeg? ( virtual/jpeg:0 )
+	libinput? (
+		dev-libs/libinput:=
+		x11-libs/libxkbcommon
+	)
+	png? ( media-libs/libpng:0= )
+	tslib? ( x11-libs/tslib )
+	tuio? ( ~dev-qt/qtnetwork-${PV} )
+	udev? ( virtual/libudev:= )
+	vnc? ( ~dev-qt/qtnetwork-${PV} )
+	xcb? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libXi-1.7.5
+		>=x11-libs/libxcb-1.10:=[xkb]
+		>=x11-libs/libxkbcommon-0.4.1[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl
+	eglfs
+	eglfs:eglfs_egldevice:
+	eglfs:eglfs_gbm:
+	evdev
+	evdev:mtdev:
+	:fontconfig
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	!gif:no-gif:
+	gles2::OPENGL_ES
+	gles2:opengles2:OPENGL_ES_2
+	!:no-gui:
+	:system-harfbuzz:HARFBUZZ
+	!:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	libinput
+	libinput:xkbcommon-evdev:
+	:opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	tslib
+	udev:libudev:
+	xcb:xcb:
+	xcb:xcb-glx:
+	xcb:xcb-plugin:
+	xcb:xcb-render:
+	xcb:xcb-sm:
+	xcb:xcb-xlib:
+	xcb:xinput2:
+	xcb::XKB
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:gui
+)
+
+src_prepare() {
+	# egl_x11 is activated when both egl and xcb are enabled
+	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
+
+	qt_use_disable_config dbus dbus \
+		src/platformsupport/themes/genericunix/genericunix.pri
+
+	qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+		src/plugins/platforms/platforms.pro || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(usex dbus -dbus-linked '')
+		$(qt_use egl)
+		$(qt_use eglfs)
+		$(usex eglfs '-gbm -kms' '')
+		$(qt_use evdev)
+		$(qt_use evdev mtdev)
+		-fontconfig
+		-system-freetype
+		$(usex gif '' -no-gif)
+		-gui
+		-system-harfbuzz
+		$(qt_use jpeg libjpeg system)
+		$(qt_use libinput)
+		$(qt_use libinput xkbcommon-evdev)
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use png libpng system)
+		$(qt_use tslib)
+		$(qt_use udev libudev)
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon-x11 system)
+		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 6018780df312..43ecf5e1e437 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -5,7 +5,9 @@ DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 BLAKE2
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
 DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qthelp-4.8.7.ebuild 3122 BLAKE2B 5c8e30e3826be0493b2304890022648b2073a2e30bcea15c620aef22763dd0f7bbb6805553f44b411482dbfdab8bd83ba7412a331a605c29bbbb845d0d88c46f SHA512 d06253208591e380d378db2e3496c42940581b781c1c4e82fdd3dba9d2bea6623161d4ada16b80bd6fcf503d78f0eb83972932e3ada501104539587857261d58
 EBUILD qthelp-5.7.1.ebuild 658 BLAKE2B a3b7559c278fc42b516582809f5fe2ed375ddba547eef32e484b08874b2e6978af1be0c95c738d00b3430f3fd8a7892c208b717e638a35cfed523cb1c91048c7 SHA512 40143c4add608d5971d4abeb557513f55e4c345ac3bc1ff4e38532267c8a9a9ec5a8c73eb29bc6e6146f839a2142e58067dc3fbe215231fd2888b6eed8dc5806
 EBUILD qthelp-5.9.3.ebuild 640 BLAKE2B aa9d1b9bd3183acd5e73a01a9ac9f8724be5b2894d9fbdb891882d71dea5487398d324cd9ea446fb9fffd9ba85a0b2ccd3d99f674d32f5fe2210ebb75c9ed135 SHA512 c95c42fa6f6687f6ab9c1aedda8abc8aff9dab4287df0570997b5b225b462585ae974dc4d5dcdaa071538ac310cf389cae95e3d93887a3244e2b6d9b9e52422b
+EBUILD qthelp-5.9.4.ebuild 640 BLAKE2B 14e84c6eeed3993378c312ac1086ef2ef2b662fd8a1c4e7f32e43819ab6725847b82516ba6b223be3d184c692255dc4c99cb1499a41e7be9f4802e3644d77122 SHA512 cec09fa719088dc538c25631ab3b3fc3a8489603d53ff3813dca310b7f4807735e6dcac8495ba47e0a7bf1f56ab510dd35ff5c734dbc1fa966ceca24ccd8b477
 MISC metadata.xml 825 BLAKE2B de978b130ccf71032fb98469ae3562a483b4fd791a13bab4f0d34990ad5638325c90b2ae057e870cc9d4af156114b90498d13828ea51dd2cbe9d3f1c3709b9a7 SHA512 54d474dfe7325966022026beab59b144932f523ced472f0d5d49f72727f6129923af821211fff3d42bc8dd02701e80f313e9e8c0f34e2cf18db1888ad8907026
diff --git a/dev-qt/qthelp/qthelp-5.9.4.ebuild b/dev-qt/qthelp/qthelp-5.9.4.ebuild
new file mode 100644
index 000000000000..529903cbf965
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.9.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for integrating online documentation into applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtsql-${PV}[sqlite]
+	~dev-qt/qtwidgets-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/help
+	src/assistant/qcollectiongenerator
+	src/assistant/qhelpconverter
+	src/assistant/qhelpgenerator
+)
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index a019027ffa83..5a77104b1b97 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,5 +1,7 @@
 DIST qtimageformats-opensource-src-5.7.1.tar.xz 2004376 BLAKE2B 9cc015133ca70dc6d6e542e9c10921352b5c1e529ea03165e0b0443e679fee8987d2fb4f4ec430d0ae164b77b50029e61f149e063501a6f855fcc78050cfc4c9 SHA512 b70fe30b20da8f613f05ae68bf879956341206005d1eff3c34fc279da6b219ff7983d41c2c0c057c85500a2c5826286c63f4c209dc2db84d03848241257be553
 DIST qtimageformats-opensource-src-5.9.3.tar.xz 2102504 BLAKE2B 46fdbb00177e6feb7fdf38595026bb4b87053b6158e20ab06d7150e1b9ed88ef6ebca93cc396240194f2c6feca9613153abd88f49949f1e4956f9665d368e2a4 SHA512 521c805635084fba3746ee86ac7dfc94d2446114dd76aecad6a6f0cb97f49e443f078f2e0439a10a9d3d5fcd285136959b740707fb8d7776b0450f964950a864
+DIST qtimageformats-opensource-src-5.9.4.tar.xz 2106852 BLAKE2B 31f0f5d6c545f04b2be4bd657acce63adb15a45d4b0471b249e39063ae47635a8c5338f44cc0af88ca0c960d399384a911add12f7cd2815c808ddc28d7f5e924 SHA512 91ebe0d4cc67b3d3c55da4dd5d08028f7046819fdc4034ed0ddec075443ebe3775690856a7aa7704ee3ad8893948f79bdc72467fdfea6a0a8ce6fb16b3f5ab5a
 EBUILD qtimageformats-5.7.1.ebuild 455 BLAKE2B 55d81da37a7f8c55bda94fe77d7a7411217e738bf32d0a93f632e1cefea47c29d30877ff36a55cb61481e9f0b47c2e70641d1bff1abd4541cd0dcda25b0049e4 SHA512 e0b66f1116601b4782913cda26836d42e13170887f00e5a74ab0983bdf1d53c9c60c98499b75a556e627df106268b40f0f8a0f5cc5b3877e6b1896cf33fd55b9
 EBUILD qtimageformats-5.9.3.ebuild 459 BLAKE2B 0a62d9094f6439c107dc723099de0d545d76636bbe98aa43fedd089cb63e6f4d7978824373a799710cfcb49c5eb1c609391d701564d5523bdb4902ff52bcbf60 SHA512 7b14f36690a5617a6e08f297ce015d1b227e0afc1e6b37313bb50c96424efb5d3d04029b88a4266b57a1c35dc9579b02e63fee8cd72627f71fd3c71b3bea1439
+EBUILD qtimageformats-5.9.4.ebuild 603 BLAKE2B cec8884f77d29bdbe71a53356ceb70d9ba84ad1d835d04c822228def82139a37232e38699cdbb32dce0ce13def2bf8aa18e2bdd773b582ebfc6f98a1eb3eba08 SHA512 32f9dc774d5a0ac1837384975a7487f75a12aed24f059d7c17a1d377a5085b363c0d1992dee852f79b143a92366e4533db326db447dbb4e8e9c517425be19d09
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.9.4.ebuild b/dev-qt/qtimageformats/qtimageformats-5.9.4.ebuild
new file mode 100644
index 000000000000..5b10805b2ac2
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-5.9.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Additional format plugins for the Qt image I/O system"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="jpeg2k mng"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	media-libs/libwebp:=
+	media-libs/tiff:0
+	jpeg2k? ( media-libs/jasper:= )
+	mng? ( media-libs/libmng:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	qt_use_compile_test jpeg2k jasper
+	qt_use_compile_test mng libmng
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index b0cd17410a18..daedb12cce5f 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,5 +1,7 @@
 DIST qtlocation-opensource-src-5.7.1.tar.xz 3194112 BLAKE2B b5ac3bed420507c4a03b382c23d02cf0638c64e4921872930ec22394c3eaef7b7abaf7830d40c3aa2c9888e91724d5795b17a6d2a37f2f21b97285ef7d0dfd69 SHA512 a3e0318ad348edd6d9cb4762d4fc6230a47984fcf526f55cc2c9bc00e2e70fdb1380866ec8906e3f58669c62464f8747c948d85107a2d30be1e98da27c7739d4
 DIST qtlocation-opensource-src-5.9.3.tar.xz 5374552 BLAKE2B d8f7449daf02d98b9ad3ccc93a547f6d0cbe25f4d17637f1efada9cf6d00e84a082845c16a488a6653570b33a2c3be9c8f2dfc6881cba5a10e35e1a96f23893a SHA512 11bf2c6000fc2db92dc857cc6f271e7ff19f500fde14520678e9af57fac41debde4c4b937dbab4fe1f7d5744e1bd0fc25ea32fceecf97d32cecdbbc8e2105373
+DIST qtlocation-opensource-src-5.9.4.tar.xz 5405252 BLAKE2B 6474251b21baaac6182a0197a7736dcae86d0735e8be499c9bfefa639b3a45c750fa9bfef766849fbf6d7c5db518e5712e0862463e98168e2a3121582966d834 SHA512 a97de23a554f709a39ac8517de85c9beb7e1a8330ba3996593aeb3d64d1c5b8d8b08b0c94df435dcbb4ba5807e262ac6f87ec9620694805e0261a4b2ee8456cb
 EBUILD qtlocation-5.7.1.ebuild 537 BLAKE2B 8180f414cf9ce74285e91eed2aad13b298496e07ec5739bf09d22142a00db0fa546b1ac623820efc6702a66e1398408617bbc991fbac339a1ec21ec7e2889c68 SHA512 fd686ef629bcbdee03a9738b2a2d75464c2099830a38f165427ce475f386b5a459621a033e0ef0044fc10da2ca7d545a78e82a23b7328338ecc38407b53151a8
 EBUILD qtlocation-5.9.3.ebuild 924 BLAKE2B 110c23ae161fb2d150f9cd3d8cebe54d27b480c5fbfd85531979c3e4ba9ae233670ef08b703b3b9a0bb31996f093fdf889ec45544320642a6bae47bb6b04019d SHA512 c8ce925b2e821f6ef28f95a3b4afda5c42e9f6da66e8b5b5583c8258c0129e22d74b4a48be328bdd000ee57e9b9b4014c4c92f199a1d08fb04a2488996cc894c
+EBUILD qtlocation-5.9.4.ebuild 924 BLAKE2B 29c9eab14fd35bd299e880fb12d06df88f44c9ffea761f04f92d119224ea5554620cd044c66a9b0ef0f51a9b26162788fd4d48873353680ccbda8a20e17223a0 SHA512 df70b1dd13f3953790803cb768e84a53dfb05d988d4ce135c2c5828b1736f9f9b2a0df710eb2141396e4cb3633025e938ac99d46e1cdb92b3ae82fb3d096adcb
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.9.4.ebuild b/dev-qt/qtlocation/qtlocation-5.9.4.ebuild
new file mode 100644
index 000000000000..f791b5b325e3
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-5.9.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="The Location module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtpositioning-${PV}
+	~dev-qt/qtsql-${PV}
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	~dev-qt/qtconcurrent-${PV}
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/3rdparty/clipper
+	src/3rdparty/poly2tri
+	src/3rdparty/clip2tri
+	src/3rdparty/mapbox-gl-native
+	src/location
+	src/imports/location
+	src/plugins/geoservices
+)
+
+src_configure() {
+	# src/plugins/geoservices requires files that are only generated when
+	# qmake is run in the root directory. Bug 633776.
+	mkdir -p "${QT5_BUILD_DIR}" || die
+	qt5_qmake "${QT_BUILD_DIR}"
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index cff1eb17a570..e9b44ae5936a 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -3,7 +3,9 @@ AUX qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch 6852 BLAKE2B fb
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtmultimedia-opensource-src-5.7.1.tar.xz 3563676 BLAKE2B 51ff5ef507ae82eda236143326b2c553038ee01d77f70c3bd756160ce30851509e989244ca19edbfc18a9cdbe20189c8c84715c3ed79b76604e9c82144b51f92 SHA512 1415a4c29416ead2528ddb040a3c69480408509c6ba573f44295513bfe2aa62b8e8bb97cbd33713e605f094e1c1e1337507904d2b0c6480ddf9cf75393d8e97f
 DIST qtmultimedia-opensource-src-5.9.3.tar.xz 3598216 BLAKE2B 9f9e88272d4b3746ba3a235e44fc11b5b7074b371093600fd8f5f19b57a651224aa3ab44f9496d2add78d0ad355f6ea1ed13c172c8d6ad469d962d0aca8aca11 SHA512 fc00650473ff5eb8f61342e144c97a6988d60b663efee27b58361c705ee482790df2442b58d1f44a069ea95a39b6ed792cff6ee12db848f1738b526e3afbacae
+DIST qtmultimedia-opensource-src-5.9.4.tar.xz 3608792 BLAKE2B ac377b3cf33d727fa129fe623cc9ba9ea75555b2af7f70cf07524598d4044a94617b3627f7fd3a915596e51ac53040b9d72a5fcaa2faf316150a2c1ead220def SHA512 7a60434736f655900d00e70a68e5781f336446938f4f2b617e1d93205b7319bf01be987c001a9e6838ba5fd9e3afe3f20137597b6c27f6f77ee55486e283d425
 EBUILD qtmultimedia-4.8.7.ebuild 1298 BLAKE2B 2e78e5f2f0dfbf43aaabd1abcf06fb05a3612029bb9ed2f1007cda90ed32665cea64b2f56e7b64b879400a3a66ba4907fbacefa5bd431fce1a08b0db3c61c8cc SHA512 d7a6fb8aa9927fadfd23e59a695818b8e066ccba71877848669358fa640064a6dee16c38ba988e2501e3350939fddc13c6ec90791c1b7c670f1e654b6a5fe6d0
 EBUILD qtmultimedia-5.7.1.ebuild 1501 BLAKE2B 4927749777c09c932c9545d6526c9a02de0ae716fd078676142b3115441adaa530434523939dce7988ba90da647650f29919115f1214ff1b55369a04b30b5f18 SHA512 42e79f343a023a6311b7aa1a6a459b220f65e9857c890303528f8906c2a685ca55d48d645f953cbacdbed04a60506be4b92864c2669245eb45e5928c0db561c1
 EBUILD qtmultimedia-5.9.3.ebuild 1352 BLAKE2B 98539aceb67071bed64593f2e6a3d1e50fbf672ba460e094fd63d6affd1d4fd0b0efacde1d303d3fb4c92d9ca641e441d2ab7264902892f4f1c9c2851ed51364 SHA512 16551b7f0d8f0e4f696c6a1ea77b823052517f9a4077dea3f5e61ac691a738088c1964658374a9f9b306ec82ba29fa12679253abc9577a612e8ec1630197b0e9
+EBUILD qtmultimedia-5.9.4.ebuild 1352 BLAKE2B fca975ebd9f54edfd10b502176a77e9f40d90db24116fae5b9ff5d77dee19d2adee66d50cbec1f7758f5c66397da7b64e47c0570bc586f57fc81a832941f565f SHA512 97aa003e75c8a3116aa974892b8535d3931548d4b3121df439836079d3d3dde186d0a846a13ec0fbefcdc61a1f5b6fcb4616baab1a881133b5e4f11958cfeff7
 MISC metadata.xml 937 BLAKE2B 804145c6bfe640955c5de227bdf2ba51570749541d5febec508b874fa823a2386da52648b2ba2bff959de2ef1371fa6384007591606410829d6fe4c12afd7ce4 SHA512 b5007c578748a64091105fd04aec3133587dcf0f8cf22b758520776e903699de80555fa2e69206edaf8415dad037018f8c169966fb48c1d402118a6e32509d31
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild
new file mode 100644
index 000000000000..a3c48dc046ab
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtnetwork-${PV}
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qml? (
+		~dev-qt/qtdeclarative-${PV}
+		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		~dev-qt/qtopengl-${PV}
+		~dev-qt/qtwidgets-${PV}[gles2=]
+	)
+"
+DEPEND="${RDEPEND}
+	gstreamer? ( x11-proto/videoproto )
+"
+
+src_prepare() {
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
+
+	qt_use_disable_mod qml quick \
+		src/src.pro \
+		src/plugins/plugins.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/gsttools/gsttools.pro \
+		src/plugins/gstreamer/common.pri
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index a8f15edf89ff..255f500c3618 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
 DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtnetwork-5.7.1.ebuild 1168 BLAKE2B 09b253aa055853e7a88ee0bf57a0a97b6cc7cbfa2b55f30a751c819a7be8b539f68aebe44e45bb3a85c03ebc9cc569bd0f4ecd45928da057e4e0b01223d16e0c SHA512 0d7d306fbc0dd47d697709e738a7f65f478d1fe2213aae5e5054151aedb1c2e8b0f1de2a40b1f19087d57cc98b84418b8e9df6f491af31742ab637f9ce9b53fe
 EBUILD qtnetwork-5.9.3.ebuild 1174 BLAKE2B ed1b4997679c2954ed321965304b71f7358786ea676d7cdccddef4ecdc63dda6481f834034580258778f1bf9ab2b55e639739306390e1029ade04dc79ff6457f SHA512 9180653e11c99762a603e601475a8bb8acd343a7e8183f9c3e0909cec04f82495d34daa201a2d14de05a88ce64aa9a5d56b57469a6bd7a72a4ed125bef9c46df
+EBUILD qtnetwork-5.9.4.ebuild 1215 BLAKE2B 97f34d3ec1b3c4c7b41763bc9d5c8d22fd57b26acf323a92b5bba22120bc7d593e206a9b8c8ca778ea11ab97b65b79b75d4cff3322d52da93d7c532f389c2ee7 SHA512 8fde1bbda8c9d705695f7f5768c92de5d4328ba15e362f596ae87733a92d13ef6434ad500a84902560c37ddfa93240c28ee728f6fe6059440c33e163b555c478
 MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
new file mode 100644
index 000000000000..3cb593402d37
--- /dev/null
+++ b/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Network abstraction library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="bindist connman libproxy networkmanager +ssl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	>=sys-libs/zlib-1.2.5
+	connman? ( ~dev-qt/qtdbus-${PV} )
+	libproxy? ( net-libs/libproxy )
+	networkmanager? ( ~dev-qt/qtdbus-${PV} )
+	ssl? ( dev-libs/openssl:0=[bindist=] )
+"
+RDEPEND="${DEPEND}
+	connman? ( net-misc/connman )
+	networkmanager? ( net-misc/networkmanager )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/network
+	src/plugins/bearer/generic
+)
+
+QT5_GENTOO_CONFIG=(
+	libproxy
+	ssl::SSL
+	ssl::OPENSSL
+	ssl:openssl-linked:LINKED_OPENSSL
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:network
+)
+
+pkg_setup() {
+	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
+	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
+}
+
+src_configure() {
+	local myconf=(
+		$(use connman || use networkmanager && echo -dbus-linked)
+		$(qt_use libproxy)
+		$(usex ssl -openssl-linked '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index 634e6567301f..f690e3996526 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,3 +1,5 @@
 DIST qtnetworkauth-opensource-src-5.9.3.tar.xz 112280 BLAKE2B 153f41bdeaff72c7d00aaaf4b10dfa0461a1c42e2c935ae2a266e989fb11094f665944fa355251fd741d7b2e225bf904cfd286a4e10fb2c12a8e44533b6bca90 SHA512 cd884160895746a8f3cf75167559f5aceb8f87fda09823352c09c83209aef40b212589e66e76d74c736573b23e0ec7e0741d3e90f8f83cbb64c697a76beaf5eb
+DIST qtnetworkauth-opensource-src-5.9.4.tar.xz 112244 BLAKE2B 9e75f8f11062b064b98421d9b9ed73cc18351eec788398922b22fa5b528f34baf2290c0595e2cdcad6afe6a0061ddbf37d9bbd2ec977a5ba713c692a125fca6d SHA512 a38e0cd3619ec25b2f7c749522b42f72bb024ef2415449349f7cdceaa9cdf5905c78c6b82bb7ce58b0c8f00ff883d2d79d11e12a9bfead014b553d431190abb2
 EBUILD qtnetworkauth-5.9.3.ebuild 376 BLAKE2B d56d0ce3ca4f3f189189c6b49fb0254d6eb275e2d49c6cfefa9e2392e3ba02098b70b977ecff82f8fa8b92225ff4056eb00c2da14d50a4b492a62d5d3464b7c6 SHA512 b5ec9ac2a341536c3a260d3a705e6f216b38fe5ea2101a18058db9c61b6d77882bbd6f8a0890d4e1c5f57feb15963959816a41ba69a19ed5753112882c186b50
+EBUILD qtnetworkauth-5.9.4.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.9.4.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.9.4.ebuild
new file mode 100644
index 000000000000..a1e6dc628e9d
--- /dev/null
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.9.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Network authorization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 1a43cd504b39..c5859ba3075e 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,7 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
 DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtopengl-4.8.7.ebuild 1100 BLAKE2B 38f986aed1ac6fc40b6037cb17fece5ab7d759a2f79d0d28ba18e3ac09691673ce0dab0942301d06bcb11675c96b48cde6435c80a9e22f865884f5b5559e1558 SHA512 d099ac28dc473121906eae72560d5a100a8a085a110d82ebeb87ca8e9109dcd62c5cb4dae107b0adf15d2ee34b0a13de095de00096a3dc0bfc7f535d97bbaf01
 EBUILD qtopengl-5.7.1.ebuild 631 BLAKE2B f2893aaee38cd132a7ce775da1ca7c5dce8eb6b1a8af8a68337d363723063cc4f761f98b8698e631f42e9a2d4a23080e841504de3a2e7ba92004d95614394e2f SHA512 d99c51bd8dcae9977a0e209893afeda6f2355a550960fbf4ba86afffa5c12a3dc7017b4a7b947eee259bc631ce5e1eafa285cc131923afcfd9a2e8fa3652b21e
 EBUILD qtopengl-5.9.3.ebuild 636 BLAKE2B 77e4fa58f7d3b7ef4de3d5be69ab7465d1b429570fab2cbad3bd4b714a5646a177a28459b911df2b442dd23341b5deed65facab6e941ebb3b37c3aac116595ad SHA512 109c0c3f5b8bf7719c1d09e8c83f8c47d6e8d76edce60f0b2bab6d66e1adbd9b182a63569cc58556488206a977603a16c3b7f697913e492859fa72a42efc9383
+EBUILD qtopengl-5.9.4.ebuild 636 BLAKE2B 11db1282edcd952d3f0bd7c3dd381e9b9b685dcd860d10bc71c5d816f605fc8cd00dc022e4df86cb8032c51aeb95769349db2008dac0a0c277f7601d30d773dc SHA512 ff1bcb023f0f7a2199ecd71c5e479750075726aaaa3be693e0def28ccb8d0f9ba28e92a79e194a52c08a4a2f0cf9f79b55b7219e61a0f9f1618f6d1897ca58d6
 MISC metadata.xml 849 BLAKE2B 626ede10341fed23cd36a62710da3423c49fa4421d4f8dd883df3c1a0d157f4a4d343632763c542093566a8967050bb4a3cccac015f4aedba25471a4e03a591a SHA512 98644de5d50d3392db4099551755340012a29ef9ae129038eb64ff1aca49f2de34442d7fd8e4f6c457366148a7d9288843f7ea023d0759a71aadab3a419aad41
diff --git a/dev-qt/qtopengl/qtopengl-5.9.4.ebuild b/dev-qt/qtopengl/qtopengl-5.9.4.ebuild
new file mode 100644
index 000000000000..be8a1bf7bed0
--- /dev/null
+++ b/dev-qt/qtopengl/qtopengl-5.9.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="gles2"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
+	virtual/opengl
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/opengl
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2 es2 desktop)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index d93947e00fbb..fb7fb1bc57f9 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
 DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qtpaths-5.7.1.ebuild 404 BLAKE2B 0f596a191ca7bd305b49b454d7a21b450cb0d75ad7ff0785c16abc0757fd78ae65ad67d1d964bc562aa321c8f1c045d4ceb1863032cce41ba48536c35cb88bf1 SHA512 e9e081e62b191f26395b65fafed9c98a5ab2e173985dafc610cbc1f86297e589188c803761f767d37f6a0ec23eb65bc8250bf8fe896d33d156219477e780f9a6
 EBUILD qtpaths-5.9.3.ebuild 409 BLAKE2B ef5a8e634ae05b47a4455ba8b9b1fad6a0903dd1690b22600b9ec4326bfe06f0f6d1e09235794cc061b0dc89f8d286cf630cb0a0ef03b3fcf2e5d5f1894051e4 SHA512 edbc1d1beaf8c0f6cc4855be89b20f8df561fe6e0c5187b155f3aceb0bd58fa0b4bccf8574ccf8c36b25adb7c3394c6a04cbf2a126ddd02395b39e301cc86ff3
+EBUILD qtpaths-5.9.4.ebuild 409 BLAKE2B 820f78dbae4037a591f1488a58215769ea69fb16c585df730f80e7ae33dbf599a42ab36cc645e88ec4dd704a470918ff3825aa17a380e5f7c534dda3b46e94bf SHA512 14ebdcb7dfc35806c5fc91eb01bfb9bb01134ff4003e43ec5e5b5aeaa292942be461893e0e792bbac90a9de612f0cf5b4680b7c925ae51e21f55ace890eb8740
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.9.4.ebuild b/dev-qt/qtpaths/qtpaths-5.9.4.ebuild
new file mode 100644
index 000000000000..bc5bdee2884b
--- /dev/null
+++ b/dev-qt/qtpaths/qtpaths-5.9.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Command line client to QStandardPaths"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtpaths
+)
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index 28b99a35c839..d2bc55d03bbf 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
 DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qtplugininfo-5.7.1.ebuild 373 BLAKE2B 9ca1694a0fe8c2221ade025b3955439cc4d34baeed01472c8107baf22715ce5aaa89b9b0b75d79764f3cee6e2a1ca988d6b94db0fadcb9aea3d1a133ee9a65c8 SHA512 8825a6140078e4caad4ba8187c06f6840038b027c7cb989532f5a01c4008119d4c8f8285df269056d33e4111f82bdf024f04657c46d07c595fc48f49d0c18309
 EBUILD qtplugininfo-5.9.3.ebuild 373 BLAKE2B f3223f199c7653d35135208afb7c2b910abe01bbdc5bae343d30bef18055f86ba34f47ca7d6549c826111be6a1ac345549bbf7ab59d9229ecbcdc9d996995136 SHA512 af4bae833123b5d2e2e319907be4f1616e158ff949f25dc45a251460946428b04a4fe8a186d0a43163779c44b39f9f0ca412a308a340d8e783dc94f0e465d933
+EBUILD qtplugininfo-5.9.4.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.9.4.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.9.4.ebuild
new file mode 100644
index 000000000000..43ae95d1cf5b
--- /dev/null
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.9.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 7eeef863648a..755c3dc5ff41 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,5 +1,7 @@
 DIST qtlocation-opensource-src-5.7.1.tar.xz 3194112 BLAKE2B b5ac3bed420507c4a03b382c23d02cf0638c64e4921872930ec22394c3eaef7b7abaf7830d40c3aa2c9888e91724d5795b17a6d2a37f2f21b97285ef7d0dfd69 SHA512 a3e0318ad348edd6d9cb4762d4fc6230a47984fcf526f55cc2c9bc00e2e70fdb1380866ec8906e3f58669c62464f8747c948d85107a2d30be1e98da27c7739d4
 DIST qtlocation-opensource-src-5.9.3.tar.xz 5374552 BLAKE2B d8f7449daf02d98b9ad3ccc93a547f6d0cbe25f4d17637f1efada9cf6d00e84a082845c16a488a6653570b33a2c3be9c8f2dfc6881cba5a10e35e1a96f23893a SHA512 11bf2c6000fc2db92dc857cc6f271e7ff19f500fde14520678e9af57fac41debde4c4b937dbab4fe1f7d5744e1bd0fc25ea32fceecf97d32cecdbbc8e2105373
+DIST qtlocation-opensource-src-5.9.4.tar.xz 5405252 BLAKE2B 6474251b21baaac6182a0197a7736dcae86d0735e8be499c9bfefa639b3a45c750fa9bfef766849fbf6d7c5db518e5712e0862463e98168e2a3121582966d834 SHA512 a97de23a554f709a39ac8517de85c9beb7e1a8330ba3996593aeb3d64d1c5b8d8b08b0c94df435dcbb4ba5807e262ac6f87ec9620694805e0261a4b2ee8456cb
 EBUILD qtpositioning-5.7.1.ebuild 738 BLAKE2B 630a0eb0edc9b54fe80b3860578a497d9be346e55c0cdbdc36c6ed76fbaaa93e48f2cbe4580926787aa3ec19962c646d49e2f17df5872696ef6c1059adfd1f63 SHA512 1dd5a1827a28584cf35ef6f7d38cd6adce0602587bf618bd4e1f927868f08d3557d02d4f70910cb7f68c16a8e4bd53547b2bed4dc24194290d3a457668ddda32
 EBUILD qtpositioning-5.9.3.ebuild 810 BLAKE2B dde933259a8c22bf5fab9b527aefb4025e450785904ccd236616e10067a97e473d0a735b5049ce0cbe676c34481ee30ec0cba3a35fd4927dfcc3e50287321d40 SHA512 f5fa845f12bd35df1329f76fef2b78cc9196f18f7d6421e3fb5717dd2438120193e628772f7db30f82548b87674f547a106435ede85acf06d45b55509ede3aca
+EBUILD qtpositioning-5.9.4.ebuild 810 BLAKE2B 86651857bcf1c8fe233d659b49c0d0b2fb85864b2177523df59b6495475eba2a7d78ccab5d73654131e50930425693bbdcd3afe1b4a7104c5a8d3162c2245f7b SHA512 acb350332bc1eac288607d78a287cc64a562e0e984cea7e9df2becd41f7f7e6b5f19288d3ede58354c48c64d0776a734fb2511635a6a47b3667303dc5c68fe39
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.9.4.ebuild b/dev-qt/qtpositioning/qtpositioning-5.9.4.ebuild
new file mode 100644
index 000000000000..2af4b954c373
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-5.9.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtlocation"
+inherit qt5-build
+
+DESCRIPTION="Physical position determination library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="geoclue qml"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	geoclue? ( ~dev-qt/qtdbus-${PV} )
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+DEPEND="${RDEPEND}"
+PDEPEND="
+	geoclue? ( app-misc/geoclue:0 )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/3rdparty/clipper
+	src/3rdparty/poly2tri
+	src/3rdparty/clip2tri
+	src/positioning
+	src/plugins/position/positionpoll
+)
+
+pkg_setup() {
+	use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
+	use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
+}
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index ed002ba6e3b4..61cc0ae8b5df 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
 DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtprintsupport-5.7.1.ebuild 756 BLAKE2B 67dd32b9d0cc05c81f076a3547a69143c222b60970950d8d9b615ea83f290c789a20b9bf26b1975895bee71b7dc522f96a6722ab5bdd5b31357747a453d9cf02 SHA512 ec05254864dc55d52b3a773b019d37341f136c607ace697873926abeba01b08b9871e0ef5867bdde5a474c8cf4ad0728cdc89e02ff0de33c71700f4fb0c69561
 EBUILD qtprintsupport-5.9.3.ebuild 761 BLAKE2B 5cf9df201c7445222c7df0252f3b32d530b823c6cf4f0d1f6fe8aa8781c99f2388d18efd26a9aba01b07453994b204f0d66b4a4c452c925a89e2602388f9dd63 SHA512 1dd17adb85e348a45451d11b896960643592ceae9824d37c97fea7ae274ad80fdf0e8f45885d7df7494f1ecad89daff52a61ed14c81d8e05d5bc9a9edcc1a061
+EBUILD qtprintsupport-5.9.4.ebuild 761 BLAKE2B f8b41d4099a64fd0e30314a1e7174ea55cfb53003426c79c8a91550ddc4ab6535c943b58e8d8b8764ce70cf57a6b5d9ace881f3f56fe40080085945896dba6d6 SHA512 1844eeef0ac7d35e75f7d35659a53c8458066fdca34f34e4763ba7d41aedb128b77671b95c11e2913b24ba19566833d33edb139daabcf256d10a88d10bfeb6d9
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.9.4.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.9.4.ebuild
new file mode 100644
index 000000000000..824f3d0853ac
--- /dev/null
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.9.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Printing support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="cups gles2"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
+	cups? ( >=net-print/cups-1.4 )
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/printsupport
+	src/plugins/printsupport
+)
+
+QT5_GENTOO_CONFIG=(
+	cups
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use cups)
+		-opengl $(usex gles2 es2 desktop)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 66cad6fb34ae..afd05a5a88f8 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,7 @@
 DIST qtquickcontrols-opensource-src-5.7.1.tar.xz 5943024 BLAKE2B d30320a19f58fe1c9ceec4be7f00a7aa1eb087b1a062169442fd6d97903fbfb428a57ef9632b23d7a5d202c4384c223903cca5bdca13c21762e28e30d608a198 SHA512 7f5d3a2fcb1da3ba5299f57935156e34dd61d019b29892794927148c7bda99e8e298522f1a7d807f2c2b9746efcc9418a9f89c6322257749036b046e03471368
 DIST qtquickcontrols-opensource-src-5.9.3.tar.xz 5946216 BLAKE2B a0c5aefa3f5cf8bb4e6dd8a84551a8b42d99f0a7f4e745cfb0052698af8772f95692679e7471a4c1dfb1dd6b0647755122caf0658f61ec5fd0e1e9eaa6e3970b SHA512 dc57c1960e598b81190924e35380bbb14e6696d72bdfa1db3ecca0715f930a53ae61daa7884f4c56af2b6f5896ee3b4b409cdae6192e82e6fa69d49a08b1db06
+DIST qtquickcontrols-opensource-src-5.9.4.tar.xz 5945756 BLAKE2B 9b22cbed8e92a9264a67777cd18eee2f8b20a9f2360ea376948563933852015b9b44f9c94410c73f09d2f7958b61228ae3634a6c2e0ad5de7e92249f26196461 SHA512 62f7578fa5253e85b8cb04fec295e1044a6b5946e4041e758f788643aa3336c9c48300dafbd5ab21b0e4b74e184344ad62a9d06f3bcb7466fbea79b0e165070d
 EBUILD qtquickcontrols-5.7.1.ebuild 746 BLAKE2B 7dc043cf9716224e6c868f129987537a3c297788397d563e28e961e90a9e9a3858525afc0d09ed2d613f7f5dac81169cbe0c1ae1e7704db40897fe8f18e27441 SHA512 a178ab0c0c0b963af3be4cf32fc12573a452c8f10d3ef533606c4809689bc617823c231371e2cdff4d42e204d2d4c75d6e985cc1c23ad2dd838145f9ec735b47
 EBUILD qtquickcontrols-5.9.3.ebuild 751 BLAKE2B 5c45e55586cdfd44794fc5ac73070d40a8badb8ce22ba1c8f8587aa796514c7392d005ce8c023376d89c2e53e46ee664d2f1e804f024896b49d4a0d15cfd69fe SHA512 8cf039f5fd036f1c9a90b284aecaddbc4b9c53699d47b07d870e73be761ba23f36ba26398777cac9d0423e09fbeee1f7bd902faae012cf6c68157a59dda4e029
+EBUILD qtquickcontrols-5.9.4.ebuild 751 BLAKE2B ffe5e136301939ea58a170a7382281ba2efe195963e2b0af6c04d6e156e399c108424a606d5fefc7b3cad952f366bcf9dc473fae32bd2448e1569c8ddc1c0077 SHA512 9ad5ed5880f169fbaaa028349a8065e393ab7deaf37e1435b0d5fc76b51049709977436f4ba88c38d1e8e66284881c57bd9e9ce2a942894b4940316a7a2f4026
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.9.4.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.4.ebuild
new file mode 100644
index 000000000000..e0dc94116163
--- /dev/null
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="+widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/controls/Private/private.pri \
+		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
+		tests/auto/controls/controls.pro \
+		tests/auto/testplugin/testplugin.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 5d3c249212b0..533d3d258882 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,5 +1,7 @@
 DIST qtquickcontrols2-opensource-src-5.7.1.tar.xz 2212812 BLAKE2B 2af8643f254aeacc101546e05136ba7e40fbb2602eebe7ce03a0f7d263f26d03c47533d79c7da4cb789c74399f0aa890cafcf6a5c2d37d340300935c868458d5 SHA512 24b142f60f3dbc52084906249e261ea8b788135a3dc2e45bb3fc885fe14f9281178025433b28e227891070adff3fe4b64c8a1f83ac4c9bde7f4a6048ea44370e
 DIST qtquickcontrols2-opensource-src-5.9.3.tar.xz 4123332 BLAKE2B 624b0ad282dbdd18c73466637ad3897b83209d76460bc72e3cf572bae6345f2ccf0ee8ef5ec0cb0cec864ac58f3e19346355d63cf2ea57da7e36ccf20dc5394d SHA512 34bec1d3c68eb86ff078fded6d19f463ee78f4929adae54beb2a1c0b1dc3f5b1a7e73210ac05e3a7e3391919c37892dde4aff88cf20e2fb148cb2a03401856ee
+DIST qtquickcontrols2-opensource-src-5.9.4.tar.xz 4153488 BLAKE2B 39fab418b0875fd080228e8dc4103884d862924b2ab12d630303eae366294ec8c97b744db58aee1b00bc923d9abda1db4f7d73931699f3961cc2a28eac2e2e84 SHA512 17704cfd14dbc14d2971b82a81786bd7a5cfdd4e6ae6bc0c5b26c6a6a36d8391ba1ac9969cc5614c8d0fff8ed3b238ef57a481927f82fda509023838d3692762
 EBUILD qtquickcontrols2-5.7.1.ebuild 433 BLAKE2B 489ff65898823f54b6c14da03c43c599ea0cde6b6ef95d66a646e6b0d6cdae0d5374ccff1b70c221bf7bceb41740197ddc09bae3fa2cc3fd5fbcfec7170b4f3c SHA512 a9a3396d6b63faee06d93c3596c68756b21dae17f6ff2c2725f28f33c87d3bef29ed2a8335f627f30a660530572d09b36f96a6a1e6828952a0112be87e12e70b
 EBUILD qtquickcontrols2-5.9.3.ebuild 598 BLAKE2B e1bac498d59738c3cb2b30cfb458609e489a391e639643f1acc9707cfd086461db859b94284d137937d167e80fdda939fef1cc0891b4628c356e3d26d14c7317 SHA512 e5235edebdd976b707ab9b7a02191caefbc4df5612c03586d4c6787b528c9a82494c4d1afdfa1a8db37f20cfe3afe83a9eafac2e67d6980ab71bd2bca4cd34b9
+EBUILD qtquickcontrols2-5.9.4.ebuild 598 BLAKE2B 25ce54b376c5cc0b2764d708eb5f8c4f7d9799df29ee64565c7a93032916b4cc3062e2327ed468c35fe686112c32ad79089a68da736feb918d4a23c6ce67f983 SHA512 f50c64059e38db572cfec45fbf372c7038a08e8d2089e7a040652cdedd5c6e299962e3e2f878dacb992da2485edf5cdaf575c9ad34c8293b98a8f6c276cee035
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.4.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.4.ebuild
new file mode 100644
index 000000000000..120bd5c224c8
--- /dev/null
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}
+	~dev-qt/qtgraphicaleffects-${PV}
+"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/imports/platform/platform.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 3a4be6060c42..e7a7a153927d 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -2,7 +2,9 @@ AUX 4.8.6-javascriptcore-x32.patch 1826 BLAKE2B 2a695f9c563675e0d1a36c9edda8b01d
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtscript-opensource-src-5.7.1.tar.xz 2608180 BLAKE2B ac9f51c9bd67f1f2412d8c8fccb630ae3f6fcefc71c0c9bafee7e2e16f75997673c55960ddc26f8a11be646d78514802d4ba71f5b0d7d9559a1e5a894237a04a SHA512 6bde4add16745475d42c0fda0d3451a77717b14dca12b40a4e3cebc9e2b6edb04da23ebf9af46010135066524dd8ea0453a07420cf42228fd7ed5249b633a95c
 DIST qtscript-opensource-src-5.9.3.tar.xz 2612056 BLAKE2B 54cc954038899cccff54b806363fb778ff90c3f1d599adaf2309237b1554fa615d5660c21a51bb84bbb94a9fd72c310bb9f187de31b6ce437eee71cd91735200 SHA512 a1a320780dbb83e8c5889c528648cd5cace79b29561902474f03e2dfeeef4ab451ac101fecff19130d8b55809f8e457b9198608153a91deed039f529d21a3006
+DIST qtscript-opensource-src-5.9.4.tar.xz 2612372 BLAKE2B 8213e2b70e23dfa6e42ffd0aaa1818a4794670de24fa5b30cdf4c7bd17f1a438d9d6a8bf9c03f2995a60b6e3ad6d57bf0273c6e1027ed3d0b77fc2987d285603 SHA512 e0c49e1286c4b1de6d197c42d8e4bcd82a5ea07e8c89f6f222fa62579b5d466336a5baa50372e5a9b514bd8be098e80f3793123cae09d7a923c4d1466b0e13c9
 EBUILD qtscript-4.8.7.ebuild 1072 BLAKE2B eb4d2995271b4c1b3b083df9b9b657b49a6aebc66bdceddf78269590db9ae47f99a72112f6d2c2de9cd737cabffa8679eaa6545af5c509a58b5c7a962d2a5adf SHA512 c3b6a2933cbf054228051ae4eddc50940915a269aa5130dccdb9bbfc895678632cbdb3935f061565eed532faa48aa661c194549b62fb1c83c11057512afad8e5
 EBUILD qtscript-5.7.1.ebuild 664 BLAKE2B eb6a292ee6724d823d7f8dc1bd33726dfc1fb5b54fc7200a098ab5800fe70debbabfcffaa8487ac9d7efdc9d40672dc55ffddd3c0f375701361afb19242b95cd SHA512 d068ca8ac446cfef1c8b6e4421b243f2f0e4476baa2003ef1487b46a1989284ddcd2bb806d381e2c87de49de094fdec750699cbf4138c7d0f44fb2043b77df49
 EBUILD qtscript-5.9.3.ebuild 674 BLAKE2B 7ed0dc76604a3c06114d900fe5df1625d5dc5fffc821325efb7d5f0c7aef3a78577e289b31ebc70a326edf83316c0a2293d99d27896c13098b8ca173d751e20b SHA512 a183c06e6c4268195d2100fc404a941b559c7b6e6154d2ec36d7b391a59135563c29d96f159e14c6d334cdbc7ce170c475e9259fb6ad033b317ced1748bee101
+EBUILD qtscript-5.9.4.ebuild 674 BLAKE2B c774a7a901f9c798132e3f049bb86ae9fb4680c7a2d7da0d65079fc7918ef0360b80cd3fa21ecee0f53889641da7a5631820ad1c83cf975ba704a7732979c618 SHA512 d0483167a368b96184f47d0936f442cf6197115a62bf2051ae680712746c1e9184c1d6b231cc506e2a5b2847b9087f40d0f58d8976dcb7cd23d000437d1c4edb
 MISC metadata.xml 714 BLAKE2B ad5f2175907ab5167fa16d75c1c538e4e66fcfb96d4a2dd2d19d92ccc39fc3283dc7b67505636834ea772727e5e50aaefc8468b9ecdc448fff33e6806c93d805 SHA512 8324b4dc7a26ce06a5c8af58768e337f1e96a2077b65f5996a4af535a07ac3a13c05af2fb0c89796335ea106eb82d0857dc20cb9d4c8131907313557a0319b6e
diff --git a/dev-qt/qtscript/qtscript-5.9.4.ebuild b/dev-qt/qtscript/qtscript-5.9.4.ebuild
new file mode 100644
index 000000000000..c71d7a496c6f
--- /dev/null
+++ b/dev-qt/qtscript/qtscript-5.9.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="+jit scripttools"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	scripttools? (
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtwidgets-${PV}
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod scripttools widgets \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index dc567897e6ea..70af95746ec6 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,5 +1,7 @@
 DIST qtscxml-opensource-src-5.7.1.tar.xz 346948 BLAKE2B 58dde6373c5901abcc73906085ab7896e6717094dcf2dc6d1aff0770a5f2a64b9bc4c21abcaf0531ef16a2576d188222a174c39759027d4ffb7eacb5440aa3dc SHA512 f5e2d6882a36dc08470502ede82862f4cd95f21b5b354e20ef5a2f9b458dbfdd35c1629a89217606aea5aead1d76d03c80e76387e1ee202bf73fe5c2022f1bb7
 DIST qtscxml-opensource-src-5.9.3.tar.xz 414128 BLAKE2B 28f945f53827b9adae09a1582745c851b41c784b09ac1f388bfadd3fe7d844635da00503066918238629884a6ba5e0eeb01acc5a3d5c0d65b52e505808e8c6ff SHA512 da5fb6266cd0cacaa3b815c17e1d7a356206b4a8ed10507584927231c1a84b032ae88a3edaac897c6e01b14b38cb83fccc4c81dd94396b9d967d9b833f4732c0
+DIST qtscxml-opensource-src-5.9.4.tar.xz 414280 BLAKE2B 6fcea56794febf65b7e21b79893e9c3a849278ad6d4ad24a8f8e272ec101fdee72fe29d21bd99b1ba4d977e52dd3acc026660ce6d5a6ecc684590a8d190615b7 SHA512 e000411b82dfef08fbd5fce601530548a9b5959a4980309434572ec3475e6bc9cdf870cb82bfd5208b533d66a7e46dddf52f5ceaedaf3f0d438c4a4c8260c9b6
 EBUILD qtscxml-5.7.1.ebuild 372 BLAKE2B fdef97048759cb3b128867a7d5cf5b8f8dbcbfc543693ad0045af78c68a0254b9f8424c1d758188c325596cbae9f0c5a097d54925182fdad396ccb8d37a30ca8 SHA512 eb5ba8623820f82531258a9b76321f50680779e29a518ca2e6973bdef8d27b50e3ad250f2b43460454123664c9bd63a072fc679dad97caf521134ea412cfdbb3
 EBUILD qtscxml-5.9.3.ebuild 374 BLAKE2B 0e5738f42adb88ea047163ae8c6adf42b0ac417cdab8bd6d7a2daaf9ace1414b7a24f65e1029da0b9890dbf76a2414d5d62515145840f0ab54ad7637e6ad677e SHA512 f91c79dd8fec8355db089c7b91f5a0b1244f3180f9ac0db1a7d1d6c7ea0e0b2b2aeae7cfbf61054487c75fdaf05953d10e1fdffff9c7914db7aa8a53b7c75ac5
+EBUILD qtscxml-5.9.4.ebuild 374 BLAKE2B f8297445522e981b840f4aee9e954bdc1f77e10a5bb7a8731f01539d2bbeeb1f7564c5a8df64f5170e2a7221191cc00bae435dd78f51fc8187de474840804b7b SHA512 55bc53954466df3f19a7a1378736538a8156df60f838f9cc783bc833cb91fab8339aea34d344327723efc3a60270a6c2656ca2f7e32f15f090292bdc05596ce6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/qtscxml-5.9.4.ebuild b/dev-qt/qtscxml/qtscxml-5.9.4.ebuild
new file mode 100644
index 000000000000..59b06ef21029
--- /dev/null
+++ b/dev-qt/qtscxml/qtscxml-5.9.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index ff922aeb7a95..bdaa09cad425 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,5 +1,7 @@
 DIST qtsensors-opensource-src-5.7.1.tar.xz 1987144 BLAKE2B 324af53f8875c406f60d1316fb87dbdf5075099c4c86ed8d9dfe25c1074f51e41f9fd86d8d1c3d73c319cc5917bd22fa86aff63e98dadb453f28145b681568b7 SHA512 5dff126e59f0bae4e5a8b1d3b971dc1c7318169f82dcb05907bad5dd460f2edadb317ffd111047af5a2d1db3a2c3adc204e5f8ec2b792c912a8e7e987f596914
 DIST qtsensors-opensource-src-5.9.3.tar.xz 1994812 BLAKE2B 81defcf70941d8d6f93d522f572300e0145cc2d5bac25a9654c8821d9005a1f528fc2c544651159395b039886aa8fdfde0a2ee0d5c7aafbaf64cd4260e10f747 SHA512 848184de2c914c0240f3ecffe96ab267fb24693d16a55c1c757d83af9f282bc6f6c5cd762cb42fc389bc02e301c21a6da7b178260f534db35f0abe277f638ea9
+DIST qtsensors-opensource-src-5.9.4.tar.xz 1994992 BLAKE2B a7464ea11b7e74cf491a4629058f142f9e85d57e08e8b7fd1708cfe47951d0345445f853c89f8f8d0e4700eaa452e0c1ea00f4ebe12eda643fe512afc7dd6969 SHA512 10b0d4595ced97888c28ddb36626657250ed839004ee61cbb244326529d25c181acbad774e7d40733d9ac48485320e72e52bf52f10f2a18089a6a4ce4fa3097a
 EBUILD qtsensors-5.7.1.ebuild 488 BLAKE2B 6f4134731d4c9eef7694b52cd5913aa21dad9b18d3028241596400a5a81ab293f9595034acdb95dadbc779bbea776c5ef9dfde180d291375e3a62d929815b12c SHA512 d944b6c4be0bf4703941580b87a19aa737cadb8960fd59f1426bb4e51045cf0cf138cff7b028bcac139fc7652ce38997a4aa90cc71d880b08069e7ed7b14f80c
 EBUILD qtsensors-5.9.3.ebuild 532 BLAKE2B 1263381693e188750fd406a72320738aa492a9f542a47c1aeda5f2ef4f92589fd4820fd920b496646e8ab896543f88f3a81ce9bdd99f1a7fb3ff61e4db6d2d47 SHA512 71e96030b39faa323fddc237c891840a99f0a4a7cdac68768adea74de518b363e05b49b0fa74544488aa86265a5832d9d4c9225aa24f367b550c1da749d67db9
+EBUILD qtsensors-5.9.4.ebuild 532 BLAKE2B 21e26e655c125242a339bb2b035bd7aa0a2ff71471eac52905c460c8836a038c4380605eefe5bfb5d56816d09a9c392a5335496e96c63ef34eab93100fd49ecf SHA512 6eed64f50257523e54a1ab7605e29627ebd60a37d599c0b8616c7494ddb72f08b7fa702620e4ccda71891eabf86a268f7197448981c507e07f4e4ad9112fc5fe
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.9.4.ebuild b/dev-qt/qtsensors/qtsensors-5.9.4.ebuild
new file mode 100644
index 000000000000..28845fe6f0fa
--- /dev/null
+++ b/dev-qt/qtsensors/qtsensors-5.9.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Hardware sensor access library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+# TODO: simulator
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index 7129edef8350..478681f9e8d0 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,3 +1,5 @@
 DIST qtserialbus-opensource-src-5.9.3.tar.xz 279060 BLAKE2B a5aef9773b31e82c654eb23d0be578ed95126b4c38ccd1c3cae70cdbdbf4a0880988c760df470466f8e1dadc1d7dca78a85e6b1053439acf2ec1c095fe521880 SHA512 d50bbd96896dba7f79c1f4546438ec33419631aacc0f91e23ce7a5e8e2aaff0499caca29cbc92f31b6af1d9ac60c2e4cb52a304142d9655e0aac0214ed7df78b
+DIST qtserialbus-opensource-src-5.9.4.tar.xz 279352 BLAKE2B 145154d86de8d968c26103c7eab21f2928e8666123c0d8ab20e9459bd86dbe54e70f4d83ff7f9c6203f078f2ab3ce21cd2d08ed268e0af29b0578d0b08e6dba9 SHA512 d4f09d67edc69b9063be114007eb7200ee043f37bbbad9bbe392249b37ec766bc2d0f5725e9af2df2fd68095ecedf71196ffaac30569bdf5ee2606a8fddc4321
 EBUILD qtserialbus-5.9.3.ebuild 375 BLAKE2B cce5fe2e4d9308f99bbfe2cfa2b256ac0eb11ebb5a8bcab7b5bd4848496114d9e5c57e645333462067bdfb27bce71200255df0d1cda9fe784123a9f84075ff53 SHA512 eaed83c16c24d79ef34c3b0514040a84cf6e2dd4521ddc129915dee733f6b9da50553a3357330c77f1c42fd60a9bae9b55521fbb39958e42b752bd25d486be67
+EBUILD qtserialbus-5.9.4.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialbus/qtserialbus-5.9.4.ebuild b/dev-qt/qtserialbus/qtserialbus-5.9.4.ebuild
new file mode 100644
index 000000000000..c6a1fac19557
--- /dev/null
+++ b/dev-qt/qtserialbus/qtserialbus-5.9.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Support for CAN and other serial buses"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtserialport-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 22fb88aa1f31..18bf9d1821e6 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,5 +1,7 @@
 DIST qtserialport-opensource-src-5.7.1.tar.xz 265616 BLAKE2B 43f3e8bdde334cd0f2a1df0b9aa4dec9033c8de96567e4877637f77163cc64ce8043e6bc99fdfab40f5e28f2c4143b2613dd6268c829f60cc4656cdaa6cf520d SHA512 090015dc2652399bee7c7d30c9f127be695e4c002b18dba1089d4bec555513774a587864989f33ad4059ff7b9b2bf24c387394c03a4024e2640b3642bc89ccbf
 DIST qtserialport-opensource-src-5.9.3.tar.xz 273152 BLAKE2B 4d7e251011e06b556651a51852f55f749b04d3166c52adf88016fe18a45506bb62344b77b2eeaa4e7581ecff79e5e6d1409c449dd2206f6bcc167e75c0550467 SHA512 40ab6e7f0815f0f2c38062858e185d9a04cdd1bb360f677b7370bd902019346223e8bf7ee34079718bbb36b793ef773ecbb8b2eca5f5f5996c77729d7da77aeb
+DIST qtserialport-opensource-src-5.9.4.tar.xz 273252 BLAKE2B dc9a97465ac22521346da8d676ac31f48fbe1a8b1070e7c774e1d4ee8ea1fe713688775d590205e6149cd276427b35e7c503cfe5fb81cc0eb5063656ff92f745 SHA512 8eb6b850440e6e16ab0a9389259b15ccd7bd783755a6964a3d1ca07260821807c7a3e52237b69ed4e0e6333a74046b03c28e92a2e4e34c1140163af287b5f344
 EBUILD qtserialport-5.7.1.ebuild 551 BLAKE2B a2e927ff88dff94421c1d55f9299f2ab7d1645a987316ec33293f10a519f68f3d0c2d136b1484c8f48e3afc0a0141c7b1915ad80fc96d872006035803cc44afd SHA512 97fccd4fcace165cb2f4241f2e8b44f137ef69fe7f02b5178d4812102839bb01dc33212766a25557d1978cf0459b151f8ab7ced897ffa574498c5b8fa19ef34f
 EBUILD qtserialport-5.9.3.ebuild 542 BLAKE2B e22117ebed4deef3a2d6a9abd3c71f11ec0e91841ee94b0937f406d75dc0bb6479393b25bd18cf2a8df092859a8e60afb5aea27efc8c727e15cf90b983499c86 SHA512 d076dbd3cb3b10e54b1cbaf6c897fb9d81cf389fcc4fcce97d769e0c17b30e2e42f40816265c40aaf3c46a2b7585f9b7829f9a00208e34108d930032b8194efb
+EBUILD qtserialport-5.9.4.ebuild 542 BLAKE2B e4294b0bd51fcfd1d6c605e26ca0496121dcd06fba63b8cf8870a0bc2a1e0292766210d0da7fbe38514c2db1245f5baf24c36a913db0165eefa34c3634cf2762 SHA512 724d9d28f4f2f75518685652207385f9a1d40845b744952e3f225ba08f6973cc5b306ac6919474fe02b454b3a85b7f0cd2ecffb43f6420d26f14c3d1246ce44f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.9.4.ebuild b/dev-qt/qtserialport/qtserialport-5.9.4.ebuild
new file mode 100644
index 000000000000..9798eabab40f
--- /dev/null
+++ b/dev-qt/qtserialport/qtserialport-5.9.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Serial port abstraction library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	virtual/libudev:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# make sure we link against libudev
+	sed -i -e 's/:qtConfig(libudev)//' \
+		src/serialport/serialport-lib.pri || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 6f39b74b6886..d41a8785ed90 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,3 +1,5 @@
 DIST qtspeech-opensource-src-5.9.3.tar.xz 80832 BLAKE2B 56a75db8830938517952fa0c92d66db86f09ce1f65c1d5b09e89eccd33cd54d90abc04fea745712cbfe0b898668164611013895a10dd79d3505031546c1a8678 SHA512 faa2c4e8dea22ba64e8dc93ebbce0d7e8775915591a39c2824d0f7c9da40de9df4dbef6e79b9e541773ee917caf3bef0c11ce6df163c0d91711f8f1394f7381e
+DIST qtspeech-opensource-src-5.9.4.tar.xz 80860 BLAKE2B 8556d375edc5bf0e3edd9745cef6bccab3e2457efee1fa4cc3f6d4feb90da3f651135ba9034caac474ef2e9888bbb3a41771d85b4f8a13b16867ba516a42f47b SHA512 6e2913b23c57cb0dd407b09db78fbb9b6b15c721f6d7af65c744d71f8a66f235a1069b1098eb5cd8b35449255ef94af2a96b2c4a1c550fe0e03000e023c393d9
 EBUILD qtspeech-5.9.3.ebuild 427 BLAKE2B e523e43249c52a2da21949642def2d23ee3d030f8d97d187c85dcee31594046f10bbcec324c9afb9de00944e7231d67a2358a97948a46883574af67610138e62 SHA512 69e0714d5426673ab7323fa38cf25edce8b18721db70e0b6242ed2144091e3d51ea8ab958b1ba8225f47b36ede9795901a25b7422919aa5e4ea34fdf0d6e22a5
+EBUILD qtspeech-5.9.4.ebuild 427 BLAKE2B 674217ea6465669714459ef7e20c57e625996a952586c8c07e9f3d9f0dc4314fa11ae1343ca0937051547b10433f1ff8d8db4eb10a2f064b72bb9fdaa96248c7 SHA512 2c8f32cb24dcb60b81e853a380273e41b3def6c23acc77bf87c3ce41db74e8ddda0fb621bab8107f8f780399334cda73bf9ef9b6de1ca1f0724bc99fc4905ea1
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.9.4.ebuild b/dev-qt/qtspeech/qtspeech-5.9.4.ebuild
new file mode 100644
index 000000000000..2954bcf57d74
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-5.9.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Text-to-speech library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# TODO: flite plugin - needs 2.0.0 (not yet in tree)
+IUSE=""
+
+RDEPEND="
+	>=app-accessibility/speech-dispatcher-0.8.7
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 47d1b076766b..3b59b8b48f55 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -2,7 +2,9 @@ AUX qtsql-5.7.1-mariadb.patch 1888 BLAKE2B bd8a93f2b28ac9db84c1da1d294c974f1bed0
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
 DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtsql-4.8.7-r1.ebuild 2261 BLAKE2B 24e39792f5fd56b5d61a7b61dee71f00cae4a45436e74137de29460d89c5c13235811142dfb8f5499eea483890c4c39ff2fd9d86f0ac9e52f05d08499b1ac8ce SHA512 a81056b36b8a081403824b1102883d7d35e181c05bc6b8e56e29c227ec832fe712a1dde8a4178a30bad5454798aa17eaf33890403c15b08b67cb221487b8e4ca
 EBUILD qtsql-5.7.1-r1.ebuild 1467 BLAKE2B 113ce8884c0b442c4fb6ec7c651f4cc25d735ebe115e86647dab0bdfdf73fd2361a9e6c4c74defaf16ca32c627e6de7c4f785bc413d3df3a8c69441e8d8f8831 SHA512 c5512de8111d6546f1c3525e85e9c15602515b704bfacf978bb0025c13b20c9dd791468f10b7fb2f22210d2dff12e7ccdbf834704f2bb37247b37f6c425b155f
 EBUILD qtsql-5.9.3.ebuild 1419 BLAKE2B 468469c3056b9f9b8ccdd3fd51773c13860020584fe27d454aa37a40aaebc7995fe95a05732eccd5772c53b79d860c370b067708665d3b38d517e1dccd4e320d SHA512 5339d5c51acabe4ddd2ab80ddeaf14bf679531026b1603b70d3671967827523b1909b3a6982a21c64df4e16df8d08f010a877ed88bb45d4a56f683b5d879ba43
+EBUILD qtsql-5.9.4.ebuild 1456 BLAKE2B 46ae59edf6e4a1fc333b05151212f3c1f08058567f1a41725d3f71e39d71ae5343ca2b37d7054967dbc42fb27ad5e32aa127df9dce27a4d6a34d101598b2dc62 SHA512 dd030b452b255c0c732d24e0471f1c8f2971d34aab5486bd6ee0fa53d5200ca63c070c98b5335932bfa0467aa1209b3ff549967cf3aaaf78bb4e4fb200d20d3e
 MISC metadata.xml 701 BLAKE2B b9f31dc4bdb158bda952ca941dc3a5f70004800c8874e310a2a9634223dde59e799df9b4f9d424d89870c191fe041ec29ecbab79c1f04be55c786170d921c10e SHA512 c807e5c85d7e4f23f15ef9f95f4bed3e303e25e355a096ee118e4846330948957dc44d16c97d3c687ee30a5895c511e9d1480a39ddf2360f8989d06daf0b91b8
diff --git a/dev-qt/qtsql/qtsql-5.9.4.ebuild b/dev-qt/qtsql/qtsql-5.9.4.ebuild
new file mode 100644
index 000000000000..8b17279a30ee
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.9.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
+
+REQUIRED_USE="
+	|| ( freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/libmysqlclient:= )
+	oci8? ( dev-db/oracle-instantclient-basic )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:sql
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin)
+		$(qt_use oci8     sql-oci    plugin)
+		$(qt_use odbc     sql-odbc   plugin)
+		$(qt_use postgres sql-psql   plugin)
+		$(qt_use sqlite   sql-sqlite plugin)
+		$(usex sqlite -system-sqlite '')
+	)
+
+	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
+	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
+	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
+	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index f16e3c5bcc7b..366620f36722 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,7 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtsvg-opensource-src-5.7.1.tar.xz 1751536 BLAKE2B c883dc94700b9dc442da403dfd5f9d690b98787a8710a24960a9ee65848327ed9741825e126a063c60aa1302879dfea8cd5fcd36860ce30e204eda79dc528849 SHA512 b4ba18a81ddf381f635c608f2ca6f339859b964aedf310fea9b4845d50154b5256759583abe14126e6bb86a9daad8a6e597910ce2036af26ae221b925817e260
 DIST qtsvg-opensource-src-5.9.3.tar.xz 1778224 BLAKE2B 90ea03ee31aaf0971976cf5c64b05a1767f207498bb95d7fbef75189b203a02571e807f0bc81caf0df2f325b5296b4f9826bdfd1264b47fffba33a171d6e9424 SHA512 6612dbac0aed400befa81ce513dd7be133e4d3a1ada77782178aea4b4946730d3059810fb564366c942a26e3b2335679d6470149cedbf6acb00b82a8451a2978
+DIST qtsvg-opensource-src-5.9.4.tar.xz 1778072 BLAKE2B 077ca02c7a43cc5cc6170e0c24ee155e3d190033837494c58804934881361f738709f0aed9d876dada19c48b194624b90a759cf509c9e1fb9c566514a4f5c430 SHA512 242a471ba8b1b3fe45d53e0dbdd2bcba0ffe129f7658fa3608fb0f8ee72bf56244522861c12315eabc401f389031bea2027eb106eec67688f141ea8550b6b2b5
 EBUILD qtsvg-4.8.7.ebuild 1147 BLAKE2B 2c640fadf3d57b7c745be9dd822be6db9a070dd077026197df9eabb9c398ee66a22a9bd9e9223c1ab99e9da6985a33cfdf47cd68c5350abb3614711d48f04226 SHA512 68e74c1c97a630ad57c2e6aeaa7d5a73b90c13eb29e9bf513a7b19b26b990b234e16d77c04231b59f8aa53110551c7b9844aae1f60f0f0bc8b94322911a6f583
 EBUILD qtsvg-5.7.1.ebuild 454 BLAKE2B 81377e33484f58c852798548593f274643c89570f061c50cbe9b76312cbad886436250d3dc703408f204a72cf0fd5ebc0ff2ead25f6596eec34fcbaff6dc33fc SHA512 164521f4c694bac7e803203f1e80c50cb937aabf56a6b2e36ec27f376173328daf621080ec0bb8577cb00720c41ef208ef7c4225193bc667329a3b1c06dfe8bf
 EBUILD qtsvg-5.9.3.ebuild 459 BLAKE2B c53b4a4ee005b34e4636c11aee33665c896433ea8a1d2bf5e8cd6b1e1d84b15e5d253b5a9291ec4053672529e5871f2cfa781b8ee5138c48d66b330d0fddacd6 SHA512 43d4fa342fb5795ada673d1838d97556246f9266beef688c1946b0f7b831fc41c82412f193b9aaab599d3f49ce2b46b3880b5b20941d822f1527065e7081bb67
+EBUILD qtsvg-5.9.4.ebuild 459 BLAKE2B 1fa66560522a28a10356181bf4cf964d9a85640593b06a87c710a6d77995dac0ef48ad6e9ca01a548433413096e6ade5bd62d5e71604f1f644a6515dce693513 SHA512 32b0c4f8eca6ad911ede1b1018cc63019ebf8921ca88906113d37d1bf8ef9e866071407b3f5d61b24c78456fe4d599f61aef40da2bb8c729ff5d3359edc283cd
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qtsvg/qtsvg-5.9.4.ebuild b/dev-qt/qtsvg/qtsvg-5.9.4.ebuild
new file mode 100644
index 000000000000..90c02c0bbca8
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.9.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="SVG rendering library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	>=sys-libs/zlib-1.2.5
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtxml-${PV} )
+"
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 53853f057c82..0cb81ad9ad47 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,7 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
 DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qttest-4.8.7.ebuild 933 BLAKE2B 234731d6bc636f8aafa311de9cfb8a89e3e6bdb5bab4b1fc2fd4b78bdead1eb3fa29df292e9bae5b73cad6b8c364984b6a16e76dff8b4e98621adf9e74333297 SHA512 7d2f377603287d0aff165aac7017622e0b8e4445103696911d6784c108cb4d9f1f04200c1baaf6aaaebb865c5038ce0d393240c91e6da06968c91171d93568e8
 EBUILD qttest-5.7.1.ebuild 491 BLAKE2B 0eba13b68fe2eb637ec8516a2969c59c28959493dd57c62744f4e4d4e1596c75710cd0b4e06560df9232520ead8aa02c4d2fde0a3b362971a27476e3a4da3b4b SHA512 8709179f307e0c8a179fb13d947762807db80fdd81ad4fefd54fc88d95b98fa4efca98e41a6deaca734e99df4e581705e36bbb0d92a0a5c357e01e7efcc878d6
 EBUILD qttest-5.9.3.ebuild 496 BLAKE2B 1b37cb86f5da7e66430e1ac4a09eaad7884d0e57721ea1919db07a0d6ef8ae756415b3bbb79e175691f1dc718ad61815d412fc59ab6a564084fcd77a38c3c0d2 SHA512 9404b0261e85b73b653b6b7a673fcda3b28472682273befe5dd81d2003aa029143ca476b3e274461ecc3c2d3cce3a88482061944800332b8ce100f25d109db5d
+EBUILD qttest-5.9.4.ebuild 537 BLAKE2B 97e78f02587dcf8433d8bea181ab5aec8457fb416b79bde96e2089e8a628e475764c30c80a7cc440a94706fe160e9d611d178d4c837fb18830d231ee10ee0ce6 SHA512 bbb46ba76cc500da9a11420955f6708e2349ae8e05b401cfa2b33423ca1d8d3a05f2facf30a9afebead5e11d8223847efd630b59087e9ba48b58811405464564
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qttest/qttest-5.9.4.ebuild b/dev-qt/qttest/qttest-5.9.4.ebuild
new file mode 100644
index 000000000000..9181b8dd30b3
--- /dev/null
+++ b/dev-qt/qttest/qttest-5.9.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Unit testing library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? (
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtxml-${PV}
+	)
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/testlib
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:testlib
+)
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index babfde838a91..5ba91f4c38f2 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,7 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttranslations-opensource-src-5.7.1.tar.xz 1206116 BLAKE2B 071d703ed32eed88d34318617e00bae96ec0c1a3e75a4880d76a9f952fe5449c2cc9234433234d013e0971696c1f7ae677f14cf5c6a6ecb8df438ef2db1918ea SHA512 8d7705d1fb2569f90bb7fbb9bdfe7ffdbf7a8746ee4da634f66fb7f70c14b91f7257165b6ac041cbe4918b88e6ec344c8e554f1e7339257e7e1b9a06e78ba837
 DIST qttranslations-opensource-src-5.9.3.tar.xz 1414192 BLAKE2B 800a841a6724bcfb81656b5c553c2289e6438294fc1895eb49b07d8019c6ec9ec1b0c1d7cfc2362d1c0535ea44655975af0f5bf27381211e98129638594eb74c SHA512 b8577d33596e6df7a491d40f4c40889ea1d8ccb422e132affc66d78a8e137c5e96754d642fb08e328ba079e675286b875b1806048361c6faaf0c1b13cba4a5c5
+DIST qttranslations-opensource-src-5.9.4.tar.xz 1451972 BLAKE2B f859c764d63673866bc8be88d4e5f9e2956b3bd08a883268a0c9cbca45a7132578a87b98eadf592944864da2d70cbbff0b46a75665faaa72c4f6a723f203cdb6 SHA512 74375ee78e40e8de2349e575306c729d90d80de089f44d4ff57506085c748d5eb5d0699a769d4379f7dd23c48ab88b7e5a8227044ce07d6ae12b0d3ac19450f0
 EBUILD qttranslations-4.8.7.ebuild 773 BLAKE2B cd0ea1b0a67d8d9d8ee6fd5d5bf4c2bd37aa42ab5e7250ade8f4fe689bed011caccecf51dce162b2c445eef3b725ca183a37831e03d5e11d88687e5071c9d597 SHA512 1f833bde8f1dcdbd7838cee55c193738203bf74d0ef55865bfe511e3f5749675d216669af2476530e3b27e3b12ef481e092e7866e6fffafe9d8bfba75d3a52ab
 EBUILD qttranslations-5.7.1.ebuild 362 BLAKE2B 8f10c534af773d6935f5d1918b866eaef3a8234e5d971239e69410c74372455144bf609a6a741b16b44339831272b6f897b562368b8e82e29af79e7d545c6cd6 SHA512 f5e75b59fc5457b491084946657acd1268f1fc64b723f5a91564b4a21606569ab45137913618ab3501a58fefea59793a298c241f0be462279a857ad836ae34e1
 EBUILD qttranslations-5.9.3.ebuild 367 BLAKE2B ac5a5184435433afe0f2bad96c22eb1e4f61464279e19c956ea0ca5b152cac16dbbd825468f893dfbe15bf7f23a2c2761461b49c83d90367f385ec2c0c6ec224 SHA512 5fee74bf66f818592d441d46dc379f391d50097f530e04d9e3bce8288d4f221d56632473e6bfd86974bc342a833206e1c27c15bbda31fee36f6bb829df494415
+EBUILD qttranslations-5.9.4.ebuild 367 BLAKE2B 9e53bc079dabcd203087670b5bae8c8547200715b3a644a28f03c883bb2e19899bf710b5ee372d5b68322337bf889f8d469070167b0c0018397179682fd79389 SHA512 042418121d824f29c2adf7aa19bd1d9241ea556a931aee57be2eea252361424652c4d5a676e8bedbcd21393e8a14fd5f664d18d737654c5fbcb15902f2cffd3b
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.9.4.ebuild b/dev-qt/qttranslations/qttranslations-5.9.4.ebuild
new file mode 100644
index 000000000000..076afba97e21
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-5.9.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Translation files for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/linguist-tools-${PV}
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index acb441af4f0f..fb6c50756ba5 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,5 +1,7 @@
 DIST qtvirtualkeyboard-opensource-src-5.7.1.tar.xz 10014088 BLAKE2B 02f460a58d1dd26bdfff788003857c2a0b9e37cab3001fcf18edf0c9f26a8bbedcd96391300f20a89f3ab5021f977bc7a4cdccb1851ba594e9b64950b4a090aa SHA512 31481a88b91ef936437e54c863d39a63917496bd5701670ed38f1695c7cc6d867b8cc0eede62a523d5fea3819bc2688845277c9737349a0982de711cc464f00f
 DIST qtvirtualkeyboard-opensource-src-5.9.3.tar.xz 10030260 BLAKE2B 9199493c747f4cd7e8a8ce3965ede6b4e2943ddf4cdace9b61b3ec4380a7be958687e1e39e2005ca154ea73d2129a0e9268969f6c2a86b5cce6e7d156fb49efa SHA512 feac25b2f88e182e58431a92e27436149072e2dd2eb09abbb69b732a6c3e484c4259759a99f730856993c6d50260bf5ef234f29f6f7e2a4fddbe77d15838b5c8
+DIST qtvirtualkeyboard-opensource-src-5.9.4.tar.xz 10026856 BLAKE2B 7097d8243d11bb7b3cbc9f85cb124ca587e6652a67877e3c771a5c5dcca9c20f952474ffe8ab434caa6d2620e66e381829dc23e3dec927c1776f31a76b599d30 SHA512 6c10d3432cdb61a800c0eba436e135908cc44b5d36d14c93230e7284aae6fd671e116ddb976e610b37c4251c0b6ce4325be4464fec73d042eb9e9f29ee4397e6
 EBUILD qtvirtualkeyboard-5.7.1.ebuild 997 BLAKE2B d961e5a79c9bbbe52c52a940a24e4d933cfc69a43cf7ddcf93cf46ba6e3e4bb3b64a2f998a90c37c81c445031628acbb4cb7fc60b9cb49ef937c116c30cc8633 SHA512 1bad77e24919a9d2b7d3aa4f4568ff491b9edddeaf2812f2f5cc93fe11dd0c24c747e82db263650f972821c3aa2e660a75ed40c21cb7dd8642dbe9b4f863d3ca
 EBUILD qtvirtualkeyboard-5.9.3.ebuild 999 BLAKE2B 05db2274557522afe45a841f8e90485187dd56b2af6d3bd24cdc3b50cbb624a36bde10f4e8caa1c6a882f6024ac46d4bb4d2626a606881108ddd40766f66ff19 SHA512 12c1349bd9625fad53e113867d18f9995fbfd1feed30daf67af36b1cba37907fb51fb806e0116f91474f238898793d8f6ebc1203c8dc309e56b6891e2a772e0a
+EBUILD qtvirtualkeyboard-5.9.4.ebuild 999 BLAKE2B fe2cdccebf625ae538a9a1491c70f702d439830e779ea96d01f31f58f10d3856b8c15d6661d98f96f9d5d64e602b930f20180eadc68a1c783f80a6c7d903a9b5 SHA512 07ffb9e107e47aabd322c437d6b09349fcf4576cda6dbd0e6a952349997d962ea2279577c3fec5a2e41701fe5a83d142cb1dc6c80f240130e7280b7b8323d6fe
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.4.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.4.ebuild
new file mode 100644
index 000000000000..b7dd174e72f0
--- /dev/null
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Virtual keyboard plugin for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+# TODO: unbudle libraries for more layouts
+IUSE="handwriting +spell +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtsvg-${PV}
+	spell? ( app-text/hunspell:= )
+	xcb? ( x11-libs/libxcb:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myqmakeargs=(
+		$(usex handwriting CONFIG+=lipi-toolkit "")
+		$(usex spell "" CONFIG+=disable-hunspell)
+		$(usex xcb "" CONFIG+=disable-desktop)
+		CONFIG+="lang-ar_AR lang-da_DK lang-de_DE lang-en_GB \
+                        lang-es_ES lang-fa_FA lang-fi_FI lang-fr_FR \
+                        lang-hi_IN lang-it_IT lang-nb_NO lang-pl_PL \
+                        lang-pt_PT lang-ro_RO lang-ru_RU lang-sv_SE"
+	)
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 8584193159b8..d712229b342b 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,5 +1,7 @@
 DIST qtwayland-opensource-src-5.7.1.tar.xz 291776 BLAKE2B 06aba415e33ed971ef4de975e8677a52c4fcc81922f978cc1bde7e9a7ebdea32cd1c7dca59b67493bc96edfd997027f630c05c93ce31ae4ba87a55580495997a SHA512 41a6699b9048a859bb0cb1e37cd0a3977f52a5a223d4f6a4ce5e1402c5b829cc907593ce2b70f4ec24dfad147251bb2f20e889eae26072cf53e774b4585f2921
 DIST qtwayland-opensource-src-5.9.3.tar.xz 314652 BLAKE2B 56dbb8baa3642144d7021ca4361f4a574efe520f759dcc09867e4f114fc449ebd011099fb852c758c524e79539d5e6365cd3863921dc42339ba9c770586d21d7 SHA512 1deb41d3a2e081fa434167211b975019840c56cbf04c8fc18325d405818c2ecee6d65c9376f498ddacc1587455d310b815d56124d6a7734b2857399abfb3b659
+DIST qtwayland-opensource-src-5.9.4.tar.xz 314932 BLAKE2B de90fb47af0d07e0b6476b84de2f51900e4e09ecd57aee800534998d3a2e733501da877f912c4b0ce671d417f543eb44bc1607225af0a134ba5702d17efae431 SHA512 93d43bdcc39fd471cdd335c0699c5e5dd77cd0bc2d15f2a1170d8ccd103d84e2c7e657575a370ac6c678b52c2b617fb2c80ce4d226264cb6c857064452f7dc10
 EBUILD qtwayland-5.7.1.ebuild 623 BLAKE2B 2f60f19423ac6038c61ed09d8764cc2ec46e71edc18189eef873391cdc79aa68ad05f32716cc2deae59bf1db1228ef731e323f6df87060af67e078f14288020a SHA512 8768c4014b155e6a5918d93228c2281e4742354f706089bc94355d8eedc939d5d32471163652cc6ce640beb719516b71832100d9d5e255ee90b38a3f68edc022
 EBUILD qtwayland-5.9.3.ebuild 907 BLAKE2B 69735789f1eb7272eee9f587a110a50352480d4c221d834daa60e1c16157368ee90ee2359f7d2d69f2861d327ca0e6b71c505887f77ed27c153bfeffb61278b7 SHA512 8f36a62cdd003781b58b70214de5593afd3ddce625a53e088ca1e4d19e270bc1afb65fb669f1cdd6173079661220c05280f19ae4ac394bec825f27d656bb0a61
+EBUILD qtwayland-5.9.4.ebuild 907 BLAKE2B a7f254dc9571a1860f8caa6cfa15a13e8d6859116f0de5cf7cd66ad5cd6969a948445391f78dc3df927c90437235bf1cbb26bc4809a5f6faf66b6ae23f2fed41 SHA512 db097b4577f81f5354c9b07944c3a47120f93fb61cad54346114c515460390d375d7412464904b9a07a24c08edc150df9378b766ca348694182a1b6209069174
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/qtwayland-5.9.4.ebuild b/dev-qt/qtwayland/qtwayland-5.9.4.ebuild
new file mode 100644
index 000000000000..4c3553046dbc
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.9.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="+libinput xcomposite"
+
+DEPEND="
+	>=dev-libs/wayland-1.6.0
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}[egl,libinput?]
+	media-libs/mesa[egl]
+	>=x11-libs/libxkbcommon-0.2.0
+	xcomposite? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_config libinput xkbcommon-evdev \
+		src/client/client.pro \
+		src/compositor/wayland_wrapper/wayland_wrapper.pri \
+		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
+		tests/auto/compositor/compositor/compositor.pro
+
+	use xcomposite || rm -r config.tests/xcomposite || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index c6205d20f6ea..0b56126ae27c 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,5 +1,7 @@
 DIST qtwebchannel-opensource-src-5.7.1.tar.xz 122436 BLAKE2B 29bd6a5d09cb91d7ea7d5d2bc6ebef62851569a867b7949d2c79cdf1a52fc6abb8181814ade499d2ba31d305567a82556118bdad3fb59700b6895c9e7afcf5ae SHA512 643ca738e07c9a719d1d17ee23faf0d7bb3a62e6ee03e5b4f78e1cdf8d1b13ed71416b86bbb40c93d121a6569dc55d0373f1cb0961c8db07762c93592ca49af8
 DIST qtwebchannel-opensource-src-5.9.3.tar.xz 147404 BLAKE2B e1e6211cec2d6058ed55161d3b97c54102ae5f7953dd14c769bb706376a664ea5e2f88ebbaf32295515a14c643171cc2c865fec929d57ad1b9487f3e2bda7772 SHA512 d03a091121256532aac1ab4492b83ba29c847729f2628a2bc7a76b064d197e72cfdab50f0ec2314eac01cc47e2255bfef17f2e010d7b2c3d408b9af74c9ea136
+DIST qtwebchannel-opensource-src-5.9.4.tar.xz 147456 BLAKE2B 703bb44c12bb856f311561c772ebe8b716dcbae9f75ac47d7b702f459d47a621431a5eb2cd15c44f60c8f178d6fb6d8405f1c79c5e5501a28ac566298959b58a SHA512 932b56c9e9944e0f639163c4e484ed5260bdc7a186e81a2a6cfa113d14892414cd5b81f2767132695fb2f251c91e4d5ec9711cba10983215baa6e8014689dfbb
 EBUILD qtwebchannel-5.7.1.ebuild 563 BLAKE2B d0a9c4bd8cad8c0afe46da2a60c7989b0bbf2cab997bef478c7c97d0131fe9ba8701ee514aeb4abc22f4368bdac5ddc4e0748a3635e886089bf60e562e5a7105 SHA512 741eb20f2e08d421c4b254801edaf84319c0cb380c2e6debeac88ec633099b78839120d5cfca28500d825d0191db6518522b757d8ab7748709a0a69648dae5ac
 EBUILD qtwebchannel-5.9.3.ebuild 567 BLAKE2B 788eb3e961a4b2344058132d6a919f1eb8f9ecd70bdddb640544b17ec14f310cd02276f79854b35a44bd9a2bad977cfe0be8dae39279685c925a07ca1b0b38ff SHA512 5d4f9958cc1d6810c1b5b7d99aa9af0d20e840fd77cab5662ab5ecf7fbc0979fd5832a88757e624857080bb0e74c90761435785250c138024ae87f11a7d7e145
+EBUILD qtwebchannel-5.9.4.ebuild 567 BLAKE2B 0c2571b19cbdac1eadcc41c8989423580cc0744f6303834e321ac9ee8159dcfe23467bfc70909cced0657ad4e97005dee5ba42326c509cde3639b3e84db8b3cd SHA512 38902c94bf7b214c3d784dc0788fe4257cbfea895a6ad7dac73dfb52546f55bb16c6e84e20192c8e30c0bb57c2716ef8860d79ea0d71df33f3d3aab2a2542263
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.9.4.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.9.4.ebuild
new file mode 100644
index 000000000000..63c52e4c7747
--- /dev/null
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.9.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick src/src.pro
+	qt_use_disable_mod qml qml src/webchannel/webchannel.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index e665a66eb103..772db31a843e 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -8,6 +8,8 @@ AUX qtwebengine-5.9.3-paxmark-mksnapshot.patch 997 BLAKE2B e6fd8d6830ee2ca7b4e9c
 AUX qtwebengine-paxmark-mksnapshot.patch 1478 BLAKE2B 99f99e8264c0bd534e5efe0dce1d2bd58662f83e35f3426cf3daba0ea49d28689723c59c14ed2d357102d8eefbc4c7afcce298efa516f82710bcabe930a6e566 SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019
 DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 BLAKE2B 624df9c61b887ed393d8021db4e7bd058544abab3a13341fd0bb76fa3c00cf2692c4e08c2058e1576dfe5c62f9e9bc9ac8a1b5a4a640a204e74ba88516fb4ffd SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a
 DIST qtwebengine-opensource-src-5.9.3.tar.xz 217344496 BLAKE2B 51701dfa8a804ad7723d296fb8ba11df821041c60e4c96459b7851b3ba1ca683e83207c3020a5a54e401779186daf46049a1167649b930cc04151b6d0474aaeb SHA512 0db532b4d54540da1ca63de1cc4d561d72f052211535f75f60b99c1858ec0819ab0f831a3326d58da6350066748634000fe7ad0719ca545e12f3ed249a6eb90a
+DIST qtwebengine-opensource-src-5.9.4.tar.xz 217337248 BLAKE2B 8a8c55dc08b06b07822fd53c780c1b7898516c8a7d021711f4ad5409630a131a90b1916c21d4e83e43dac773c4c73b4a1045baf96ed3c1d39f2d3d4c35c4a8c0 SHA512 c576e81cd9d202a4614c3eedd008bc41bd6212cd4d06e639469b843726be427f9e7a9551b3e604cbfee90f8dde22afb5bcd4905818ca65234e198078971d6ac9
 EBUILD qtwebengine-5.7.1-r2.ebuild 3109 BLAKE2B 5ecfaf15205fb4d3ea2a2a688c1fedf312efcfb44140de281738ae45f16ec38f4a81bf37fd963c6847c94d64b7b013580056feea224d40cfe56dc1a10ca3cf0c SHA512 618c00c7d5edc4d9fcae5b25e61f957ada6555afe53a2e52164eb7cf22c05a6a015041b2ead744624fd8eeb9c35edbd951786337cb2d3ebd4a1747af339bd730
 EBUILD qtwebengine-5.9.3.ebuild 3103 BLAKE2B 3d4c326b27f54799faa38ea36bc5147e1299483be0bed1214758cfbb0f7952b46cfc83b10b780edc834cc2d82ff5568bf1b7265f69e875b2b9be09b168897630 SHA512 ef109193825017c7c2e762c1e046b3667397aa56f3a87490b19f261b04651a68191f79e43c277eb0ee91fb837532167ee7bdc2a1580ac90af7889ae7a4999545
+EBUILD qtwebengine-5.9.4.ebuild 3110 BLAKE2B 9bfb19630207aabb381557a6ff7d5ff3a3396dcee19411606f7392067408473dff0d014fbcb75639b2efbd35503bb3c5fbb91a5c8cfc10e8f95ced63e251fd59 SHA512 4a9f787397dd4ffa2081724125c77a437fa077a7c060a6998d1d2d08eccd2ba491c0aac3ee31b41421b35a9bd8b6666dfa06cc460af39ed0c87ae8535413038d
 MISC metadata.xml 948 BLAKE2B c3f99b9a59aeb8ad3754b0caafdd7132ee60142f41d992b0fecdb3ed0f396ec7903fb68bc2e734e127f4f722c4f0c6c8398f94685925296037684912ace05764 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
new file mode 100644
index 000000000000..e36ea1ca7b3b
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit multiprocessing pax-utils python-any-r1 qt5-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtwebchannel-${PV}[qml]
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/protobuf:=
+	dev-libs/re2:=
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz:=
+	media-libs/libpng:0=
+	>=media-libs/libvpx-1.5:=[svc]
+	media-libs/libwebp:=
+	media-libs/mesa
+	media-libs/opus
+	net-libs/libsrtp:0=
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/libcap
+	sys-libs/zlib[minizip]
+	virtual/jpeg:0
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	alsa? ( media-libs/alsa-lib )
+	geolocation? ( ~dev-qt/qtpositioning-${PV} )
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( media-video/ffmpeg:0= )
+	system-icu? ( dev-libs/icu:= )
+	widgets? (
+		~dev-qt/qtdeclarative-${PV}[widgets]
+		~dev-qt/qtwidgets-${PV}
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	dev-util/gperf
+	dev-util/ninja
+	dev-util/re2c
+	sys-devel/bison
+	pax_kernel? ( sys-apps/elfix )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" )
+
+src_prepare() {
+	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+
+	# bug 620444 - ensure local headers are used
+	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+
+	qt_use_disable_config alsa alsa src/core/config/linux.pri
+	qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
+
+	qt_use_disable_mod geolocation positioning \
+		mkspecs/features/configure.prf \
+		src/core/core_chromium.pri \
+		src/core/core_common.pri
+
+	qt_use_disable_mod widgets widgets src/src.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	export NINJA_PATH=/usr/bin/ninja
+	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+	local myqmakeargs=(
+		$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
+		$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
+		$(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	# bug 601472
+	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+	fi
+
+	pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
+}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index ab35a2e66768..f1b640b1cdc6 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,5 +1,7 @@
 DIST qtwebsockets-opensource-src-5.7.1.tar.xz 193204 BLAKE2B 8ab0cc108ec57dbeaaf55a23e44efef319ff861bf70e043d5507ee371e116b108afe27ba2ee98e8bb1036c6a8125ffcbc54c3e26297713e5d90ba05c9bc10849 SHA512 3cca317d71513a0b11d5b46d6caee44d77a7f65eff09dbd6c180ad682a0271924e05efc28e6d31c9e982b6ab0b3fe1370606eea372e2fefd4525237496d2c7c9
 DIST qtwebsockets-opensource-src-5.9.3.tar.xz 199420 BLAKE2B 0c0ed7e193422ca0459e0f77850ddbc28dc0e16f72171476bd2ea33cf2809798811720cb927a6d2ed2a812e80d06d587d0d5cdf02b0313766237f6ff5415a6d8 SHA512 64eb131a0640229ae7553c0e8b9ec04a3f83862d3f48c38464928b8a7a9ca999ed0cba5b0fb91174a9ae8e8e3d6fa844a2aaf62a96b95fefc383361793f8b5de
+DIST qtwebsockets-opensource-src-5.9.4.tar.xz 199492 BLAKE2B c8e7b32a3ae5f74294006ea0c47e10d34753cf3221484c398bb64b246ac7139a5adbde73b001c9d4e18d1cafb636f57d0b12c30620e777c0472f93dc4ef98b4f SHA512 ecf4dbbaf7da1c69cd649e599118231cca47e7c63a83d40cef15133a0ecc6c4d32e15faac8e545f5672c9e1be15b38c1458a5a5541e680ee1ebb2fc1281260f9
 EBUILD qtwebsockets-5.7.1.ebuild 530 BLAKE2B 02db8a061894415b65629e71e9df69e4f1a1f73c6bbd18865fd5519076ae7b629e27d5dfab73bddd7b8a7ac145eb6cf33165ab886b6d5c5ac86d1ff9875e8b57 SHA512 47d050f3ef32e91e9bf87330d2bb7b752d39579d4a586a56ed66f51bd648e11c74d015e75159dc027dda1f4792d9db6800b44bc02e1bbc7bfcfdc4141d6fdf2d
 EBUILD qtwebsockets-5.9.3.ebuild 534 BLAKE2B dc981a25c9e38b62d589305992a3f2c7532db4fba921c09469028f59c65629030e61f247f8509dabc6fd03b525fe6b01f9da1f01bdd2b2ea38589342590bceee SHA512 103cf47730e37e0351e97822e387262e3deca1367ef0b1f4955810bbdd71f54a801704bee58f22a549ed90221ce2f7ba961589298fcb9c0de68139a4cb9de59b
+EBUILD qtwebsockets-5.9.4.ebuild 534 BLAKE2B c76a76e0afa33140ec7d9cb11ef00b831ed39793ec1f406cbfac2f504b4e65ab916ca367c8ebc31bcc1a0dbc45bc87365d66bf9d87ccb8cbec84ef7959550886 SHA512 7bb5be749d4308840922d502b55ef8fa7e1ebd55ebcedcd25096171227535d732cde405cce6e3dede58c92cfbb059f3c5c79f9bd8b5ebdb2ba365e9e20337e39
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.9.4.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9.4.ebuild
new file mode 100644
index 000000000000..a0d178ca76b6
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.9.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="qml +ssl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}[ssl=]
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 9db9c404bdc8..4d192c90fb77 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,5 +1,7 @@
 DIST qtwebview-opensource-src-5.7.1.tar.xz 107388 BLAKE2B 8b5016da53ede661a0f1cc0892f3f3c4b5ddf59d04b88dfaa8cf4ea092e12f1df2abd885e08e059ab8ed6c23df5bcfead5bf27dde7f7e29f97a1c886e073685e SHA512 a0ed2c203e3638b3fa1e8fc051bc8dec51ca32b16da684fbf73c6f342e579c11a382c799797c593abb35df438699124fa169d1463affa1a2d0b55af57f05a011
 DIST qtwebview-opensource-src-5.9.3.tar.xz 108092 BLAKE2B 79d381c8e0cac6f07f4dcb0d83b0b9b1ebdbe894aaabd331bf4614fdc17ac9e00bdc17594c564274bd3633fc174fe0c296612167927cede4ce0d3dbc9ec35396 SHA512 f4cfbcdf41d28f6f479fa8cd08aa3e6d0ced0e57b86e563a8792d086f9aa28f1c246610369617fb62a577c41ebad78874d723b604c45df82eddd826d77ce9194
+DIST qtwebview-opensource-src-5.9.4.tar.xz 108684 BLAKE2B cb660595d88da5a8c9f9e951e4a13ebb265271f0dfe081c5cb19658674f0bc206b2852b83da8a21855ba176f70d93ab20013e373393169aa4a03b478e1ced39c SHA512 e59e8bc50672ea54631b3ac510291b57a6d4d66250819fbae61b7cb814e7653301d55a42c8225a46d106f92736035e039ac7d2e97f3ef13f50bc5874c7e8602f
 EBUILD qtwebview-5.7.1.ebuild 435 BLAKE2B d8147187c383d8fb4e1083dff2a755ca99e736f75641e24f21d68a1a1c451edd07ef46a14d16ab1b582a88a44640ecd52eda755f5953bc43032e1e7581586429 SHA512 b617e25fc5e34d3a2e78db3c81ab89e303392b54dd2d7604a35a8ecbb37ebafc8d1ad15ba51292fcf3ebda8b2f038d657c0e579012529569dc5bc33317f963a3
 EBUILD qtwebview-5.9.3.ebuild 434 BLAKE2B fa041bf360fef2075b0692828e749411c0aa6205fa0244a3f2bdc6a45845ff88ac5deb5a54a35b159550048e58c3d11e26d0f9e3840b14a5c58d2b4401352c88 SHA512 e7653020d0fa86cecfacf8ef867dcf6c6b70fcfb9b5b94437874cf98297d379f8437d7b981e622ad6f8ad26b7eb8ae7958b4890703238f884fbe6386e1d15234
+EBUILD qtwebview-5.9.4.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwebview/qtwebview-5.9.4.ebuild b/dev-qt/qtwebview/qtwebview-5.9.4.ebuild
new file mode 100644
index 000000000000..43288fc107ef
--- /dev/null
+++ b/dev-qt/qtwebview/qtwebview-5.9.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwebengine-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 18c15bda4af9..ece98d5ee769 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
 DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtwidgets-5.7.1.ebuild 834 BLAKE2B 4647cabd5daa38c160a9872977a31e84b4761304faf8c68d29c26aa9e76143ffffb6fcaf03e7c348bf75fff60250315b3cf9d100ce3671a896f6d2dd3b244f0c SHA512 29890730308f8bf264098bfb70fabd6d4212290b9090ffede33bd6a4baa3eb9f3a71178850f1355ff6c12a90c7b41793aca224b7b95671fec3142c81e4667832
 EBUILD qtwidgets-5.9.3.ebuild 981 BLAKE2B 313b50d94bd428d27eb92df55021d6d2b627474b0eb81828f44ef0835bac77d137e5e138564615cb779982538826e906a464bc388e794f8c272dd37c81fd5906 SHA512 f48b4ea1e674f2773818a37f6dc5f1691dde365f531f02e07e6bd8bac0425031a4273721cefc9c4489a31a46788f965728cbb781d838b146427e17a0236a18cf
+EBUILD qtwidgets-5.9.4.ebuild 1040 BLAKE2B da7a33d8977ff636f37be5d5cb338964b4bce03ef98d98b6da792e46ef8e100232c009f54cd0bb78646ad36c0a34c1ba0412e3c5d36fea30afaae7c09d3f01b6 SHA512 1bb1b674c875ea7d409432b6e4f315674c09e199b5fa9f442ad6492ffc3db1422a9093f9a5f4e3365a26eb8e458aec2efe27e46bef1982276e777cabdb9008af
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild
new file mode 100644
index 000000000000..4b650e6c3d4d
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 gtk +png +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
+	gtk? (
+		~dev-qt/qtgui-${PV}[dbus]
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/uic
+	src/widgets
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	gtk:gtk3:
+	!:no-widgets:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:widgets
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use gtk)
+		-gui
+		$(qt_use png libpng system)
+		-widgets
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon system)
+		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 95b414c98fe2..aac94330b6f9 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,5 +1,7 @@
 DIST qtx11extras-opensource-src-5.7.1.tar.xz 59656 BLAKE2B 641f66238450ed30a9923fb87aa56d4d4bf41ab634e8e3bf335da844041069af58d709019bd3b1161eff4a35b41aa582c53143bd02e3a20210a279ea497c4f3d SHA512 04359d85fad3dd51d6364c5218d5f76a384ec0d2082cefc7c67c5a8899cb19df3c9ce750b6707acfecf0a5ea57fb8cb737e5a8d2af3c63345f167f24712aaaee
 DIST qtx11extras-opensource-src-5.9.3.tar.xz 76612 BLAKE2B 8d31d78c161311bcbb5b98b448e54b9c140c0851ec029f3a2642700ed9ad355c36fbde16eae2542c441759b39ab39edd91a17cb6f879401e36b0bd855a6e3ebf SHA512 0d1547e25f5d051daa8b20f54ca146bc5a6ad6fdae2c9b9e90dae574840a350bc3ac82b05ddb93b7a544e689fc06e633e57a40f31475cd118e156fad78e91d6c
+DIST qtx11extras-opensource-src-5.9.4.tar.xz 76604 BLAKE2B cffb9870ec726edebbfbb2ed39206c8f1522e6f11d3429dbb0861501fed0d8dd3552f23ba363f3704ff1b6e9af89a91e68e90f2f7ccf80b150598778d26dfea3 SHA512 f05a273db98f95f998c681eab9f8d4a5d132342282bf63d1104ad718c424602fdc8dc71e14940999692449d3fea1442a5932c08cab3d6c0a9acbbf0403fee23c
 EBUILD qtx11extras-5.7.1.ebuild 428 BLAKE2B a3792a688222ae4fd97d73ab9ce8e561e509c103ba84130ab35b4be820cc7c978f8206d3a63b2bc314aa72eebdcf04ee1f6e10604a3f571d410e42347aa9e2f6 SHA512 9ed63fdb17f983617259c75e0812fc4d3dda36d8a9a78b4c24a0cd436835f741903a77ecba71fc9a5ec33260505bf0f7d111577cde41a80862394741815fa83c
 EBUILD qtx11extras-5.9.3.ebuild 433 BLAKE2B 4feb7eaca2e72f70c79a29a04bb1453596591234e07b97eb0c454bd21a4935b9cab68593591664de3aba888ddc205631093a003e071c49eca1b8b72810211034 SHA512 ca9758a4db6c04ed0c8adadb952449dbe07631816aa462af34eec6e3f29bc7d9579ba7b67a06aaa25c0a264e41b7ce60feab9969c9aef37e5d076753d5de6cf5
+EBUILD qtx11extras-5.9.4.ebuild 433 BLAKE2B 4a9d18c4941662e00aede624407415cb0c20cab9129a4fe017836d4502656a16982e0f20f1286fe13630383fd077a8fd363dcc60153c5ba866196e4cc76ab1a1 SHA512 6bbd4550620766a2319c10c0e322000b407c80a85978348f5c6eb3825795d65a93a6b79d3cedc2ada181a17d658b4845bc4f9d0fbf811e505a3884791c4a858a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.9.4.ebuild b/dev-qt/qtx11extras/qtx11extras-5.9.4.ebuild
new file mode 100644
index 000000000000..0aab3b0b6f53
--- /dev/null
+++ b/dev-qt/qtx11extras/qtx11extras-5.9.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[xcb]
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtwidgets-${PV} )
+"
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index eae85e8ec5b4..14241b5ccd80 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
 DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
+DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtxml-5.7.1.ebuild 450 BLAKE2B 1b3d962fefa2cbfc881dc7a7de8f5fb4c4566b4c61ec2469ac8359e55ee900a0538f54cb4c531ee2fee964aa9fde3fb06bfd84a3eb70b753384fc6dfc587500a SHA512 a670d6c8cc7b93b36458ddb4aa0238f0bf6b4ebb5ba929bf1c46f1b95dc525e1d9820167b0604e9e7d948f3cfd192d88b656f4b448924262d8c3220d7607ba9c
 EBUILD qtxml-5.9.3.ebuild 455 BLAKE2B bb7edd9da7b69e30a7a922a0ae658ede0c43a1356e4a5f15a7ecd3ce1ea7832e026dcf7bcf85b9a66b73a01503fd6697bc8dbe9c4b8cda316ea4ea2076ca4879 SHA512 c149fb67be41674f8d9ce5e1537eb6352f82ff25e7af3a5dca67abe5bddd3d8fab9bff6ecc369c90cff3679e653cb1e54a5150aa3b872f6c5830485224170691
+EBUILD qtxml-5.9.4.ebuild 492 BLAKE2B 8e2cbcef9db666e2e38cbf49c3ea09987c28e971a1de030b0a4c111863adffc871a33ed613c83b6119439ac3c1f555ba4fdafab6b91a60a34c45f5b6948387f2 SHA512 afd7c879b4ea3820045f115967b60073afb4540642076cd956a84a2db9d0e15e89434252c207ccacc577bf39aeb07b12012c7a3c71326260b04d245b2d48be94
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.9.4.ebuild b/dev-qt/qtxml/qtxml-5.9.4.ebuild
new file mode 100644
index 000000000000..3ea4d2e7c317
--- /dev/null
+++ b/dev-qt/qtxml/qtxml-5.9.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/xml
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:xml
+)
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 93c3e8a24329..8775ef9b004c 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,7 +1,9 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtxmlpatterns-opensource-src-5.7.1.tar.xz 1352472 BLAKE2B 3b65a4b8a76631ca31d48ab176b38818246e21fc247064821a221affa5f6fa1b6763e0784b9b37789aa50f3f4f4606a2ed976d7449d7e3f7f5c072a4765f401a SHA512 2acdee1e49a154dd111be6afcb7f765d98fc17c49f79cf08c5fc03cda7e0cab7537e2dd57d976ee13b72c46a577bad2ac8466444ec46b3f14130f71756ac63a2
 DIST qtxmlpatterns-opensource-src-5.9.3.tar.xz 1360880 BLAKE2B 52b3840c0351e305afa402520811e770979617274e1cad00e39d66b6fd685d3322fe0828347298245a7a519ba9bfb1e273f9645649113e43da9d495f8f672c57 SHA512 4b345940cc66cfd14de365f2802e49a3ad88c25a46e4c36765e31586728496f3bc5aa9a856a78b79b583e577a70dca5c70534d9689627773e142e9c7e421de01
+DIST qtxmlpatterns-opensource-src-5.9.4.tar.xz 1361036 BLAKE2B 74fae07ff780bb44eaffc56822585c5dd2dc36c13237ae23666f8286488a837cafccf01c14d9efe4d151435235965b923bad1889ed604ebb2781237d8674db26 SHA512 c2789e7ca32f29f025b72704be49d9cfd3c02bfa61bf3df4145ea03b5df4fc60b2498bcf7e45090b36141aace91c645b0648b99c54e1b3fe6aec486e7fbe0dad
 EBUILD qtxmlpatterns-4.8.7.ebuild 679 BLAKE2B e26f0d2bb630e377f932c37e8e9399c40c722c2f4e7dcb68d42c3ee8c08bba1ef9263e6b704e33dc6ec402356e8829d004e007c20e91a49b93001c743f8182a5 SHA512 dde6d5ada8f3c9546bfed8a0b4f6c3f118794fa4fa382219a3f6b8ee75b8c5e8fc5913a2a0421a8904ba52dadbc707a3fd17c2ddbe4a1ec758b00d8fb0c2aecf
 EBUILD qtxmlpatterns-5.7.1.ebuild 410 BLAKE2B d2fade547a1a9577632ee0230d2e6be902f362f1418ae54206f9188c760abc28d9fcf5985f7fff7f78005d2521455dfacb63b0507e50b68f9e51b388e2bf4c73 SHA512 fe95936636e83b41c90212726ab666433bf8ee0a7de2388292f400c1019e9ed074da0a5dd4a2ffb49ceb6ba48681c6bf5f59a3dd5a7417e3bc7f5cdb1c54f4a9
 EBUILD qtxmlpatterns-5.9.3.ebuild 415 BLAKE2B ae747418ce312031479a3c9eaff4523e1ee3a7e897b68301d5f7b504a2242df00dbd55c1dbdffe1b5b1e4b94007a73796073b85c501f12920762472601c83503 SHA512 90ebbad52ced272539de159205c4b5f5a14ae26502a084829dcfd9b52030eb4819cf8dba832e6523d103050005325c0ed7072774c53fe462f61e31735ad1d4aa
+EBUILD qtxmlpatterns-5.9.4.ebuild 415 BLAKE2B 9225f7a4ed4064ceb100e564dac53adc5ef74a60fd78035e6c753c21e9319fc5ef3a40946c0aeaf18772cafc50e0bdfe98c2fd9537da18e77fded8ec64d98042 SHA512 49d66ce00be9596818a7b78b26671ba0f0aeaeecfc558f4a81356c43907aa664cd32db562edba201f2b2a8023acc639430f30ebf860f3311ee587e9ef983982c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.4.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.4.ebuild
new file mode 100644
index 000000000000..7bed5a775e57
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 7a49e7e77975..f66109ae6a19 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/d3_rails/Manifest b/dev-ruby/d3_rails/Manifest
index d527bb04cf50..8625ccdc19fc 100644
--- a/dev-ruby/d3_rails/Manifest
+++ b/dev-ruby/d3_rails/Manifest
@@ -1,7 +1,5 @@
-DIST d3_rails-3.5.16.gem 134656 BLAKE2B 4c6c141550181f414df64e45d511272c784d4514b43444df8d31c44cb56ad1cf055ff32e10a2e9bd4bf8919eec977473bd8c2a170d22b58229976098d8834da5 SHA512 b566d161dd1999523106f87f78522fffb7b5ec5615db53cf9d9c8e39145baca00d6f12a94438603ad395fd515de6297afd4afd17ec1186ea141b54a724585268
 DIST d3_rails-3.5.17.gem 134656 BLAKE2B e5b770e718fef53cbe6b7c56aef6c566ccc8ac5cb87f119a6a43b1c02659f60e80b93fd1f352c25a1d4e2ab3e441ebf48847b7cf5eb7f4777ccdd386bce5b44c SHA512 08e59d1615477c92441c9b04239451d184663d0abe9b3340c3f0ae02d2b9eadbec03f6b12ec08407c644d89fbb25c50eb1bddc52d87c77bd4b476fab1461c882
 DIST d3_rails-4.1.1.gem 134656 BLAKE2B 7890c080fbf9c274a843ec49bf75eb33c29e9aced1a56c3251d46c89148fe03a055c8a14b02123b89f06bb54492d0ecfcdcec12e0d21506e8974bfa43662ba09 SHA512 3ca04e9827a7d9df92b377fbfb354b0802bf408495e3220773fcdb782c9de8dbb3421442ca2c250fc787223ca1e489edb26472fdc7c86dc70ebab3b8c2035572
-EBUILD d3_rails-3.5.16.ebuild 548 BLAKE2B 6f95faa716d626871f64a91c202ac9812ab543ac1fb9e85a317b5e3811a0c63a9bd3bd7efeaaf9f5bc29b327fe648787f6023199b09451a017c1591dcca4e53e SHA512 ad642f4dd16a8f63d527d8009ea8f9f181dcbb61b8eed6d226887a58f29841b5c5727c71b5536fe5e93c311b9e8e64c0a34a8781059d40154cfe6da136193fd8
-EBUILD d3_rails-3.5.17.ebuild 548 BLAKE2B 6f95faa716d626871f64a91c202ac9812ab543ac1fb9e85a317b5e3811a0c63a9bd3bd7efeaaf9f5bc29b327fe648787f6023199b09451a017c1591dcca4e53e SHA512 ad642f4dd16a8f63d527d8009ea8f9f181dcbb61b8eed6d226887a58f29841b5c5727c71b5536fe5e93c311b9e8e64c0a34a8781059d40154cfe6da136193fd8
-EBUILD d3_rails-4.1.1.ebuild 548 BLAKE2B c40904dc2b13826c7a3f7849e5ff0330fb68a81ec2bfb3347fa29e624cca6d93e0fc684f71ede4e484bc73cfac1e9d45ef14c6706610302c4ce40c5288ef5d68 SHA512 0e2224d4ae4c90b6dc23356bb4c3cb92dc57f162224287bb248c32616c1053d9ea0b32ca50140b4b86d9824ab0f574169e30fbb201d7ec2233c81a31b05748e0
+EBUILD d3_rails-3.5.17.ebuild 541 BLAKE2B 0f5c7a5f0deb5ca24cc17ecb793f344e34558f73803f3e22b794e6aacbaf495a34e2abc0e404209ca8523ecb67907b9339712e6715ee705b9a71d47d8812ae25 SHA512 b3eb578ab5c4e559741abc03fa16c4bb1aea3c22dd4383682eaf59910fdc7b9a68db6e65747a26374a8cc4fd3517cf069473609887277b8333b644ad17efd5c7
+EBUILD d3_rails-4.1.1.ebuild 541 BLAKE2B dc53812223e9039af9c50e3613e490347606c1d8376b0c7df0823d196f569eba868d50561388fcf4d7e01060985e5819d60ae1a2c669f8587f23549e222e5ca1 SHA512 00246fb2c47ebbc401257bd1b04ef6c7331855cca3463263325bff4b62c727f5832ff3e3228bb2f1b4f478706700dda32da3df4c95a921f3b1448c340d15de28
 MISC metadata.xml 344 BLAKE2B bdf59254880406ab3c58709aeed3ee5857bb23e40fa9237c74cc481d45460c2123c1a011f71a27fb47e9a25ca81389ec0b0c825446d3810473fdf05a34651364 SHA512 9c6387047250677b3b45c2fd378a75f59d5f851b827dc8c2d256135200b8dda144b79941a7aee523c6c899bd19d5e5bd4d1e119a99b6232b3deca50e4859c528
diff --git a/dev-ruby/d3_rails/d3_rails-3.5.16.ebuild b/dev-ruby/d3_rails/d3_rails-3.5.16.ebuild
deleted file mode 100644
index 36622cafdc28..000000000000
--- a/dev-ruby/d3_rails/d3_rails-3.5.16.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby on Rails integration for the Javascript Data Visualization Framework, D3"
-HOMEPAGE="https://github.com/logical42/d3_rails"
-
-LICENSE="MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/railties-3.1:*"
diff --git a/dev-ruby/d3_rails/d3_rails-3.5.17.ebuild b/dev-ruby/d3_rails/d3_rails-3.5.17.ebuild
index 36622cafdc28..c261de263b7a 100644
--- a/dev-ruby/d3_rails/d3_rails-3.5.17.ebuild
+++ b/dev-ruby/d3_rails/d3_rails-3.5.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/d3_rails/d3_rails-4.1.1.ebuild b/dev-ruby/d3_rails/d3_rails-4.1.1.ebuild
index 7cc980a41cd3..128ee2a39f36 100644
--- a/dev-ruby/d3_rails/d3_rails-4.1.1.ebuild
+++ b/dev-ruby/d3_rails/d3_rails-4.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/date_validator/Manifest b/dev-ruby/date_validator/Manifest
index d9a31a938ca3..413c2eec3cb0 100644
--- a/dev-ruby/date_validator/Manifest
+++ b/dev-ruby/date_validator/Manifest
@@ -1,3 +1,3 @@
 DIST date_validator-0.9.0.gem 12288 BLAKE2B 1a180a88ce4669a29381fae8c9a2407a9026404d0aa2d7be24566ab1f35dfc4a2c17c0c06556c3388e49198dc6bfc11425c2f899c46bcec8a39d6b284269b4e0 SHA512 da7c06d22375cb5ce0e3a1c7d8c84d03c60f5564329d7a6adca4448d386bd26341786e97e6d74d6c7ba820c4437fe88f6dea1e20312b07714f28557bb863c051
-EBUILD date_validator-0.9.0.ebuild 1014 BLAKE2B 6f12ec10d0798b5e0ae72247769d2d22aeb1d5d94f7a24cc024a7931443ee25a823b78ca9a6b3be2fc191bf5ae0bec31a66e8b0063d6bcdc56325852ac5c51a3 SHA512 fe2ce147a6c1cbb7b3e63e603f1acb4f215a1c23fa008d974b50ca8f007cb4e8545bece0c5ef72a179214d1dd4c0aacef60495ee82880ff2b55edeab4960cb66
+EBUILD date_validator-0.9.0.ebuild 1007 BLAKE2B 4c66c06b058d0ab659f9c38929c64f38677bb7ab1beb5118f0c4f2ff99d2bfab4e7cce63139b7345bb0c4cc57b910dcaa441ce256be9d0549e5ad607928b01f1 SHA512 a6e5d1cd12fe352a0b1033fd87566dcc2ceb4adf83781e243effb78d50e0050721897133aeaf78e21f71ac8e97d3c207abb7623665bfb984ef1daf1460a75d58
 MISC metadata.xml 349 BLAKE2B 4b120116447656e42f1247065f08006f19da25e019491f904eafeb12ce35bb012f2c0330d8ff219f7c2ac72e4c0423b93a2a3ffee36da1de08454c6306856722 SHA512 67be0f0ac5cc6bae9b3d76a371bcceefc5c32c4a384a02f7f13a0fa1da950ff864a106430922a3aad2d8b5522a216ad6d93eba949ba1bd76f37926abc40fd6c8
diff --git a/dev-ruby/date_validator/date_validator-0.9.0.ebuild b/dev-ruby/date_validator/date_validator-0.9.0.ebuild
index 8fbe1c9db0b6..2310e0c8eae9 100644
--- a/dev-ruby/date_validator/date_validator-0.9.0.ebuild
+++ b/dev-ruby/date_validator/date_validator-0.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/ddplugin/Manifest b/dev-ruby/ddplugin/Manifest
index 7757b61724bd..e5e584d0f0d3 100644
--- a/dev-ruby/ddplugin/Manifest
+++ b/dev-ruby/ddplugin/Manifest
@@ -1,3 +1,3 @@
 DIST ddplugin-1.0.1.gem 9216 BLAKE2B ec1035b66b5167f26a9f89bc02dd1e4429bbb8d22e0bcd98b4e37a20443afc61ee32b65e00a6d46265303ec8cca6090edaa646615e0d00785222c1450c62f8ba SHA512 6332fb5292f7796e99a78131fd0e4c38cabed66e0d05220960e1cf08b717505e3790b99949d1a6098b80999d973ade442d07a5d19975328174810ef8f44ac276
-EBUILD ddplugin-1.0.1.ebuild 589 BLAKE2B d2d75845e0fa686d1766e5fa03187f12baf016c7995777237ae27fb67ffcead8c0961f0b2b625e0a3136551233a9211ecf0a68eb425c0369fb0fab35e5bc4207 SHA512 21ed34be02f5291cfe990074053b3dba65536bcd74e701a6e314a4be736e31564760711735f12cd496af36b6bc00d1a37f98618fc998d6c072182d6e3e2cb103
+EBUILD ddplugin-1.0.1.ebuild 589 BLAKE2B dde97ac493236470bd004b48207688653810aa083848e69425a174a8f3efb920145cf4c8d34e2eecfbc6a5ee9aa08e819ee7920fc11e4d43458c6950c56dc7a0 SHA512 36e48ce74683c107009418ae7ae26d9462af40bc35f9714bc15141b86cf58c971c7e607fb7d824f87fc27263de29ab304d61e694931c1c1888f71f72b04e1aa6
 MISC metadata.xml 343 BLAKE2B 746f50a23d4f0d6bb51139641b0170f42f0317ced63c8aafbcd0792a7e2bb52c16980087602df8ba56921465e045b42681f15e80193c6abfe3f2ab4f6a6367d2 SHA512 14ce3a5ff346c7da07c1d5c4eb91b7a02ad8b77c97921c40ec29cf7ef48e365c6c1c6265164658498ec07ab5a4ab84eb06930d4db0d4af0a40a50f258993f1b3
diff --git a/dev-ruby/ddplugin/ddplugin-1.0.1.ebuild b/dev-ruby/ddplugin/ddplugin-1.0.1.ebuild
index 698d1e3417af..935cab84925e 100644
--- a/dev-ruby/ddplugin/ddplugin-1.0.1.ebuild
+++ b/dev-ruby/ddplugin/ddplugin-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
diff --git a/dev-ruby/debug_inspector/Manifest b/dev-ruby/debug_inspector/Manifest
index a727c5d8d315..4c8408646d72 100644
--- a/dev-ruby/debug_inspector/Manifest
+++ b/dev-ruby/debug_inspector/Manifest
@@ -1,5 +1,3 @@
-DIST debug_inspector-0.0.2.gem 6656 BLAKE2B c4fb4e8d9e2e911f9b2b04035752ed20e66fb0842089c362dc610ff6ca84ddbb87140390206d6a84ca28e6548f0801bb2a679687a6c920dc48decab2203f97e8 SHA512 ad24ff2071840ce8b7aca3df21264f889539b329db30c251e72600c4c8dad8ef04a5d1b0b5514f6433d76aca903d5cb334ae40c077e142252896d6213103feca
 DIST debug_inspector-0.0.3.gem 8192 BLAKE2B c7605f246519b245d0b997e10cfc1271c6cd5a31dc44097546d51265eb6ce1d88686b1dc922addce0a58b6bccae4fa5a40611942b6babbf8dfc6b4c528949422 SHA512 38cbe0ddf2eb4285f4f7d6f12428747495230425352e1850a4395a5c27ad4c2f706eeeac1f684baea488f6e3bd4b65c8c9e0d5807d5af93d3350fa7b9d45da43
-EBUILD debug_inspector-0.0.2.ebuild 589 BLAKE2B 8993c3b4f19ecf1b2069b584d57fb55c4d55314d4bd1f58d2dc63cc4234bf77aee9769c5dc4f2e7b5525ad13a77688a01b196b362fa7c1cde5bef09deca58835 SHA512 ffb375dfa0bb0e40c9faadeb9cd4385d0c888bd540e7239d46ee419d4fff0266f0d1e1798f3422c4d3721e3715a2bf459dbbe2e7350060a8ac5f243711aafe66
 EBUILD debug_inspector-0.0.3.ebuild 589 BLAKE2B 3628edd90a3c92596095bdef4278ff36f678bb5d55e3cfc2d4cddc69153a565e583c1d472296bc35203e1e4122cf1cf1b1af2c71c939fb475d1cc1f82cd01dea SHA512 d73444ac43b4eee4d3d581eb6b5de1318a29b8dcb117d7c92a87f2931e18c5fdde3cc5897eef59e25398c1afea241acd11aca399fde9433914d6e4a80d19b285
 MISC metadata.xml 350 BLAKE2B 1dd62d682b217a24d9af313c9c81b84408466b076d7e170aa84491520ee7813efbf7f5d6a1bc4c7a86cc7d9196aed3b675a98cc361002807dbf59f96794f4c91 SHA512 032b694988de00daeae365ac600fbfcd4cb9434ae8e43bbfe0b5736346594d3f026e29af7aa87cdf29723d2140cd890d9039c6de1b6f850a162c02f8a7ecaae0
diff --git a/dev-ruby/debug_inspector/debug_inspector-0.0.2.ebuild b/dev-ruby/debug_inspector/debug_inspector-0.0.2.ebuild
deleted file mode 100644
index cdedc77eb08d..000000000000
--- a/dev-ruby/debug_inspector/debug_inspector-0.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby wrapper for the MRI 2.0 debug_inspector API"
-HOMEPAGE="https://github.com/banister/debug_inspector"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/${PN}.so lib/ || die
-}
diff --git a/dev-ruby/deep_merge/Manifest b/dev-ruby/deep_merge/Manifest
index d4258da07316..b4c539e01f61 100644
--- a/dev-ruby/deep_merge/Manifest
+++ b/dev-ruby/deep_merge/Manifest
@@ -1,7 +1,5 @@
 DIST deep_merge-1.0.1.gem 12800 BLAKE2B cab2876000518e2000d8f507bef3cf954d642631e1b625953b409558aea7b0f06695352008fa6c1112da7b9eaaa18d16d8bc96375cb84e2c3924a32b7d0e57e0 SHA512 2796d30a3d279864717bc535913909169dd49c698dee6cf64ad785f42ecfcb72f2fd90083baf890299fec452265553f5767d5719f5c3c4c100b85e33ad45006f
-DIST deep_merge-1.1.1.gem 14336 BLAKE2B f1650d235e81e84d57a7f13e1c9661d45219c2d07f2d0592d219512b124c10f56a082c5220345c8a0fe625b90b12c73c9a21e4cc23fc1d542337fcf2b733ae67 SHA512 3e2ccf9a8e715469937f8d61cd73289fcf14a455d337db903d05e5ef88c2793c55a7dfde73e6d0054ec06ef670c83079f290e915f8c295f0de4575cc7caaddac
 DIST deep_merge-1.2.1.gem 14336 BLAKE2B c122eddaf63fd885f82b292ea7d1f2b6a9a9dd50731e77b856fd02284634a699b7897a12c1856732c77b4d8ffc9f6efe06f792f42d53236a521279bff13b6dce SHA512 ef93e0c4c6a8f389338ea30b2b53271f089b0b8275adf6fc74e7d15a2faf32d62a1b297af9d31c42cb5d816066428c8407a82d874fad14d64384098fc3c5c70c
 EBUILD deep_merge-1.0.1.ebuild 523 BLAKE2B 0661e64c923a3b389c03f18ea38abeb78bb8bb4356da4af7bbebb82f2b8b217de78f3e0741cfbd8f1707f57e25ad9ccd9c6217dd501a3e4fe2753b130a45612c SHA512 e464d7b06ee2a3ea7c3e4bf32d5e8d8f39a88b830e92aed05a5363b94a1f85dd7968df220715627205c8225cb93f55bf0d0a5eff23545949bcfd29ea664bc471
-EBUILD deep_merge-1.1.1.ebuild 534 BLAKE2B ae1aecb1650e615f591bb52372d76d2eb10c7945325c5d8b9096a0c94c2198f2dc7f783e070da17b5492e35c7a621c3462d4c117fb4eca55b91d565a1ef8a66a SHA512 78a6a07672363ee5078b4fb367a0669147f680eead5e0f510c3813f900fedf0ee7302ae18384bbdc81a8b96f36e83f7121108c1970671a6c3f4c7aeb74694ba3
-EBUILD deep_merge-1.2.1.ebuild 532 BLAKE2B 79418ab2aa2a7ec4338b93df4377ed69a7f61fd9bec9dfa62248557e9656955b865d4c9403ccebf3f8e8c9d836d0a17bc5afe81b86d0fbfa5b92ed4e7a201961 SHA512 0bc53a3d8475925b14275dcddd5ad249033a05b873522c03db95f08fe4a5117ca34e3168e016830c7b196dc3a4124e5ad6708a904bb8cf91b4d05edcb672b554
+EBUILD deep_merge-1.2.1.ebuild 539 BLAKE2B 5afe5a08e4e5d14dbcb4c17e7f46c802e4149252da703f136e62c6c651d390a4d7ab787fb23c3ddd7f410673ab12cdadd89e3a9c9aefdc20a0a104c4ec2e0869 SHA512 24ecd8deb2fad381c869cbaa4bd37f5474d6f90334e9ae580cf8f63c5400ab11d3ce2c099ba06366e81c1fc14549a018be551557fbc107012585d92b6d3f6453
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/deep_merge/deep_merge-1.1.1.ebuild b/dev-ruby/deep_merge/deep_merge-1.1.1.ebuild
deleted file mode 100644
index 5aa632ef786e..000000000000
--- a/dev-ruby/deep_merge/deep_merge-1.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple set of utility functions for Hash"
-HOMEPAGE="http://trac.misuse.org/science/wiki/DeepMerge"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} -I lib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild b/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
index d7399f122b7a..0ab1d38ccd6e 100644
--- a/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
+++ b/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
diff --git a/dev-ruby/delayer/Manifest b/dev-ruby/delayer/Manifest
index 62d2d22184b6..debff790fbb8 100644
--- a/dev-ruby/delayer/Manifest
+++ b/dev-ruby/delayer/Manifest
@@ -1,3 +1,3 @@
 DIST delayer-0.0.2.gem 8704 BLAKE2B f0fba28398c0e585b10cfa48eaa7aceb9914e335f11253e8c4cb7a3c85201fae7a52e6792f1d0e824c75936ae2dea572a0ea99e89384562b76be615f6b70628d SHA512 1a5e149b739d8dd975d5c4a9e6a072181cc4d816af202461a0f98ec91f92e85e76faf700171b83652ec4f5114b1c1c5b2c6cd9d1d8d6508c1161b43f099e2b88
-EBUILD delayer-0.0.2.ebuild 484 BLAKE2B d8152c872df379b529926afc37bdb12126c12eaa16f87ad3be1edfc5eda88aaccb8013b1d894f022c2e1416930f3c801be02d23ac3a1a2877962b365e38041df SHA512 bb40cc0cbab83cd3da09b25327770985f6d753e1b1bdc0f6075c4355474b4800083cb0e3d45f43ee1e203a14f24a2a491598311cb4ed19dd184631de4e657a77
+EBUILD delayer-0.0.2.ebuild 484 BLAKE2B f3d51f9e0fffd9509b481b8d25f4fbb5e2476e709c8a127af9a0efefb835b9af73056f89b70472a89e9f3d637acce4fd23e448982b0e9d2b5fd1c77f35a74500 SHA512 a47f54e8d53b1379995d91fcf0c5988204521c83726e2af637df2f1446f26fb81c8abf9148c01e875b866058b7489bfd8622705cbf9b851530b3ecdaf621844e
 MISC metadata.xml 402 BLAKE2B 55d14808082ea735f42e1973414806c29ce83dc35dbc7a9b72c70d22bb00b0f5f22f34798a8232dbf32a74a134387eb47ff014477e336c912d89bd23c388e78b SHA512 9d11aea71d2c27e3aeaa80848458166719daff95243f342b946756e9b2d0d1ab23551a3eafc40a74fad1d029798f2ec7bb67bf224ae9985bd7db9fdf4576ef41
diff --git a/dev-ruby/delayer/delayer-0.0.2.ebuild b/dev-ruby/delayer/delayer-0.0.2.ebuild
index bfdf255db807..81ec49694bc8 100644
--- a/dev-ruby/delayer/delayer-0.0.2.ebuild
+++ b/dev-ruby/delayer/delayer-0.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/deprecated/Manifest b/dev-ruby/deprecated/Manifest
index 5ff5b541e9ab..1e3e92304854 100644
--- a/dev-ruby/deprecated/Manifest
+++ b/dev-ruby/deprecated/Manifest
@@ -1,3 +1,3 @@
 DIST deprecated-3.0.1.gem 6144 BLAKE2B 69ef1b95168ada9e66dda556d0c6731109b2b7845f8c4be0ba75749f2e7af092c3b800d0334c4cd1c555905c09bb12dd945f4692eabf0155fc32f4ea380c52da SHA512 c4280f8bd6914a6b073cbc443db5dd5232379abb7870d90cd0146c08312f82aa8fd8c042b48c2b9b26c4120dc8afb326070a1256c51355f1cfa898905ec59e51
-EBUILD deprecated-3.0.1-r2.ebuild 531 BLAKE2B a21e4038e9a2d99daa3b488133604c2cdaa13e4feb58fec502dae3d0bb6e16723b2b81419cfab59feee2a0584a35bacb9417f0e88a9598ba17cdbe1aaaca5f9a SHA512 2affd3dfbf4e68a415688a9ad7d03aaeb5d3281568a1bce40f2d7e0832d0ef044d7b846b6261b4d2775344b0eb3f06d15b9560c1987705fb39fd53e7e9b36193
+EBUILD deprecated-3.0.1-r2.ebuild 531 BLAKE2B a49e2ad4af3580d8d1f697b132a72921f7f781227d45704870a40bb146bdf7ee3859851a434b0dbb0fe4cfadb4c59a836f4baf7286075e8366dc64f3a47026d0 SHA512 729ee62f9903356ea38d497c3eb64e05549fcb4410933cbcab295f8ea8629a37f70012cb275d6cbe597167d5bceb89dcc7bd326d92ff1a194d2981f353fef34c
 MISC metadata.xml 342 BLAKE2B 023740cc4b47464d12bd62564f728ee81cb9af6adb3f74d1dd6b32b54f1c8aa8f8e012cbfa66278a8b863c18f8cd0e05dee22405a0b7cf58e236a40236fd06c1 SHA512 93dc59b7ac6d9fbfee37c6a3977ca4b9d066a18564baaeacb395c5d66a4d6dc39c046a5da5daaf65380109bfd3cb89b3228383174a9f86304d7a86dadbd39e1e
diff --git a/dev-ruby/deprecated/deprecated-3.0.1-r2.ebuild b/dev-ruby/deprecated/deprecated-3.0.1-r2.ebuild
index e7b2be2bd8c3..090e96485494 100644
--- a/dev-ruby/deprecated/deprecated-3.0.1-r2.ebuild
+++ b/dev-ruby/deprecated/deprecated-3.0.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index 06ef67f44031..7fbfac7e2b3a 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,9 +1,3 @@
-DIST dnsruby-1.59.3.gem 233984 BLAKE2B b0aacb8ef028d5e6faa29e48a6a59b44d8d579b1b6d0f2490f85a3b8cf1e9bf9c65b9a42a37c832f7d61c1cef506bbec31eb54e17f99cc42b19bfa1b8eb50194 SHA512 7cfd8c15b7691b86473f46c6e28c751f87d63459104c2b550312a717c654c5013751851497e3ab0242202a813c2cbfa2d78cc414aa80641d47ca4b622e3eee09
-DIST dnsruby-1.60.0.gem 244736 BLAKE2B b69aeb5ff8e6f53acc90222271e3bb6c0ec81da7594ccec10df2814f732454c84c9b18ed94e805592e1a7401c657d2860234ca37f8fe16967371975bce3c3b3c SHA512 696f2cd72c09bfe6b6eecb59979f872843e7ebea320130edb86eb662ad8b5ad657bea0709614093b5dcdf6c95ebfebdae500ae5622fe999a4cdc03e1ad4b5fc6
-DIST dnsruby-1.60.1.gem 254464 BLAKE2B e6df02f6064ab36ebe60752f808100130df634b3938c3ac8a75b619a95738261afc87dd7bdb9abe67db32effebc9f02f6a88e8c2fcb9880e8629cddd24d93852 SHA512 fb84a76224350b01925e5a5e413ec08c31988d7cc5fc5e403aabb1aaeee227f926b267628e8438da2fef5d14facf6efe98bceb100d8169117119ef115b6d2031
 DIST dnsruby-1.60.2.gem 254976 BLAKE2B fa91e3994331fcb37650c905fb00cd58363ca9b90a3943934b2bb3de0ac82b9efeda418bba45673ec3911676dd1b68bd47d079c3ded201c190d17e2ee2bef0f4 SHA512 dcf191421aaf667f59baaa8098099c5532542e1b9e4fa6ad63a727361d985f14adb3d3fee4aef78c4b6ef8809fe06447ee60d7a220af93e57848a57e0ddfaa22
-EBUILD dnsruby-1.59.3.ebuild 802 BLAKE2B 361104526f11ef3146a6db5fdfd15be0373209b908537e562cee6d4c2d6c547494a8e2c824e7ebe60d0e985397fc276be3a2cc7e94fa5302b783618f2faec6d0 SHA512 fd48cb06c5ce079af0d2b211f4dac0ef3174e825afc898f0fae5f777dcf70ec46fc569ba11a2eafbe78afa060e6a7cd53aede3d9b96c5a8cc955a67cf8f3fdfe
-EBUILD dnsruby-1.60.0.ebuild 802 BLAKE2B 361104526f11ef3146a6db5fdfd15be0373209b908537e562cee6d4c2d6c547494a8e2c824e7ebe60d0e985397fc276be3a2cc7e94fa5302b783618f2faec6d0 SHA512 fd48cb06c5ce079af0d2b211f4dac0ef3174e825afc898f0fae5f777dcf70ec46fc569ba11a2eafbe78afa060e6a7cd53aede3d9b96c5a8cc955a67cf8f3fdfe
-EBUILD dnsruby-1.60.1.ebuild 802 BLAKE2B 569ae0e8e77f3d663ab6678627a21ec4356b37e517af6f596295a6f38f7a07e42334ec1f19dc958e9c6b5bb340730b6a9002754390d820a8711619f6e19863b4 SHA512 7beaa2740cc93d5b9f36eb2b3cbc7e0c89bf894f52e6a599f0d862e18c744b13e9ba0a40bdd17047b3518153a217783c2d1f049df355ef6b36a4569a35e3dac3
-EBUILD dnsruby-1.60.2.ebuild 802 BLAKE2B 569ae0e8e77f3d663ab6678627a21ec4356b37e517af6f596295a6f38f7a07e42334ec1f19dc958e9c6b5bb340730b6a9002754390d820a8711619f6e19863b4 SHA512 7beaa2740cc93d5b9f36eb2b3cbc7e0c89bf894f52e6a599f0d862e18c744b13e9ba0a40bdd17047b3518153a217783c2d1f049df355ef6b36a4569a35e3dac3
+EBUILD dnsruby-1.60.2.ebuild 802 BLAKE2B 66ba1eb5a8a48f3df819d15e0785ba52399a61a1a574b693d80db25e99e0df315d950166a93ad002c381be8b57400255b3eb461dc08344f042f309d7994cdd62 SHA512 4cd705757ee37462f5183542cafa9ffbe5ae8acb0f0c6abef60af4a48c87ccfe96cb8cb8115bb6505ef156e442ae8ef3b6498c8d2b1b28e627d5b0da7a992f86
 MISC metadata.xml 413 BLAKE2B afeb40e610311f15b7a95117ea91507e9cfcc0e26903cab7e58f0af5dfce580dd782e96338a8a6a7573cb3ac12497541c2c3284fac9f35b045d5a26608c5506f SHA512 4badb70d7bfddbd8d242d1b400672691ccf737a329e365321dc403dff791669417ba0b0df62efd1ad1c5946e11a7756b22a2790b171e3629d2d30ebfefc5c0f9
diff --git a/dev-ruby/dnsruby/dnsruby-1.59.3.ebuild b/dev-ruby/dnsruby/dnsruby-1.59.3.ebuild
deleted file mode 100644
index 7fb5a13a641f..000000000000
--- a/dev-ruby/dnsruby/dnsruby-1.59.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby DNS client library"
-HOMEPAGE="https://github.com/alexdalitz/dnsruby"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Cc]overall/d" Rakefile || die
-	sed -i -e '/display/d' \
-		-e '/Display/,/^}/d' test/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	# only run offline tests
-	#${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
-	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
-}
diff --git a/dev-ruby/dnsruby/dnsruby-1.60.0.ebuild b/dev-ruby/dnsruby/dnsruby-1.60.0.ebuild
deleted file mode 100644
index 7fb5a13a641f..000000000000
--- a/dev-ruby/dnsruby/dnsruby-1.60.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby DNS client library"
-HOMEPAGE="https://github.com/alexdalitz/dnsruby"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Cc]overall/d" Rakefile || die
-	sed -i -e '/display/d' \
-		-e '/Display/,/^}/d' test/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	# only run offline tests
-	#${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
-	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
-}
diff --git a/dev-ruby/dnsruby/dnsruby-1.60.1.ebuild b/dev-ruby/dnsruby/dnsruby-1.60.1.ebuild
deleted file mode 100644
index 9e6d41113b5e..000000000000
--- a/dev-ruby/dnsruby/dnsruby-1.60.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby DNS client library"
-HOMEPAGE="https://github.com/alexdalitz/dnsruby"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Cc]overall/d" Rakefile || die
-	sed -i -e '/display/d' \
-		-e '/Display/,/^}/d' test/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	# only run offline tests
-	#${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
-	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
-}
diff --git a/dev-ruby/dnsruby/dnsruby-1.60.2.ebuild b/dev-ruby/dnsruby/dnsruby-1.60.2.ebuild
index 9e6d41113b5e..b2e1dbe2e251 100644
--- a/dev-ruby/dnsruby/dnsruby-1.60.2.ebuild
+++ b/dev-ruby/dnsruby/dnsruby-1.60.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_DOCDIR="html"
diff --git a/dev-ruby/equalizer/Manifest b/dev-ruby/equalizer/Manifest
index 6446c60e457d..7b6a3a303508 100644
--- a/dev-ruby/equalizer/Manifest
+++ b/dev-ruby/equalizer/Manifest
@@ -1,3 +1,3 @@
 DIST equalizer-0.0.11.gem 12800 BLAKE2B e5a56aa1620273d393987da28b2a010f3cdf26c6abe2e31c4743130c6308abde8ef7656f3d8b3e1ec0ec8ad15a298af5548e31558213272120707c0f46218e8a SHA512 01273a8e83124178f5b7d7eed08a4ca6286772c26202e028fa957f3e9d655869c51a7710312a52bb654672c7cbaee5de15fa2eee01c5413f2589cf05e02700a9
-EBUILD equalizer-0.0.11.ebuild 671 BLAKE2B 1d33ee531d56a322dccf062c930e070d262c55eefdce36ae3b31b003d003c2f2dda7dc208e38d7c0969c61d02315b15eb6b9a69a3fd2eae8a5ec7dfae5f5dd3e SHA512 d218ceeb1b04498d817dd3af363dfafdeb1e3f8c4437c6f4316a0afbe48fa4bb40ff2a634ac9f946f4015a195d879f0494cb7bc5ab3ae13532f32b6eeebd2ad0
+EBUILD equalizer-0.0.11.ebuild 664 BLAKE2B 79823bfbe8aceacde05ee57e331dc13e7ebc41fb0c26cd6f5348f62b7aea4aab42fa3f3a37ef4dae74e6f2f50160886488474e34d5e5b6de4ac370d82849e8a1 SHA512 22cb168afdd6458d51368d4854319699d0bed5efe8a6d1de19d32cf8b67cb6f1367cd2bc71650cd101d72375700cb82eed7fd3faac2e1b5f0a7e570012a69193
 MISC metadata.xml 341 BLAKE2B 6279f462bb76a9da892158bdeb49d8a41f19efa9ee43f129809a11307959cb38cdf606322eacc0c6b74e62f53584d067d1ff002030963a8f026545b9317e12f2 SHA512 409b5e2ff7c9676a6d1337e8a284219a29060b42e0e547912722026e47c3218a8da7e4a30c809e6b30d6052d134366bd2241a41f705a6cd943835f28315802c9
diff --git a/dev-ruby/equalizer/equalizer-0.0.11.ebuild b/dev-ruby/equalizer/equalizer-0.0.11.ebuild
index ca6d5adf719d..338124a95a18 100644
--- a/dev-ruby/equalizer/equalizer-0.0.11.ebuild
+++ b/dev-ruby/equalizer/equalizer-0.0.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/erubis/Manifest b/dev-ruby/erubis/Manifest
index 253ddefde6ac..939a62757f8b 100644
--- a/dev-ruby/erubis/Manifest
+++ b/dev-ruby/erubis/Manifest
@@ -1,3 +1,3 @@
 DIST erubis-2.7.0.gem 173056 BLAKE2B b1059469b5d75dd71be32eabfae0f1715dca11b9c5eb79499a5a8835a4db44e8c2163386af1e4ef9cab8cecf4ae6f2eb57b5105d53d56e5784b06d65398b22fb SHA512 49b08b28656acaf3b0c88fe064bb0d5f79fd08b834d7eba9294217b0893c5a0244ac5dd54de0e52dd17e828a0110e54b29e8c2d75171d527da957917344a0f27
-EBUILD erubis-2.7.0-r2.ebuild 1095 BLAKE2B 7e41e641ec5c56c0070fb4330c0ceb38f9288aa518d8009f89e6d23a31d1852b5fa14f251fc4bd448a150f553c0c84b2b9c2c953bf36603f15f3765e430f71d8 SHA512 ace0520eaa526b979d2b69f99bc0efacd5b3bf7fbca313687bc3c432b3fe9f39ad15b6199aeb83548181244b1a3849a1be0bac06608068afc676366df3b63070
+EBUILD erubis-2.7.0-r2.ebuild 1095 BLAKE2B 24d480020b635e256046c29705d5bda2070145270c377072f63f7499e57d6bd2a6b544d37b12e8df659953702b4cfc34aa90afa4497d2df8f44dc003724a2b83 SHA512 a0954ab17ecafb772b584a94241fedaced15ab1152ff4f01a6b67754c0da30eec1f64a095b321abd75676f5e7b6dbc164c5f096bd067d26f817c62acc2f71805
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild b/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
index 03013316ae4b..58843580fff6 100644
--- a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
+++ b/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/escape_utils/Manifest b/dev-ruby/escape_utils/Manifest
index e75fa46f08b7..0909ede7964e 100644
--- a/dev-ruby/escape_utils/Manifest
+++ b/dev-ruby/escape_utils/Manifest
@@ -1,5 +1,3 @@
-DIST escape_utils-1.2.0.gem 26624 BLAKE2B 6c6c0050b3b9cb31e7a59621daebc07c85268aab344f0d54509259734b4fee167805991b95d3c717573b45661cc7d414a7204929abb4c5a2a372e48329ba526b SHA512 82548f9f81de9a77f16789859b24c77313ab7c8a5a8e2040eba9f140f60247a1f83946d320fd07a4afef670c53f3a2c86bf0b2085749d526e1442fc2fa9074b3
 DIST escape_utils-1.2.1.gem 27136 BLAKE2B 7b5be4ee381c4e42efa007bb50df31045f91a8fabf299ca726ad994dbbe469482d846c718b90657139d9b65365e9775b127e9e428200037240a158da1122ec6f SHA512 e410777cfdd5004168db6134f30a91e29b71136d3e7ec1a312f7307e0593c310230887a63ed25aa4f899b71b5cb78b15f833e4db6f1ca0cc99091ab0c0e6ba75
-EBUILD escape_utils-1.2.0.ebuild 824 BLAKE2B 8e85eea260f6805edab43618df0836e309b2ad973afdd79f20bf4b5e38052fda820d72c7b667f6f72cab5a9f66ff5f290243c004e22896ea454019d29069055a SHA512 e317778f77260e34385458cc8a570df5b680f86265f789a8e13f2fd3c45253229977733bd9a7b9c44a9ea352d27bffc2f394a2b9ec901a56ec58ac8b7723073e
-EBUILD escape_utils-1.2.1.ebuild 824 BLAKE2B 8e85eea260f6805edab43618df0836e309b2ad973afdd79f20bf4b5e38052fda820d72c7b667f6f72cab5a9f66ff5f290243c004e22896ea454019d29069055a SHA512 e317778f77260e34385458cc8a570df5b680f86265f789a8e13f2fd3c45253229977733bd9a7b9c44a9ea352d27bffc2f394a2b9ec901a56ec58ac8b7723073e
+EBUILD escape_utils-1.2.1.ebuild 817 BLAKE2B 610b44b249f868aff34b58420757ae3fb9e1d9fc0d02a76bd0093753754889c4ffe2d6c5b7f8a9da151417f4dc541f3c17f45aa2a3fedb6151157bd20a290902 SHA512 32687b5faa6650d206f35cf9457445b339161a6fc3fc02b0330875f7c1e79eee0806a6db3d6bbc522d680845765c000a9666dac1f8aede454bcf32177419d8ad
 MISC metadata.xml 339 BLAKE2B 47171092a26be3a97a42c5bd7b3a1ec9bba1b7f664fc3ef9acd69fc1bc29c302c55e2005b0d671e9ec42fdb36accccbf21521e50e45366f9eb028ace2c367046 SHA512 2e394c7eccb7025c28aba01ebda2f03425489d32848c20395fe92a5c69d569073448f8779deb0542c08f1ea97e7b4a097199d1b57c0ae798b6c77739d9904898
diff --git a/dev-ruby/escape_utils/escape_utils-1.2.0.ebuild b/dev-ruby/escape_utils/escape_utils-1.2.0.ebuild
deleted file mode 100644
index 8ff56821860c..000000000000
--- a/dev-ruby/escape_utils/escape_utils-1.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-RUBY_FAKEGEM_RECIPE_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Faster string escaping routines for your ruby apps"
-HOMEPAGE="https://github.com/brianmario/escape_utils"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" test/helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/escape_utils extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/escape_utils
-	cp ext/escape_utils/escape_utils$(get_modname) lib/escape_utils || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['test/**/*_test.rb'].each {|f| require f}" || die
-}
diff --git a/dev-ruby/escape_utils/escape_utils-1.2.1.ebuild b/dev-ruby/escape_utils/escape_utils-1.2.1.ebuild
index 8ff56821860c..47d3b010cc6b 100644
--- a/dev-ruby/escape_utils/escape_utils-1.2.1.ebuild
+++ b/dev-ruby/escape_utils/escape_utils-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC=""
diff --git a/dev-ruby/evented-spec/Manifest b/dev-ruby/evented-spec/Manifest
index 4236c311d36e..9463e26c1e94 100644
--- a/dev-ruby/evented-spec/Manifest
+++ b/dev-ruby/evented-spec/Manifest
@@ -1,3 +1,3 @@
 DIST evented-spec-0.9.0.gem 22016 BLAKE2B a8aca8eb4d5931b2deefef60d19d3cd4e65ab2c9a010f1b98bf07917ddaf644b65b321f90e81bbe097ce57b455f6bd87528ecc8f5a13f018b04b4f5413b3b945 SHA512 48c5de98aa580127c492d91dce709a4a3bf7449c2880971ad1b744345db308ba6b5ded8aff23b3f42794949b8474d35e5fe148bc7cc4f88f23980da0ab1fc064
-EBUILD evented-spec-0.9.0.ebuild 790 BLAKE2B 49853968458918391c213230be6cf0f969009fb42611ad1529ec5bc5b4b7dd2c59e01926f5a36d87fad7892892864373016788d78db113e8072fcccb64221f2f SHA512 786c38bf2acec92024158f181303616307c4f37d8fd9e9681101f4ef0dc9a2366ddfb6b688d5d00c47d656d31b1f7a4973b2ae436fb49c68a4c399e509b376f9
+EBUILD evented-spec-0.9.0.ebuild 783 BLAKE2B 0611d33ae553d47a88fb561b6cb6f500f3afe4756a49efdb8dc52da73426760f8b5ae10d232621287ddb5b93c2a49d937db76a875cf3d16b3d3b5e12566f6322 SHA512 a6b3cc59ba2db8315504267e5496e9d4af3f184ee35194ac9e9cf6f28ead4a7bb1cd007ca024cf0db2ecb1692ca36ff9dac141d1b8b618912d70494e1ef82f4c
 MISC metadata.xml 348 BLAKE2B 4245deb206984ca328f70713671db5f04189e3c12f01c40f43425b05fcc1d4a2b50f342407a58d4b30e7f6dfaee5e67a3546873f1fb0122cccf4118c286dd657 SHA512 ab9a98944141883fa0c4802d9d9d151efd80fc927466aae560526e84c84c8ccfbd6c5f229e34b913802085d838da52f05dbbee5888e60abbe5e6a7cecfe108d2
diff --git a/dev-ruby/evented-spec/evented-spec-0.9.0.ebuild b/dev-ruby/evented-spec/evented-spec-0.9.0.ebuild
index 218c23a62263..908004511300 100644
--- a/dev-ruby/evented-spec/evented-spec-0.9.0.ebuild
+++ b/dev-ruby/evented-spec/evented-spec-0.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.textile"
diff --git a/dev-ruby/exifr/Manifest b/dev-ruby/exifr/Manifest
index cc30ee5412d1..57a3f1618bfe 100644
--- a/dev-ruby/exifr/Manifest
+++ b/dev-ruby/exifr/Manifest
@@ -1,5 +1,3 @@
-DIST exifr-1.3.1.gem 226304 BLAKE2B 7c191c5985b5688529d6b0abf1bd03f5778b7322c0ee0891e978189f3707271e24064cfe9d3338a601f1079bf5477c34bfcc4bc6c62fe400c7c251a53f675674 SHA512 e2e2158bbd331525a1a784ef816ac1fc45a97c75252fb5a5e624421519184d58f74426de3f274cd827af48ff2f3dc6081e3e26a5765ef6eaf1c4545a40a58a7e
 DIST exifr-1.3.3.gem 231936 BLAKE2B 44958407a3f743a995b4ec28a287ea5352bf2da77362ce8e3cf61a51ef5b1d86836e64766a95697b4d3f142690d1928e11affb57fdc2568ee65e76f28787b0e8 SHA512 7362913874d4d78f8c5b7da7a5bc99a6f7bb120e58ebb67dc196e60bc7ac14243a2989a7e4e7db1853c71d09d866275d909c6407d72ec0271c34c1bb7f15ebc9
-EBUILD exifr-1.3.1.ebuild 507 BLAKE2B 5735abfcaf14e935180be3d64c04698ddf2cf1713de695036dfefebb26935e3d4a392c02bb4348b00e7f2755fec5973db960b03178bd124f2fd2ea69585aa7d4 SHA512 e6eac5baa6bc693b4c5a68271a57e4f87eeee33ad92c162039d1baa99bbbda5c07ec18ca76b17dc3dba9dad088650dfc415b3cb38ea861ce97ccac7bb882c62c
-EBUILD exifr-1.3.3.ebuild 500 BLAKE2B 58938a3cf8265ed1d674d2057f65aa6ff5f842575c2eb49e95df4913ae83ae6d4201b0f5b81f7fc721f3eff204011c71b480a03e4ddf51fb4b370f831af90a6e SHA512 a12c9d9629a14f47ffc17b8549e6fbd1e2a201de92ab6c6892f616152a0dd02e7c026943fb8faf9c68613ee18affcda25b761a4816f8bf970394894881e95a70
+EBUILD exifr-1.3.3.ebuild 507 BLAKE2B 25f2f0f228ac0822a9b1b6b15f96701667e4ac75af39f76969a3c0c020bdbe101cef7120eb7969f67dd949dc269bb65dc0a51250823eedb8c32427949754775d SHA512 961b7dc15cc92b4d7dbd889b3c0d4522780200aa27d1bb55ed439cc532043df7467bfd36fa2cb84b4f47e1bfb5b62ae302026792df53b701d18ea50ceab357c9
 MISC metadata.xml 338 BLAKE2B 47c3d987095290c119098638186a209bceec785b33cd6501a3a45c373f2e0a15f1f9da565b7b05c948ab9889780969935c631f418fed04a6b2d45d346e530f82 SHA512 76f53e033898bf27e6d8a3a2681dd5aa66f7b112fda61489397fb0a1205ac1c2e3a07007493d9de82e7ce5fa57b4f7452d214b6873f325fd0ff53d9730721bc1
diff --git a/dev-ruby/exifr/exifr-1.3.1.ebuild b/dev-ruby/exifr/exifr-1.3.1.ebuild
deleted file mode 100644
index 63c54ff4c253..000000000000
--- a/dev-ruby/exifr/exifr-1.3.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_DOCDIR="doc/api"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to read EXIF info from JPEG and TIFF images"
-HOMEPAGE="https://github.com/remvee/exifr/"
-
-# License is not specified in source distribution but is in the GitHub
-# repository.
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/exifr/exifr-1.3.3.ebuild b/dev-ruby/exifr/exifr-1.3.3.ebuild
index e76d8438a083..042c834dc241 100644
--- a/dev-ruby/exifr/exifr-1.3.3.ebuild
+++ b/dev-ruby/exifr/exifr-1.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_DOCDIR="doc/api"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
diff --git a/dev-ruby/expression_parser/Manifest b/dev-ruby/expression_parser/Manifest
index 6a22208256a7..28692749f08e 100644
--- a/dev-ruby/expression_parser/Manifest
+++ b/dev-ruby/expression_parser/Manifest
@@ -1,3 +1,3 @@
 DIST expression_parser-0.9.0_p20130518.tar.gz 4212 BLAKE2B 10974bff0b671f6105bc38356d1681e9673b96ddf62278b68e4327d5db8505d468a32699f15966b02600368f842b3baf4ebadb6eb203ee53c3568c2d7bc64f9a SHA512 d0d031570e99987a78a4285cfc5ebdb3ec517fbfdd053b7da3dae9c3f2ccf47083f0964b135f3c2501aebe44bd789f1a360cd386620a2f3585af014dd81fc474
-EBUILD expression_parser-0.9.0_p20130518.ebuild 631 BLAKE2B 6896361e74e7487a19052b7dcefaba2a8c717a33b65a0e686ee1878afb043d999ade93e95d7c0be5d6b8c862a6ecfe6f2aa2a7c6c432c86b10483f8f119eb353 SHA512 1db50e92573a1f04e1a5a3b60785761943e847b8814a050a058b4ea817967045133c719f0e3b2521d3621eed14197561a95fbfce2084af0970ec2bba86e5cb2d
+EBUILD expression_parser-0.9.0_p20130518.ebuild 624 BLAKE2B f7f807c224c57c6de053ad4c8ba35d4cc7772113c300c72cfb58fe3d0a11de965ba1675a4062485a7fa5441d624ffbfbb81d3058fa71ce5db45a3235853f53a2 SHA512 770e506cdc8a04c71ea8c89dadff910ad417c1fd5d4266f03ceedc72306c7511e7c9905827ba7c370c8c69897ffab7b4f57202f22ae5851345400278fd012cc8
 MISC metadata.xml 352 BLAKE2B c91e2a8f30d8ba651b4beffe3c0238504224f5657909bf8ebfc11181714858bcffc26d64bfbf2c99e58a68a61a0f262bd279a73e87e81025d4544306c855859e SHA512 8dc7c99a4c036e1fc2ab5c899ae70984456c44726fb8f20be2cff28df6acf93bca56a7231c79f8526be09189136cc29799727f4ca01a594fab18dcce3195cc24
diff --git a/dev-ruby/expression_parser/expression_parser-0.9.0_p20130518.ebuild b/dev-ruby/expression_parser/expression_parser-0.9.0_p20130518.ebuild
index d12985f7d43e..c02d830b7298 100644
--- a/dev-ruby/expression_parser/expression_parser-0.9.0_p20130518.ebuild
+++ b/dev-ruby/expression_parser/expression_parser-0.9.0_p20130518.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/fast-stemmer/Manifest b/dev-ruby/fast-stemmer/Manifest
index 33267bcac307..419fc75d6984 100644
--- a/dev-ruby/fast-stemmer/Manifest
+++ b/dev-ruby/fast-stemmer/Manifest
@@ -1,3 +1,3 @@
 DIST fast-stemmer-1.0.2.gem 11776 BLAKE2B 090f7a9bd63fbef2c9ef84a7089c7a4881f69f9d77fb8f90377424f1417e97a636d956c4ed646b1f45c25abc1ac16a7836ca70ec1591659e77242f11b6368e60 SHA512 7a7a17c62ecc9ce6eaaed9d0783f161c53c5c6faa07b7b0577da5a46d4539bf3880f71e4e9097a489c045222738d0441c322fb5cef5e02a1483405f815a81b29
-EBUILD fast-stemmer-1.0.2-r2.ebuild 699 BLAKE2B f3af36b42e1853fdecadd3d670abd01ab2e6f329409f4270b720ee7c63b303c99673fb18aa161778429c7599e21efe677218516389a6ea7372c2aa606a70c953 SHA512 b665e1b68bccfd6145337bccebdecb144fc58142d485c572c0035ef11de03a90a0aff380a7241e212b7392a66f63719c8cfc4e5256b8b9e6d7148439eb9ed04b
+EBUILD fast-stemmer-1.0.2-r2.ebuild 699 BLAKE2B a25d04536430f2fdd8789777e6be041d60e2b91f345e77e62352dfb4e710e77ca836de356d690c89ac46ad2bfcb2cfbcd5a80b3b253524ed50f0816fe98bf0aa SHA512 562e48342a14cd6511ebf177d582e58e5d40fc1ff0d6bdd878f0879e4686b50c01ba65797d115d20399ef2307976eeebfd46c8c293eb631dbf86a3373f6a5296
 MISC metadata.xml 347 BLAKE2B c8b2b78f8daa0e489cb2c2e644c2bdc7056ba7b3719f270307b0df16a6aa684c99d15d48c1a9eeb1edb30c51d446db0afcfd0f7cf8ea1617e21b7b1c1ac66b31 SHA512 a2863465c22556e4b96e34ce8f1db86e25ee2049a24feda43ee5925406ef1f356c071faf99b71a83be56084587db9a0ba8eaf49d23652f5fcd16b5c22fe77439
diff --git a/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r2.ebuild b/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r2.ebuild
index 8adccc30aec6..d796080adec1 100644
--- a/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r2.ebuild
+++ b/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README"
diff --git a/dev-ruby/fattr/Manifest b/dev-ruby/fattr/Manifest
index ffb7768ca822..d9e89f5b5459 100644
--- a/dev-ruby/fattr/Manifest
+++ b/dev-ruby/fattr/Manifest
@@ -1,3 +1,3 @@
 DIST fattr-2.3.0.gem 12800 BLAKE2B a9ef3e7d69c52193c65139e647f22e99bb8e0f65b2970b26f34c453127af7a4d4c9cbba17627462241b163fbdf654cbb46d2dded2a62a76e0b1abcf04b24f185 SHA512 620825a4659e30402e44d077fd60b4b2260fe3eb7f28c87ca26f61a6be3a2d4e96920ca1d89070dbd90e1d5d760632f6e103766dddb38a8eb1fb104c6b261baf
-EBUILD fattr-2.3.0.ebuild 595 BLAKE2B 18ca5be8a447c8e22fd1def5893128b6a3c47d28716f67d5a65889f5a2a5253e6b608ce8bd74040450f9394804583c5a33d7dff9cf1ac0f07bc66291c84a049e SHA512 38eec177b3d83f42c8b7d6fe8e962edf7009b76f8ae91aa22ff289af267acc1ccd067640197423b01bf442e43a69a0623a47b6b88524e9fa89f7f365b691a17a
+EBUILD fattr-2.3.0.ebuild 595 BLAKE2B 2bacd7d01c677ba61b184b6a1bf25e62df5dc971bbd0942ab23f160337da2bd7bd0641f740412596bb194c0ca5417f9d2a4bed37e2d388ddf402e5bf8222016d SHA512 5b8421fae13c8f9632fd3eb1463d2e40b716bd50fdddf83949a682b6ae19fad05aeb1d9fbd160dc7a0a2a38c7f663bc459410f77d97f40af2615923aad8c9152
 MISC metadata.xml 329 BLAKE2B 5c6fe8fef48e0020f35b06c9c43b662d71af522c4173cedc90ddcf99b43d8d9be89586728c7ddd149c9fea559b801e5a1ae63d96afba45f31518ed7289462a6b SHA512 5c5fd73903762213cf979cfe7e4483f565237ad38be42c6478a23ac48f944a2ce66629d81d29e4e51b9fbecbaa374ed8c23c0b352c56d1b2390d14615f4393e4
diff --git a/dev-ruby/fattr/fattr-2.3.0.ebuild b/dev-ruby/fattr/fattr-2.3.0.ebuild
index dd702ee80c1b..2a0c2f23d0f5 100644
--- a/dev-ruby/fattr/fattr-2.3.0.ebuild
+++ b/dev-ruby/fattr/fattr-2.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README"
diff --git a/dev-ruby/fcgi/Manifest b/dev-ruby/fcgi/Manifest
index c63662efecc4..a30c2f618984 100644
--- a/dev-ruby/fcgi/Manifest
+++ b/dev-ruby/fcgi/Manifest
@@ -1,3 +1,3 @@
 DIST fcgi-0.9.2.1.gem 15872 BLAKE2B 1f3a9cfa79f06a655bbe3ecd36be8b650f7c1f856f84f82502c87c06f43ee9c91eed75e5441c65a635c700b8c682745f631e3268701555268eb3a1568347573f SHA512 1ffdd429ce4f2bbac771b7ac2368a5194015a7327b8b43b803914257edc174235573df6bb41a53fb71db0bf179fc24ce2392b244b5b55563d67e045c47da8579
-EBUILD fcgi-0.9.2.1-r1.ebuild 755 BLAKE2B bc76d8b245a5243364cd90b91713cb8f779fa0d029b1a48b27423811eb7e24cda7a60d7505bf44dcee37243ffa6ba294e3095d7459249c8f64fdc145a5aaf424 SHA512 7eb256044149849e7aca5b242c47fd612f3829a220aed2161d2174dcf99977af1c68d123c3f6fa78c1613028826a4e692a90c0287aa4def786e071602c32dfcc
+EBUILD fcgi-0.9.2.1-r1.ebuild 755 BLAKE2B df6227e9e77fc692af0b733e8008f8b224b8a7ee9cd412949e8ccf50495f4ec53e066dcc119bed999c43ea589985df9158e86fbd48df095f1ce7c30b14ea7903 SHA512 afbafcdb13aac0847f07a3cac11d3558a7052f8e31413417882511b389b7b1fb35e3b1f98d15efa346be08e71a4943a705701d5f80d5b8b59a7dd2b45a777102
 MISC metadata.xml 347 BLAKE2B be2e5312191991db7af9e245a07250e10b0c1920e5eb7992a138fe201ab62a5bdec42c1f740c9e1a2c4920c8e7c2311b65e24e9a2d0dbbafffb3dd54beeb3212 SHA512 121248020ecab7831fd87ef528e334ed5d02b1145abf298e83192242fc96c0de018d12f2502ed991d89c3078bfb8f983409e68ecc6122e389215566ac6964ace
diff --git a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
index 3bba360d3658..704b0eb1c9ad 100644
--- a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
+++ b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/ferret/Manifest b/dev-ruby/ferret/Manifest
index dd890fb5f98e..ce76677a9455 100644
--- a/dev-ruby/ferret/Manifest
+++ b/dev-ruby/ferret/Manifest
@@ -1,5 +1,3 @@
-DIST ferret-0.11.8.6.gem 617984 BLAKE2B ab665956ae05c1b2e09bdedb2a86991216585c525440977c58c053651e29c64804edb94dc054041446f1dc7832808caccc5a4d9054c45807b5bb3e41b610244f SHA512 bc545dc86abf7e818791f4f280025fd0a6ca3aad66fc4f4c6a532e995d718ee4adcdace15538cd35e068887ade059c874d8b6d72f5b02f98829d6db44b019c59
 DIST ferret-0.11.8.7.gem 608768 BLAKE2B cc5e6769dcad4c465ae00aed972712e03ccbea304608eef5008941d5bf1eca17461f611aea7f0033d4047b7bc2474c0a93ffece40b4a6aca753a496ee34f36fa SHA512 ac7cafa25ade9741e0eb95d7372f6dd7ce4ea82368c69ace536b852fd5cc435d05764041ba1bddcc6098665c6e1aa7a12ac9739e45362007f726f3e7a8124df1
-EBUILD ferret-0.11.8.6.ebuild 1233 BLAKE2B d565076b09dda409064e554f6217f2191449bc9a4458377d69ba92d81d4536e7912e63eaae25108085f7d4fc82441f2e5cac5773716938e4f18e413725405dd0 SHA512 0bdadee28950fc1ec3cc05bee3ccfd1bf9704efe53c5154527d9c8d62a066939ad4388a048a8ae731e090e7d8a408218d009598e21a7f8422bdc20154b4890ad
-EBUILD ferret-0.11.8.7.ebuild 1239 BLAKE2B 3dda2f4d35d6c35c879dc9b9e027c627391f9bc0450f8b7ad34d2655845f03e61c61f810c9081ccb32fb49e3934e0db06e4f7df05d9dc6f095e0987901aed386 SHA512 69907b1814d102250f14d4edc43c6846c539a93a7eb33cebf22e65061f8bc1069d93cbb97a12ebead9b4aad9467b399f72e9bbca938ed4d99251303ee1c5e744
+EBUILD ferret-0.11.8.7.ebuild 1239 BLAKE2B 4724426552572c4795e4ffb137142db85970e37d5e380ab31ebdee2633f4a8161f8b8416d5c7c6b98a8e8b6663ac363b1bb2e90f54c8b0620ac8733d98793718 SHA512 dc2b2cfcd15290edceab1fe8042a0cdcf10a34bfcd3e3361053608ab1f2651112bf6e9d608372d945b70dcca6e640596a9830ed326147301758fe210f88b6db8
 MISC metadata.xml 341 BLAKE2B 777c08ae812adf375e78b531692036faa01a37660a883b123d8461d5c3ddff9c70878a3a695a23666f75fe57ee5450d54adf7f61bb05a6be9f879bb5ba14e398 SHA512 bbe210c0d097134af3f5489b4a5cca742cff83ac41b8fe3ae9086a1d9cd38210af100bc778a9eb42273c74936d5c3a8f42866ba7686b6fae1afdd04a5e46e450
diff --git a/dev-ruby/ferret/ferret-0.11.8.6.ebuild b/dev-ruby/ferret/ferret-0.11.8.6.ebuild
deleted file mode 100644
index dec98563be5c..000000000000
--- a/dev-ruby/ferret/ferret-0.11.8.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_NAME="ferret"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_DOCDIR="doc/api"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG RELEASE_CHANGES RELEASE_NOTES README TODO TUTORIAL"
-
-inherit multilib ruby-fakegem
-
-MY_P="${P/ruby-/}"
-DESCRIPTION="A ruby indexing/searching library"
-HOMEPAGE="https://github.com/jkraemer/ferret"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND+=" app-arch/bzip2"
-DEPEND+=" app-arch/bzip2"
-
-all_ruby_prepare() {
-	# Remove bundled bzlib code and use system version instead.
-	rm ext/BZLIB* ext/bzlib* || die
-	sed -i -e '14i  $LDFLAGS += " -lbz2 "' ext/extconf.rb || die
-
-	# Avoid test known to fail upstream:
-	# https://github.com/jkraemer/ferret/issues/2
-	sed -i -e '/test_adding_long_url/,/^  end/ s:^:#:' \
-		test/unit/index/tc_index_writer.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
-	cp ext/ferret_ext$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test_all.rb || die
-}
diff --git a/dev-ruby/ferret/ferret-0.11.8.7.ebuild b/dev-ruby/ferret/ferret-0.11.8.7.ebuild
index 0093bcfed420..aa53e8d7b67b 100644
--- a/dev-ruby/ferret/ferret-0.11.8.7.ebuild
+++ b/dev-ruby/ferret/ferret-0.11.8.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_NAME="ferret"
 
diff --git a/dev-ruby/file-tail/Manifest b/dev-ruby/file-tail/Manifest
index 35f12051c65a..35f59153755a 100644
--- a/dev-ruby/file-tail/Manifest
+++ b/dev-ruby/file-tail/Manifest
@@ -1,5 +1,3 @@
-DIST file-tail-1.1.1.gem 23040 BLAKE2B 4d1036a603dfda906bd607950e84649cd80bff5a6eda59c47ba00e0c0b0d3647f40694c3fb8826922d83b210b53c689d8a3c456fdf3e124900fc3dd766070f16 SHA512 fa9fc8a0826ca001ba775110a534dbe9f5474ad43d60a2fc3b67badaced170b099a5dab3a6499415d9ffcc493c37436b7a964d34268de053ae6d8acfe55fa42d
 DIST file-tail-1.2.0.gem 19968 BLAKE2B 8a9ef8b73d2e7c8c21ec04e817991ebe40ba62800e565b607dbae9732b0192074cff4b3fc9dc7a495be9a2315eab63b48126e524091d72b37f7e8261cb1333f1 SHA512 ac20e5e855144f7462ef0471be08ab56e521a7b22117f1653e06624e1d81ac11d047a21a6979476bc8547dd88d90f25e51052950148acbe3ea64bdd3c35e1da3
-EBUILD file-tail-1.1.1.ebuild 705 BLAKE2B 2a7ee22d53ea23042a74f2ff6238efd49afd411bafb4de964f7cbec826331aaec6e9e09d3903f1caa33c7196c115bd4349fb264e1d63ea08f6d429285fe17e06 SHA512 9d21d84792af0ed05f8fa53a04b10a30e43a0ae257068536a52704c889638ebd0006d9bdb585f6e3bf81882f07ee3fc5360dd4cf477482dd71ffd1cc3f123f7f
 EBUILD file-tail-1.2.0.ebuild 701 BLAKE2B 5909c055d297d64ce8ee691a2e64aa5f8df577a03db4814a789aaae230b40aaf7a8275b4d0eb24f3cd0a86c92b10398c29069f06ae981f3edf325259bd6eb316 SHA512 fc84714a6478344396ac92e6d21677bf1fb453ee50ec28e698d02cc5dc67c96d2109585d3d78f44c208803ec18c9ec745906625533f22ded45df8bcb523b40f8
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/file-tail/file-tail-1.1.1.ebuild b/dev-ruby/file-tail/file-tail-1.1.1.ebuild
deleted file mode 100644
index 03c52caf14d0..000000000000
--- a/dev-ruby/file-tail/file-tail-1.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOC_SOURCES="lib README.rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A small ruby library that allows it to 'tail' files in Ruby"
-HOMEPAGE="https://flori.github.com/file-tail"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/tins-1*"
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/filesize/Manifest b/dev-ruby/filesize/Manifest
index be1ba8f2fb92..7da4ee59a6a2 100644
--- a/dev-ruby/filesize/Manifest
+++ b/dev-ruby/filesize/Manifest
@@ -1,3 +1,3 @@
 DIST filesize-0.1.1.gem 8192 BLAKE2B cf2edeeb5b0b1954c6a2233dbf43356c639f611ec289b18f73043f17b26b57611c81da1707ee4c6bb0ad65bfafbf9e9212398af184f3eafd53b290d70b80129b SHA512 2c7e94feb2433c9a1c1545e817616a7551f5d02f441b2564d96499b8fea0e47b74843b3d06d959273fc000800eea87bb7bc1c643369a4d724b8ba19b53de6283
-EBUILD filesize-0.1.1.ebuild 476 BLAKE2B 090527daf6380feecbd0498854691cddcd23d0f80497edc15c202e1a7f8bbdf96a3e395a33afe576704b2c8279607a1ba8ed834c25eb9416344d7c13fc770881 SHA512 4649407306889b8c02e654ae951daf15092661801ffac14704f97ca179730318ffc2c8046cac1cfbd65602f49a55d918d04612347022710467d7cd2e37079583
+EBUILD filesize-0.1.1.ebuild 469 BLAKE2B ecdfdf42127f31ec4823b123ff338b7ba98d7c9f92ca9071d77e9c14d3d53e66f1c6c82a965a1afa11e85cb151f80e92e0a2c121ba1717147d18ff7a49355fdc SHA512 e233f99fb2324e049cd4c1584724c924575fca53eec873a2b48ed00cd057f115de3625f57de5e56de1078f49f1f1bebb42e24cefe7e6a94b4df732514fc54357
 MISC metadata.xml 339 BLAKE2B 2b3c4c1ca6967c5239e5ec31066d83688ed6e39f275a7854a719a43abb5b5b727eaed7871aad811210a3f28c8a9feaeae733e20004312b3b181e8a0c083d49d2 SHA512 c9d62aa7db2c89e1e32501ea24446828019ee082219f74dba9206b3aacf3bf2fa07d1035997ce1209e6e8f10a06b7661d5cc7fa6acd10f80367a6938119f3cdc
diff --git a/dev-ruby/filesize/filesize-0.1.1.ebuild b/dev-ruby/filesize/filesize-0.1.1.ebuild
index b2a0a5432b3c..553f32950945 100644
--- a/dev-ruby/filesize/filesize-0.1.1.ebuild
+++ b/dev-ruby/filesize/filesize-0.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/fivemat/Manifest b/dev-ruby/fivemat/Manifest
index 1cd9be4a4efe..1baf2c4d9b4d 100644
--- a/dev-ruby/fivemat/Manifest
+++ b/dev-ruby/fivemat/Manifest
@@ -1,5 +1,3 @@
-DIST fivemat-1.3.3.gem 9728 BLAKE2B 39324dfa83ca9fb16a2a248c4796361537df7578764f2ea0a88d6be2850c2a4725d9fbc7bbf5c7ea65395681898df594fc5d893b6601e63c48d7144449fb979c SHA512 d120a834a4110df6f32d2aaab5a8eda83ea18bc98ce54550002d498763fa54e09f2b757ca1f1627280efa88c56197650fd77ccc30efebba1baac3b19f0f77bcc
 DIST fivemat-1.3.5.gem 9728 BLAKE2B bd95cbac081e32df6c03a89d2533d20f8e892a575e1cea3679c3599a233c6097ecd03d4e804ca78be9d32de49759f3b03407f643ac14eeb5cf31e12e2bcb97ae SHA512 c19f30708cc2fe3cba045333eab7409049013f04f273606fe27cfc90eadbe68feba4b1e2c6a0d7a2183e637805c2fb8921a7ffd6d895dc746efabebad6189a7b
-EBUILD fivemat-1.3.3.ebuild 508 BLAKE2B 74a6fa6a8deedaff7711557836d21e183e370015c82ad74d1d13313942eae27a8318e64f12de539273cf04fc91669a485166cb2f8fc713504d9afa419acc595b SHA512 9336adcd88dd7579acd1e5e4a12bea1be83c48aba972c732f33b690a6b59d27be6182a767244d2f028b625efe02decd1be6052c96560540a97ea9ce86b8b84f4
 EBUILD fivemat-1.3.5.ebuild 508 BLAKE2B 1dc5839edd9483a3ec7769a9e9126014cf06c74d8b6c30da3b7c2009eb080c977a1cf7ac6f9e45fe3f9524ab60eb0d0cafa526b975487c8f11e54030e05ef9d8 SHA512 7137ed94caa07a9fe1e00096534a2163a4d07db43e7bd1067f47dd419c2c819ea2f3f4218f47e2fd1dbd06b813fd1c4a25ec4c00942b3343540c609af908e5d8
 MISC metadata.xml 453 BLAKE2B d5b612779d204d4d7a8ed8a81b18e462806aece4f6f5211247c4a2f3a88733dceff699a777298bb07a0ffe4a406b4eec8102b5373ac7ffabefedee9acec1b2ae SHA512 7549f9ec77dfea3eb0c8044fd8c81ea4b1bd268f22fb8bff02d6a41202b94f567adf2af89f4eb7f102eda5fe40a35b82b15ed89c18c0b12e3a607e8b1c55f5e0
diff --git a/dev-ruby/fivemat/fivemat-1.3.3.ebuild b/dev-ruby/fivemat/fivemat-1.3.3.ebuild
deleted file mode 100644
index eabaa43d63b5..000000000000
--- a/dev-ruby/fivemat/fivemat-1.3.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-# Package does not contain tests
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="MiniTest/RSpec/Cucumber formatter that gives each test file its own line of dots"
-HOMEPAGE="https://github.com/tpope/fivemat"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/font-awesome-rails/Manifest b/dev-ruby/font-awesome-rails/Manifest
index 720410b4cff2..359f2ad06a2d 100644
--- a/dev-ruby/font-awesome-rails/Manifest
+++ b/dev-ruby/font-awesome-rails/Manifest
@@ -1,5 +1,3 @@
-DIST font-awesome-rails-4.7.0.2.gem 637952 BLAKE2B 988919646a931d3e3cb1b34ca070ced68e1a1a83015d2d8312a0b23a5810b9f642465d31b2f5154cea2d73a36980306353db0c3a929f518c0904fb88b2bcc1cb SHA512 8a6f9663c775bf44764086c85582158c00f9e0a0ac023d9247b62bd79d2864954efbf4235251a2e97dc5981f48581b520dc4323739e748da62916c21311f048e
 DIST font-awesome-rails-4.7.0.3.gem 637952 BLAKE2B 783a7dd495f12da569924f32a381a6a3767b06372c240f69b1f94a3569ddcc7ca239c729a7dcdcfb9af4e8f3c73c6c74ff134ba590ad9aa7e060b6bffaeb3d09 SHA512 b4d9c45dcc6b3ffa1175fa2a2d2727e50944c62af70798fef70645749a2a957300a8aa9011f8e1a8cc0471e0880db352390917f118890538d8408b2965b817aa
-EBUILD font-awesome-rails-4.7.0.2.ebuild 507 BLAKE2B 496aab73ee010e3c10b42f03e6f5a0df233205f511908821642ffd8c1dd0ba380b7266b88453a3d34f8df4bb2da6d222eaaade26dc4ed56ec1ece3d132595a9d SHA512 fa3b99fe04ebcbbca27e33f2a5c5e26bf854c51d8110279650c550e17a6021d8b2e1788d0a34495bbea00ebbb153c90baa4f56597d60db07b7c7c62a930934bd
 EBUILD font-awesome-rails-4.7.0.3.ebuild 507 BLAKE2B 58bf2e56a725484321eff6dc3ef772d8f6a50803b79fcdd48af8af2092d13f966586789cc18c2d0a1ca4449ab51f9213a4767bec195a1366cf40dcb4edafa5a1 SHA512 dcd8f887297bd5d39100d8a06861edc485aa4aa543d3b934a4e6a8ac3497b421f705611b7c619adae4dc79299aeb900c5b2b47f75bf560fa9e9f6b4fac39222a
 MISC metadata.xml 402 BLAKE2B 19fae051a5a4cfac29c1e758ddde9a6e7d84651197fab379d1c4151c020059b118f4315fcf179c5545b209cd1b84715b3568443821d89ad8cc2f09e8adfbb3c8 SHA512 bfe7b861172d217672aa5de2699621b309e733255de720efbdc740991206e546666a4af42f26f45253dacce55d3db377a0cadea7cf15a34df8291e0e7184a5f4
diff --git a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.2.ebuild b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.2.ebuild
deleted file mode 100644
index bc6ca64d6ace..000000000000
--- a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Font-awesome for the asset pipeline"
-HOMEPAGE="https://github.com/bokmann/font-awesome-rails https://rubygems.org/gems/font-awesome-rails"
-
-LICENSE="MIT OFL"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/railties-5.2:*
-	>=dev-ruby/railties-3.2:*"
diff --git a/dev-ruby/forgery/Manifest b/dev-ruby/forgery/Manifest
index 496e1a76e5b0..238365a6f895 100644
--- a/dev-ruby/forgery/Manifest
+++ b/dev-ruby/forgery/Manifest
@@ -1,5 +1,3 @@
-DIST forgery-0.6.0.tar.gz 40185 BLAKE2B d47930dd22682390df16fcc0a6339289a87801dd95cd7116e999c2d372c5e09d7b2e743f88108c98da44232a43195d29bffc7cab91f01239e9b2d50022a9f3db SHA512 8cafc3e91c87ddaadffee1d887a8993595aea9499d8db21e18374db62596fac35e9ca868e6d8d3bd3284c9ee43f398a5bc986737440c7a5b70bdd795ba04ae97
 DIST forgery-0.7.0.gem 47616 BLAKE2B 6f9a95770512213240659c55a8d9b72f4fbf9c39cd598253f151a5bf0d6e81604e279a5a47b41a8594ac42ab200238f6fafa19b8e9c7fdab74c10bf5d2855221 SHA512 c1f540f3640b99e2a574d0f677d2fe76b554e4ac0e15bd9c27c2648909e86ab972be0c65682e16db34abff576a6b1ac975ada8d39c87c57817e903aba36982d3
-EBUILD forgery-0.6.0.ebuild 611 BLAKE2B e4bc1b9ff515466f24856482e6d73d62af6822fbe974886c9d20ac9050fa345d6c5362d990dd56c3aef4f4227d2e3830646d169de545d8d74c7e3f9ccf5eac63 SHA512 c0fd12968074dc50fb0c47fc7e9312f7f123776bca45e2ffe8200f858eb52faac38ebe6db2061828bbf11b2e77ee55a6ff9173594174dcb84d9dd89e55a04fbf
 EBUILD forgery-0.7.0.ebuild 522 BLAKE2B 7f713b3480ab7191685e07953117e06d55689d0a4795254b3f004e6d4c5b9f5bd60fae86c489af36935be0f6fac8ddf66882eb538c29e5b93eed917f7c7ea774 SHA512 26ed2fe474c1d08ebd6efbab56c4a21acd4bd4a46f2a9209b6e3ef97919574e61208c8cf6efd2bca2c6191b3e7b06667b117455c7130568fd745c02fd4e4d6bf
 MISC metadata.xml 343 BLAKE2B 47afb567985edec58caee293848ea44ba91dc53c3adf5cb19a2765c7bfea9c1391b2f75ba22c14e3a379cd4e1077c8cd32421ae27cb5a1149ef02bd85571d891 SHA512 a4a5d4c05618ee70f5aaf0a5f0050593482a441fbd2c6fd4ca4f2024228544dfba2da8e06c3b9b0b712adfa53c4928c5386c5b29fff7b74f272044efe06da94c
diff --git a/dev-ruby/forgery/forgery-0.6.0.ebuild b/dev-ruby/forgery/forgery-0.6.0.ebuild
deleted file mode 100644
index e64f3b2e6a74..000000000000
--- a/dev-ruby/forgery/forgery-0.6.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Easy and customizable generation of forged data"
-HOMEPAGE="https://github.com/sevenwire/forgery"
-SRC_URI="https://github.com/sevenwire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/forwardable-extended/Manifest b/dev-ruby/forwardable-extended/Manifest
index 16bd75cc0189..77aaf69369f7 100644
--- a/dev-ruby/forwardable-extended/Manifest
+++ b/dev-ruby/forwardable-extended/Manifest
@@ -1,5 +1,3 @@
-DIST forwardable-extended-2.6.0.gem 6656 BLAKE2B a1484b088fc2e77f2b40efb6d054c9d79b486d1a6c6c7e911d29550dbd1137f7fd1bb5f10d9c617a341477da13f58b7c12e416a4f4b49a64c025ec562423a483 SHA512 e78eed0d6e06c0db4c692718425aa92bb0d87060fb3cc3207c24d9105437caa2d3c421867077567e87cd462e8d6c2f255b82e14e2249b224e5eca2c2240355b7
 DIST forwardable-extended-2.6.0.tar.gz 6602 BLAKE2B 2ad027f671bb308a02de8b0620df9b9dfdf49d08e9f6fcc6bc60becc57e3e7d184d131a2acb689d08dec26c4ec004f5791b4630ab653f974a0accdbb5f46331c SHA512 23a682e06ee823b076d6b9925a1ef4ada4f1fc7fa63b02d1b9122485204b62f55c191866170b63b34891934c762ac903df46bf5a2b17055d7504ee7a70627a8b
 EBUILD forwardable-extended-2.6.0-r1.ebuild 753 BLAKE2B 23fe84008c7ec6269dda860ea82d1dcd4b5b813ef395e8a535e4a058678092490646b59734b6364285c24351c6df25effb5e7fdb58f5abae30ad25dfb0062d2f SHA512 019ea8b9cc4e26f5f5c0525bce5b8989af1be0f286e8525afa6d379a8046e8ae084bf44d1cba9f218f70cd5fea1b37eee141abf7c2c3b7497e3b40f8a25152fb
-EBUILD forwardable-extended-2.6.0.ebuild 458 BLAKE2B 065e2744fe33ec3c7622ab32c648d084687051643164fa77a0b0aa4d826631144e9c7cd41ae512213fc78e0f5d99fbb2a37a3083fa2f20acbf763f847b820e59 SHA512 db8ec4ae096709eadee8c9e9bd2ae6434759c15ce2f4c0c6b9b1191a66b9994e7fbca65aaa67e0fa6499884ecc7ff25c073401b9321854c4f6dff2c70752e21f
 MISC metadata.xml 420 BLAKE2B a8eee09dc7ebf7ab036a2c90207ab3cf040d7022bb8b6786a915bb4a04b1e1885000c16ce20c81abf57253900495f63b46865cf418b2b4659553525f85e3b161 SHA512 79be9859ae890718b7b75b27279f1e7a2651b1f1b55c7ce6bde87605ff589afce1a6478e5411feaa305d4ee933a7d9545d718250d6e734615be703c333c917e8
diff --git a/dev-ruby/forwardable-extended/forwardable-extended-2.6.0.ebuild b/dev-ruby/forwardable-extended/forwardable-extended-2.6.0.ebuild
deleted file mode 100644
index 94b598c0863c..000000000000
--- a/dev-ruby/forwardable-extended/forwardable-extended-2.6.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Forwardable with hash, and instance variable extensions"
-HOMEPAGE="https://rubygems.org/gems/forwardable-extended https://github.com/envygeeks/forwardable-extended"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/gh/Manifest b/dev-ruby/gh/Manifest
index 69c3d782d78b..83be1e16431e 100644
--- a/dev-ruby/gh/Manifest
+++ b/dev-ruby/gh/Manifest
@@ -1,5 +1,3 @@
-DIST gh-0.15.0.tar.gz 64056 BLAKE2B 3b389803813c97d142de517b6a408bbbd3016b660543bf84d96bb4ebb42c27a6e4930f88d86b58fc5761268fe8da77817dd94e5d29e13e8805e180da50286e61 SHA512 d191477b368536770f021c7897d0c6e57c5ff4945ce4e936d9c6d13174508e1fd2d63dd44f18b106bca9c78e4e5c23bcaba19633588029239300b3a93e326599
 DIST gh-0.15.1.tar.gz 64076 BLAKE2B 3611d83d9414349284bbaa7618aee2c9b5cb4c6db98e506891f70cf0f21dd7f25ae87e9f8094a90ec4ed4f62ba1e05bd598722a743e32abe54e7eb2a002d9d72 SHA512 6b8a43360253275408ff3d0f6e8cabe3afe399b4ed362f9b4ded72a9d650d18483cf5e3d10877a97c9112b7ccd5add5f2c9999ab1cd5f8102af3a9e49ef39037
-EBUILD gh-0.15.0-r1.ebuild 716 BLAKE2B 6a1fbae1ee603d398e4c68cc16a1c8c46a1ecaf0e8f699c4d97e47d6a8ed8078d362695c858511650a9b24037fe83844769bd30171ea89d1b81decdb6b41b52b SHA512 1519363935e399fc267ab05911c439119fa7651845f69fa23d8748e17eec5d033e862e4f33c897a2535f6bd7cbeafd1b9116552020cc5b4d88e2d7c0d00c4acd
 EBUILD gh-0.15.1.ebuild 716 BLAKE2B 6a1fbae1ee603d398e4c68cc16a1c8c46a1ecaf0e8f699c4d97e47d6a8ed8078d362695c858511650a9b24037fe83844769bd30171ea89d1b81decdb6b41b52b SHA512 1519363935e399fc267ab05911c439119fa7651845f69fa23d8748e17eec5d033e862e4f33c897a2535f6bd7cbeafd1b9116552020cc5b4d88e2d7c0d00c4acd
 MISC metadata.xml 328 BLAKE2B ffcac2532a59009124144d5a974ab68f58c35954d76523766184eadaa5ba9602d891c433f40e830cac3d5acc8ea80fe516b5ce69df6e2240454e5ec1d9f198a2 SHA512 827f41487bb4442546ace9b648b2153e910f4e38a9d3edb1d2c231add2ea537c6318da7c5f0b4ee48f016c7c0bc62fba36cf4745fb96f9ad90890b97049d9d29
diff --git a/dev-ruby/gh/gh-0.15.0-r1.ebuild b/dev-ruby/gh/gh-0.15.0-r1.ebuild
deleted file mode 100644
index 9b66495fbddf..000000000000
--- a/dev-ruby/gh/gh-0.15.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="multi-layer client for the github api v3"
-HOMEPAGE="https://github.com/travis-ci/gh"
-SRC_URI="https://github.com/travis-ci/gh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "
-	dev-ruby/webmock
-"
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.4.0 =dev-ruby/addressable-2.4*
-	dev-ruby/backports
-	>dev-ruby/faraday-0.8
-	>dev-ruby/multi_json-1.0
-	>=dev-ruby/net-http-persistent-2.9:0
-	dev-ruby/net-http-pipeline
-"
diff --git a/dev-ruby/gnuplot/Manifest b/dev-ruby/gnuplot/Manifest
index 92738e975638..f0191d50bf17 100644
--- a/dev-ruby/gnuplot/Manifest
+++ b/dev-ruby/gnuplot/Manifest
@@ -1,3 +1,3 @@
 DIST gnuplot-2.6.2.gem 13824 BLAKE2B 5fe89c44bcfc8f73e4685fbf8300b5a43845ed8292db84bf3b21f884656a8cf29623bdef37fd4aebbb54ef1a582567fd2c12029a2e4584a92b52f66dad3b8e4f SHA512 bcc9dbdade4fdcaa590006ca925c4f1eb71b4c7d6235c948266a185c937d991ff559a1749f33993baca4437252afdfa7bde1a43c6e05dc6f180e9e7b06a4a8e6
-EBUILD gnuplot-2.6.2-r2.ebuild 752 BLAKE2B 720068c712c1107e245f8d75a566399abcc23dc352c413f0f5f2fc7b103b7a93c52c3d141092547631807e7605ac75e94dc871139365a3b0a887c933f1e95a36 SHA512 a8fa160c4f2089bfd659336f1ad8035f83587cbd3f997aee7dc6f28f6a9f7f7172180986ff663b8f4edcc370663c9d8092875e41ab6f21ab955708ef96ff3fe0
+EBUILD gnuplot-2.6.2-r2.ebuild 752 BLAKE2B 3a51923efdac43d36ca4c852b2025ca02be01a2f00cacc624348a39f0518439997c1cda9902f8883d8299aebb126587b834016af6100072217a4d0b860723bb0 SHA512 b5d52d73ac1b9f49667f4dd8c907f7ee1909d18b1025cf64f91036f342c4a4f5cd22d8c5a2ece7543998e7cc43bc7e4d9933504c99e1d5449ed4ae365b624c50
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/gnuplot/gnuplot-2.6.2-r2.ebuild b/dev-ruby/gnuplot/gnuplot-2.6.2-r2.ebuild
index fa596d4e083a..7d1de33a1f42 100644
--- a/dev-ruby/gnuplot/gnuplot-2.6.2-r2.ebuild
+++ b/dev-ruby/gnuplot/gnuplot-2.6.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="AUTHORS.txt ChangeLog README.textile"
diff --git a/dev-ruby/hashdiff/Manifest b/dev-ruby/hashdiff/Manifest
index acc37e84983f..263c0a511c11 100644
--- a/dev-ruby/hashdiff/Manifest
+++ b/dev-ruby/hashdiff/Manifest
@@ -1,8 +1,6 @@
-DIST hashdiff-0.3.4.gem 15872 BLAKE2B da0e6352a0f2f1ed778dc383ee4e23af7737f001fc98b0c222e8b8b600c60551667c4b320ce856693d444dd124e190132b54a629f32c54d82a3a99e07440d349 SHA512 d1315b4010d2ed444ab257f13d949bb46924ad2d6b6d397cd496a297a502ceabc1518d077e137992443234f292489150cc21dcbc348358b22ef6d6741144b7b6
 DIST hashdiff-0.3.5.gem 16896 BLAKE2B 7784035a9c7fcd68d178c0a1690fc435383960791554283d2aceba3ed19100617c646f5c00b30ecb13113f9a39257d7f5611538b86e1a8330b412bc0d909b0aa SHA512 f1ab73ec017c82ec1494e81c3c362244bd43734b295061e5220492b93517ac3a7f8e18a11b595160aca79f9016783291a10cde0a6a6218b08f9ff2f231f9f328
 DIST hashdiff-0.3.6.gem 18432 BLAKE2B cb7fc00fc39099ca624177d82129f27ab51a660a0363c3d4a0ed2d1f3ae8b92784e401b3a5eb17f8e798246f1b19bae37f12aba5a4c742a500ea3342658219ff SHA512 3f8c96bdeff00a8b45f7f065274fee6510b22bc2ca98cc20b84b2b9804ce9d81e730519591448179ff3ca763312eb238680baddc212392e8640205ecd9ba24c3
 DIST hashdiff-0.3.7.gem 18944 BLAKE2B b7d39375a0c688e4fe2672701d87148b6ff6ee18fcc58b68f71a4c449613c124022538a04ae9a995d2d20e9d40e0ab263664f1085dc205286a3bd3595c83c760 SHA512 62cbbd1631127f98be214ab5c849d4a78c9f9aa762e372412a68f843df09caa9bb3b8ff096952ff4fe5b401dc8fefff7e42c2d1beb7e647ed9216550ecd06d93
-EBUILD hashdiff-0.3.4.ebuild 558 BLAKE2B c16c96a2b8be47bcd69376a54738718117288562f44a70ef8e5b6c8c0c0f374f440c9e6e234390efa3e70051be1dc42bb313db900b0a7e7cdf03c92d08c4aeb8 SHA512 f72fc4a48c814d38db7c7891cc6bc14770533d5a83c8e684b89f25f5aac1dea28d71e112b830603639a734ed5d23983472fb70eb84c5d4842675b0c10cab19f5
 EBUILD hashdiff-0.3.5.ebuild 642 BLAKE2B c214db22967099a62f40716869e84e8f8b2746b07528494f1851c9a6b413dbf84cf06f5e56261accebd7143cd6fcda182f23700c45a31e1afdc3af6367d26007 SHA512 b70af5ac0b9879d0c8fa165dfd9d642d80ea8e6a7f43823e2b65ff3bfdf221c00434ccaffaa0012a93f0149cbed100a31192568742393145ca517ea46d9a144b
 EBUILD hashdiff-0.3.6.ebuild 643 BLAKE2B 46f56cc3cadc6a62b12ff6d35843331b8d9788fdd5fc27530316fd8ab92457f0b1060b8c43f70e8aedb6e3305cfb95ee77e0557aa12d7106e0a98986c6714a87 SHA512 b20e150e15577224de50d73c4427110a38986d45b942486aea13f01cb9bbd96063206a7e7503bcec260602aaab341f7b975abfc7e14d5d7e8fb4d28acdb125dc
 EBUILD hashdiff-0.3.7.ebuild 643 BLAKE2B 46f56cc3cadc6a62b12ff6d35843331b8d9788fdd5fc27530316fd8ab92457f0b1060b8c43f70e8aedb6e3305cfb95ee77e0557aa12d7106e0a98986c6714a87 SHA512 b20e150e15577224de50d73c4427110a38986d45b942486aea13f01cb9bbd96063206a7e7503bcec260602aaab341f7b975abfc7e14d5d7e8fb4d28acdb125dc
diff --git a/dev-ruby/hashdiff/hashdiff-0.3.4.ebuild b/dev-ruby/hashdiff/hashdiff-0.3.4.ebuild
deleted file mode 100644
index f7735362a2a8..000000000000
--- a/dev-ruby/hashdiff/hashdiff-0.3.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple Hash extension to make working with nested hashes easier"
-HOMEPAGE="https://github.com/liufengyun/hashdiff"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-ruby/hashicorp-checkpoint/Manifest b/dev-ruby/hashicorp-checkpoint/Manifest
index ae468d49d515..42f68eff726e 100644
--- a/dev-ruby/hashicorp-checkpoint/Manifest
+++ b/dev-ruby/hashicorp-checkpoint/Manifest
@@ -1,5 +1,3 @@
-DIST hashicorp-checkpoint-0.1.4.gem 12800 BLAKE2B 2c57ea2ddbf1ecfdbdc8d737368bf62cbb20f8eb6578cedf7e2043615294b25c543187f327095ebb0eba9c2231a5b0d2ceb05b38dce8aabdf5e00c0868657f54 SHA512 095c9ad9bbcfb8152da501e4f92e36f0efd1d74bad202f196e326e38d6c91945081029cca65871930db62a118fd7ad642ed34d09447ee0a706bbb9f0dc0c2c77
 DIST hashicorp-checkpoint-0.1.5.gem 13312 BLAKE2B 4318cc7748797732ea3719965debd9621136a097bdc6a9bc6577d563eb69c4bbabe8451396bd9281874c1b4adca690fe443f0a98eb10857b1f6b561aa732b508 SHA512 77effab526b798da1739c19021f3832bea7aab9503a159909a712f18da7a0cc6d750dd0783c2bc5a31f650f00f0a65dad706e2159882bae70dcf7425fdb35a40
-EBUILD hashicorp-checkpoint-0.1.4-r1.ebuild 487 BLAKE2B 7694e9721d2ce10cd251683d31ec828354939aee071fddec0ec8fed6d1b8c43667e254f9cbcad5d0b608ea88357f3082d64ddca32790a23503f2845402d171e9 SHA512 627aa64516903450371c992c25bd76a3ace0d94ff86df7f6ea2e0893093c70ac1538ea17178ea578b01abe205d502ac1ca37a9e409632490f246cac01c472a86
 EBUILD hashicorp-checkpoint-0.1.5.ebuild 480 BLAKE2B 9ea19ff743d36cb58586c1317d954d8522f4ff95a9f2bfdcfde300f75e5e7483a62316a021fb67c04a11d526960aeb11b9f5c45267d790da55fefbad07613801 SHA512 7d02d41157182a11412feb028dceb95d1e523444b94d6fcaf55ddf383246f0c99ef81c960a5b64b115ec5d78098b5d641035b30e03abcb49bdbeb0baef537b7d
 MISC metadata.xml 409 BLAKE2B 0ba3acc92ab47129d4ae090708140e5750749af66a918204f5bb7c567b6203410ab0115739f935f029baf30795838061f6704dc87ef7e244373c4c2eb4d24efc SHA512 82d03ce257da30b8ec8180a668d6a1fa9773e42435403bf3224f73d91c0a25fdc9329b76b8e268b1fd68d114e0cd7741a9613f9acbd770c54613060e2cd06063
diff --git a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.4-r1.ebuild b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.4-r1.ebuild
deleted file mode 100644
index 193987182180..000000000000
--- a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Internal HashiCorp service to check version information"
-HOMEPAGE="http://www.hashicorp.com"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/rspec-its )
-"
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index a89bf68b05c9..9dfcd6dbdd83 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,13 +1,7 @@
 DIST hashie-2.1.2.gem 34816 BLAKE2B 7406fece6c731f62ab8b73095b6c61d4d79cc3811ba20db68d2d6c54a780e8b37ce92ffa97ddc6c9ae2b802fbdbb04cc0d9c752761c9032739f3548f05696757 SHA512 6f72998710da58a2584939b4e74a114ae54168902020dc16ec5ea0422a91316b84aa6835fffb36a2985634f24ff5b0d01bcdb50134a414a269a4881ebcd728ac
-DIST hashie-3.4.6.gem 62464 BLAKE2B 4e9913141cf49573badbd492a6902f1323fa8caa092e520fdfd470a048479e27fe39378527470bedd3e80dfcd9f875f533a011abeededc235e84100def6d055c SHA512 68782865411a21a32e8b81f5d1dd29cdd9e934ffe18a7222a9631df00275cb5ba6c6cfd8b87be510a0ec202e9286660c17e4ead6e35697bb15b8c72b30971797
-DIST hashie-3.5.1.gem 66048 BLAKE2B d3fdae5bb5e24ba16bd3a277b182a7382a4b0a3fd4fc91ca10b8a6bc1d945829f9f16777daf0d3376692f05897246c9ee933e148a03e3c294e1eee46f89439fb SHA512 73025d479ec379a7afdea161208f66ae3b7a6c29ac3334fe31ce116edd40476432307950433dde40a86b8ef547313ec3d1ead495ff8425ea957dac3e4287f2f4
-DIST hashie-3.5.5.gem 71680 BLAKE2B e956e0dafb2a020075486d7ca1129937963754b90b29034353e7cf1eda7bcdab45253fd6e91344b97905e25fb26661fc696a12fc8ec11dd504b05db3ecb1caaa SHA512 60853f1a0ef274a6cd5b13b6a4085c11d867a0e5a83ebf1f1b210b7635db5789cda515710e2b794e67933f71a579a41b75923e6aff872389b205caf04c4ecc3d
 DIST hashie-3.5.6.gem 71680 BLAKE2B 51029f134abbc2b1894ca06e74d355f11cd507d720278b8aee7bad0ec49cd883868f48d2f3569bd62b4a5bd9b649a986a6afbd997fb06dfef03b2b8483c83746 SHA512 86d9ff56ced3a9458d48119f928be565d2022ee97424d864166e908e2cca7b2155ffc5d35af14cb33741aedc88435e2c5f7d3cad3e98e0ce4e48469673615572
 DIST hashie-3.5.7.gem 71680 BLAKE2B 8f03e190cf299f3597e0fe1b991fd07e00af0ecff757ef56648f97e8a3091a1445441d4e00f59c9b93d5db0d21636d9e5352175e49692f7b28a5612c87da9163 SHA512 c7ae610de5fe9b19a724068c26c184b44f951b29b56e3c5240074a372ad24d0ea70e39541812cbd82d5516d9e00e86a33d935b90e086b7db305b9b34b8f44f23
 EBUILD hashie-2.1.2-r1.ebuild 713 BLAKE2B 0f27740d0e8be35e6278f7b9abc832bd099e85cb539d7294bddeb9cf7d8d322124ad631000da5dd8caf416f090a56b09ad8cee5fdf79f53a550a133ef6c9f3ad SHA512 1ebad38775161f73e659e122f107f8a30971128d2c7f884b559915cb49e6d6736ca3ac7ff949952de3398579302294cc23e050e96e7d53e870ed52804d41af15
-EBUILD hashie-3.4.6.ebuild 1111 BLAKE2B 1c8097cd52e80ea8b46a8a15e550efade6483d28f3cf31f2c799baeba08685c7e59f2797eb4ac8a6081c417d7925dfbcf337b1170df6a2f4f416f758bec1fd94 SHA512 2034f02b61952f3df23630b439eaba93e91ebaf6fb6387a8ae4c212d91397dd4801d3a3a7e63c6a98ee9a6b566cf064d500a171bb868b50867855590fe4626de
-EBUILD hashie-3.5.1.ebuild 1214 BLAKE2B fc4f3cc3855f275cab8501127a86a148a3323921a838ff0a49c16eca26db30aca774d8dd45da4179652885406bf8caba7864617d62c78fe76c601ac7cb3ef49e SHA512 16928f7923b6f5365fa13cc8266c0d4bf58bb7d5d7732e9e0abf80e4a748bbc9678f5f2c80fb8b82bb3ad99ec48719d98abd7cff16a7002eb5e09da509c64853
-EBUILD hashie-3.5.5.ebuild 1257 BLAKE2B 2ea55ba47d692a159c87334217774512a45b145d9cfdc629b8571d1f62e0582ccb6d012b6b05bbea994cd95c7452fb2c6897fdd140fd40d578179109fa1df5bf SHA512 bf731211540d4466a04c391a90c3e5d393443c2982fb615d23883db2760a7aeb2dc665d5eaf870ca08eea56ffae2f40fc1ba40d3cdd8920141c6b6f8cc6c0fc6
 EBUILD hashie-3.5.6.ebuild 1257 BLAKE2B df39d8e186861da35eda6b600b1c7bc82d5af77c62f324910b4be23cf8a748eca4ed75458cc37272e82350d6a33d5c29e636f9dd219666cafa4b60361a8dcd4f SHA512 136f5be7455079b5e65f1a3320874bf66c1483cd00a0305043d183f76864891a7db1af9a56f028d871f5aed93cc6963b4212410d1db7f4c02bf02f1fef0d5df9
 EBUILD hashie-3.5.7.ebuild 1250 BLAKE2B 9d9d4dc9389e8509c2be5810b08adb8ca19171a4519670ff42400de6289b57099384c266572feb5d05b08b4a9c9c171c08828049f8e4177a6efb1b9718be7fb8 SHA512 cf157a51b6d3d5cc5eddf7f1d9725c3591b7818321f96d181351a1ae9c4abed945e63153fc12444f1b083484fcf102cdd91c8cea4520a17ae8c001999676f7b2
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/hashie/hashie-3.4.6.ebuild b/dev-ruby/hashie/hashie-3.4.6.ebuild
deleted file mode 100644
index 4c7e58f44501..000000000000
--- a/dev-ruby/hashie/hashie-3.4.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
-HOMEPAGE="http://intridea.com/posts/hashie-the-hash-toolkit"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	# Remove bundler and fix one spec that depends on its requires
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -e '/pry/ s:^:#:' \
-		-e '1irequire "pathname"; require "tempfile"' -i spec/spec_helper.rb || die
-
-	# Avoid dependency on rspec-pending_for and its dependencies
-	sed -i -e '/pending_for/ s:^:#:' \
-		spec/spec_helper.rb \
-		spec/hashie/mash_spec.rb \
-		spec/hashie/extensions/strict_key_access_spec.rb || die
-}
diff --git a/dev-ruby/hashie/hashie-3.5.1.ebuild b/dev-ruby/hashie/hashie-3.5.1.ebuild
deleted file mode 100644
index a49c6d6b05ba..000000000000
--- a/dev-ruby/hashie/hashie-3.5.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
-HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	# Remove bundler and fix one spec that depends on its requires
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -e '/pry/ s:^:#:' \
-		-e '1irequire "pathname"; require "tempfile"' -i spec/spec_helper.rb || die
-
-	# Avoid dependency on rspec-pending_for and its dependencies
-	sed -i -e '/pending_for/ s:^:#:' \
-		spec/spec_helper.rb \
-		spec/hashie/mash_spec.rb \
-		spec/hashie/extensions/strict_key_access_spec.rb || die
-
-	# Avoid circular dependency on omniauth
-	rm spec/integration/omniauth/integration_spec.rb || die
-}
diff --git a/dev-ruby/hashie/hashie-3.5.5.ebuild b/dev-ruby/hashie/hashie-3.5.5.ebuild
deleted file mode 100644
index 6820a40ff438..000000000000
--- a/dev-ruby/hashie/hashie-3.5.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
-HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	# Remove bundler and fix one spec that depends on its requires
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -e '/pry/ s:^:#:' \
-		-e '1irequire "pathname"; require "tempfile"' -i spec/spec_helper.rb || die
-
-	# Avoid dependency on rspec-pending_for and its dependencies
-	sed -i -e '/pending_for/ s:^:#:' \
-		spec/spec_helper.rb \
-		spec/hashie/mash_spec.rb \
-		spec/hashie/extensions/strict_key_access_spec.rb || die
-
-	# Avoid integration specs to avoid complicated dependencies
-	rm spec/integration/{omniauth*,rails}/integration_spec.rb || die
-}
diff --git a/dev-ruby/hashr/Manifest b/dev-ruby/hashr/Manifest
index 1f0b20f03627..d6e8efeb31c0 100644
--- a/dev-ruby/hashr/Manifest
+++ b/dev-ruby/hashr/Manifest
@@ -1,5 +1,3 @@
-DIST hashr-2.0.0.gem 10240 BLAKE2B 2f05f7dc71e868cfe835eafe73c4a22851360b6e1aaab78f676d5cf17840c6ab511f911ea7e29baf629885f54bab40dfc80ecefb0ac4a65855284e7f35f51418 SHA512 7e1e4c443bc974d09f0d34b8592e9de7f994e472dc0f4a8aeba40bf7ca23adf4723c8565fd1205d959b5411a7499121c6dc1a79819361244edbf8fd8cd593463
 DIST hashr-2.0.1.gem 10240 BLAKE2B 14455589acf3ffead6aa21ee9e789fe94c60f90beb5aeb451ac68bdf3637dc4f94c58d4b287aff5835a0bde7205172bffab26e86356105786994540138288e3a SHA512 0b79b32d857b4d6352de18ebfabf51b4af610f2a889088028d938afa8f38d4a3e91f285c3c39f120e31a92373d2eb2a92386331c082810c101fd035ac32c685d
-EBUILD hashr-2.0.0.ebuild 556 BLAKE2B 22feb809bac30afb9b64a3983c03c73d311738fd9d8ccda2a045b6621ed0de0ec9879f2c927e070c92146e2a9b8f543f6cac404abe4d5c6f4f6774cff8213312 SHA512 8dc7061b1017aefb1321e77c3e6af88b67e01b7edfae0c06d5857685a5d82b2ea687f2fa2bb5c522fea6d794125f0eb91a0318594bcf105e23eb973bbc0ee870
-EBUILD hashr-2.0.1.ebuild 549 BLAKE2B 023d9a537a40745f1c8ab7e1af616c49183c9eddcc6ddf1fa13e53922b6e171ec39c359a092b552c22ee843d5973234d6d2860046800278b9bf8837479cba21e SHA512 6de1806e892c55e521b5d23782d3f4fde8ee077eca61e556aedfc05f1c410231050300fcfd7d109c80c9def2effab698f3e4706c2fc4efe7af7910927734bb46
+EBUILD hashr-2.0.1.ebuild 549 BLAKE2B 595bfc5a56a8092436beff97c4efe34a9971b80c698c45b2790e6ce36acb795f810f6f68d0d84e15b1fff84fd565d5a7f8c9be8f1c6b86c562903bfe4892c392 SHA512 2166d00b9cde3fb65f605a433ab8d38ed8352bf4c8878d08d93dc49521fd14f464337606baede287f79b2809314a83a5e56e090f28fd7067fff8751826bfb9ee
 MISC metadata.xml 341 BLAKE2B c352c80b2c1c901813ec3134967762fe4ace93faf7df9f463a5f578fe4ac2e5333d02227ba90fdc80632e1738e71ee775b979c5327b402b561424492b9ca6be0 SHA512 d232e215ce6fac567bb951e321201d3af857999350dc4550e067d540ea93900fa5132efbec244f2109643dec807e93fd21ba35973eb77a3bdfad9ef18ba76c23
diff --git a/dev-ruby/hashr/hashr-2.0.0.ebuild b/dev-ruby/hashr/hashr-2.0.0.ebuild
deleted file mode 100644
index f1d747b97cb3..000000000000
--- a/dev-ruby/hashr/hashr-2.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple Hash extension to make working with nested hashes easier"
-HOMEPAGE="https://github.com/svenfuchs/hashr"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '1i require "spec_helper"' spec/hashr/delegate/conditional_spec.rb || die
-}
diff --git a/dev-ruby/hashr/hashr-2.0.1.ebuild b/dev-ruby/hashr/hashr-2.0.1.ebuild
index 733478574a00..f313d1487bdb 100644
--- a/dev-ruby/hashr/hashr-2.0.1.ebuild
+++ b/dev-ruby/hashr/hashr-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/heredoc_unindent/Manifest b/dev-ruby/heredoc_unindent/Manifest
index 89d998291cd8..99d42463331d 100644
--- a/dev-ruby/heredoc_unindent/Manifest
+++ b/dev-ruby/heredoc_unindent/Manifest
@@ -1,3 +1,3 @@
 DIST heredoc_unindent-1.2.0.gem 10240 BLAKE2B 2d29e85e03b4da87277e82ad3c7f85f8c4f4063651a5e1aa9931ae257c8e3416b6feb6403ee158b2fb6bd4bb0b6fcf00a09bf688b3ba3acc76b5000639a7c248 SHA512 a975ffdc2ae3716a7fb90145270df03d6f3d45d42d3fca3125044a2b960a9c8ffc74a7fb0e315b6021cb6ce535b08207a40351573ed89c27fe0c8e196ea02c76
-EBUILD heredoc_unindent-1.2.0.ebuild 729 BLAKE2B dbf2550106131464a5f3118e6de620242f077aa72003d4ba9d832602d4ec8c71e047a4a83bdedcf010179480f9de16c571cb0117dc2051bff3dafd50711d77c9 SHA512 1103a8a2613a829c6674b3cb8edc5fed1d91ccf0f101465685339ac2615c1d405e7b7e7cd4d0a513dc89a36a9dfcb56dd5bede9196efa43dbc4361016638fde9
+EBUILD heredoc_unindent-1.2.0.ebuild 729 BLAKE2B 22a7106d77ce56ddf478a559776392fece58379be6e81cc803cbab14afe56aa6e23d4408270c12c379c2abff52e20d0f9b48d28280704ea524a1f3caeb5d0506 SHA512 59a4e0641ba99c136bb1262b4a6192ea0dedaa29d9a9b1214b82fa0d3829b664d09bf260472913c5f7633e15e476402d739fe1105e1d07ed614701af1fb060ec
 MISC metadata.xml 355 BLAKE2B d6f3b21bb4e87e3eba58668a666a27da2fba665c0c96595b438564fca3fc691be1f8a5335175295617a18b3a77ec0966db5d9304de89859af6bdafc301379739 SHA512 bf551d4c3b25ce65b832a8d23fa0d333a79fff8b0681e975cb237367f0470fde3ee8a37f3df81d292915ece3a0bea6246de190880889d0f739870e106ec36978
diff --git a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild
index 012ab7aa143c..2bcfa3518155 100644
--- a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild
+++ b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/hiera-eyaml-plaintext/Manifest b/dev-ruby/hiera-eyaml-plaintext/Manifest
index 1c41f7acdfaa..78c7b8bca63c 100644
--- a/dev-ruby/hiera-eyaml-plaintext/Manifest
+++ b/dev-ruby/hiera-eyaml-plaintext/Manifest
@@ -1,4 +1,3 @@
 DIST hiera-eyaml-plaintext-0.6.gem 5632 BLAKE2B cb9c721615ac68ea5a6ea823246b5d0234a4b0d4496d89f345956109d8bba2f0977f65af14d628f22f4457e710fe603e0cc1447d386c2bf8a47d6a5844d05365 SHA512 a6f1ccc5fb7249ae973aac0920b2eb14aa2b3472921cba50f4e9b791107cd5b2245b7d0f7533c66a84caa0a3f4bc1fb044983ba0b0dadd9cc514686dfd62b32c
 EBUILD hiera-eyaml-plaintext-0.6-r1.ebuild 439 BLAKE2B a0c89b63e22a7307cf040266add38f2f3cd95bbd2d0e813cc2ff45a7b119b6f62c77b40180c0057df81657ba9d0a4cb8f66acf4f3f5ff3d4db1e112b74f19732 SHA512 c83fb343031ea0f08412488e38982f7202dba7f84cf8213ba53b02f1ccad256c369c3b7f3e955e3eb3bd4034744097111ea0c408ce5fbecbd0942c677b716e04
-EBUILD hiera-eyaml-plaintext-0.6.ebuild 432 BLAKE2B 5b69dc1bbd963310846037f598c623cbf57418995e64bc84ebc3f0fe13cfc7493e30b8e9ebafa211705399081fc7cbed08faa07aaec46e12445315ed9870fc85 SHA512 6c347674e2d5b941279ef8bf14ef105f1d70d17c59176619e27d8c90d7e7c11ad5ee3eec8ce976ae34af40e9c94f0e32ae779e96ffb8f0addba542759e755d44
 MISC metadata.xml 484 BLAKE2B fd47877f3ca990e923842f8392c590b2469e73a2b709a16729b49314f7887d9ade58e68b96096d55cdf043ce1fd35be437b8ae56ff32974fe5d1dd2f048000aa SHA512 6f1b9003ae433d669b44a581b35af9f4fc6de6f27ddffa8c193dec349c72c05cbeb07bf2f97d99b2154535404337e5e361f2cd61ad5026639baa0a9477febb28
diff --git a/dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6.ebuild b/dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6.ebuild
deleted file mode 100644
index 0cd317d776e3..000000000000
--- a/dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A plaintext backend for hiera-eyaml"
-HOMEPAGE="https://github.com/gtmtechltd/hiera-eyaml-plaintext"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index 54baaee90528..857d08f0d720 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1,3 +1,3 @@
 DIST highline-1.7.8.gem 224768 BLAKE2B 683fa70e3ea4bf697ab5a1cd40da2528e2586f8fe12fb0ffb799938f2bfa2efe64fe1424c0ee1f90ae3df69f86a92f44eebcbb2ab34f18b3c4cdbb143e596067 SHA512 85f57ab732009cc961b824e252f0b65bbe7c0a8c97849d453773a331016b2ea8fa0efe393bc1a0073eae6d3cf523d97b9434cd73bdceed55bc069be0b6f4b41d
-EBUILD highline-1.7.8.ebuild 1257 BLAKE2B e24011a6865ca8dc7daf3fa43b915b0e3c99ebada9ba93b3d03ee13a243600721ff5378c6e3c21e8b3923805a060ec1c2996dd09ff53f16d41b3e41a1a006069 SHA512 da1d84301f2f9caa99d52623f429920679ec3a458ebc6a85ddeb4a1297f72b07fdba4c4f74cc0d12bada3d203355dd79c4b923b27f1bcb69a9e3bb0c2b56a60a
+EBUILD highline-1.7.8.ebuild 1257 BLAKE2B deb0d4c65d9f398f6439b807382fdc2443c36ddb71afad3836ef39c903cbb2d1f1672dab1cbb097b5ca573e0567edae4ff3829eb3abb5ede257052c0ca30caff SHA512 38fce67ec881c2252937c9bb06692fc8ac5ec79a3e742d4ded53b2dfc60095f487f543de74d55359cee316abd3ae690c2874a2ada699b0b31ce9f610a0270f4d
 MISC metadata.xml 339 BLAKE2B 58671f84213ed36194c80df5fdac1618917b26161ddf8a8829980f5ce7e7aa242c84d17aaef0be655a36ccdad24d93714ccd6875fc073ab537c2186e33da5e8a SHA512 723488f3e201d857ceffdbc6779199469aea1d3d21a391c5bd5ab9402388e6c32e4964491a609d7065d0684a256811be04f2df20b3db745d83c4cb8bd769a945
diff --git a/dev-ruby/highline/highline-1.7.8.ebuild b/dev-ruby/highline/highline-1.7.8.ebuild
index 40f101e3ce0b..b96e814ec0af 100644
--- a/dev-ruby/highline/highline-1.7.8.ebuild
+++ b/dev-ruby/highline/highline-1.7.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.rdoc TODO"
 RUBY_FAKEGEM_DOCDIR="doc/html"
diff --git a/dev-ruby/hike/Manifest b/dev-ruby/hike/Manifest
index 25841b474564..c1359a7ebe42 100644
--- a/dev-ruby/hike/Manifest
+++ b/dev-ruby/hike/Manifest
@@ -1,5 +1,5 @@
 DIST hike-1.2.3.tgz 9010 BLAKE2B 1f413b0b11c0f562458aaa7b334a334d42afc706eb448a555534eb4021ef453a98f1ee05221ec9ac152d74e04ca543efb13a339b0b074354920e9dee4ee65b4f SHA512 0d7a35c0f9b4f5f1f99d4b2b753244cb712ebc24cc54b366c60ac6094a2ec693df86443e0b4499358cdd4f6411347ad80e0fc90b5fb7f4dd9b627832b645adcd
 DIST hike-2.1.2.tgz 9111 BLAKE2B 025e54e3348384d5a5d12d58014cea797a3cc5183450a2cda6cb7568406939f4437f8a574db25457840dd20a6264c5d0b6584702dbbed595f6984ba9f501c034 SHA512 fc05b6ec5676d5b6d12273688b0f98cd01784e201947293c5af92c637adcd9cd788fa9a696d6439efcc9097e540160fb96133dffd85289e498042acce8ca0c97
-EBUILD hike-1.2.3-r1.ebuild 719 BLAKE2B 1fe41f6d192ccf561567aea4f14de625edd353c3c01673ebe12fcdf94a4e5a2a46058398d57b271da29327bffed4c5ecad2bd361da45500f3f30755de1442d76 SHA512 12e7f0dc1486c9e309aa4e267b64b5d2ec43c163868302ef73bf3e8ac79e37595d90a8ec5e70ece8bd4ba29abeee17b79e6ce85748865f54f6ea72c0db013ae8
-EBUILD hike-2.1.2.ebuild 707 BLAKE2B 560a0047ae1b5254e865d6f25aaa840ad3ea3c824959b89b9615d1e3a8015f14b5349bbac7967105c0fc061c3bc70381c16baadc29886854aaa1ac50af6206d7 SHA512 a9e0dffa0543f7c6993edc5ba3bad26f8872ea99f2a87d98ff4c3048e2c8509ac6bbd0a6cd03e2bc3e8e67456cb559c88af04065fba67de53ec571073f783171
+EBUILD hike-1.2.3-r1.ebuild 721 BLAKE2B c0a7f666ccdf8bdd5ee8bbeca77561e39ec6dc250dfb5fecab80025c635328b82ec6e741b0d3b08df7bed6c1a1dec1381b7883716673fa4f4e4df7e908a829b4 SHA512 1e75e4eb8c80dcce370c53043d220bc5374aa9f2705fb7b24af21fbbe2228aa696c5dd1398e2513ec43f1c8916c2db7200dd74b67e78ec5ca50ecb72605f4886
+EBUILD hike-2.1.2.ebuild 707 BLAKE2B c4ba2f4f1229dc7ec5f928ff7e66a521f74748ce765192eebda3fbd544d42dd315e4febf905c84c18d281fb623237d85c218b4f373c52bad5e2554a642445ea0 SHA512 1d6ab22385ea085b53647423edd2d6beafd511fe886467a9fe2c4101e199b7813b15a34d226c45a4e5dc348c0db05c9416ba5b3478ac51be6dea821a6d542a3f
 MISC metadata.xml 342 BLAKE2B 2d306b1aefc0f9366ebadca5d80610660f5496f08e56ff8a274ddf697c047df6caf4dee3da960c5fe2698d06c57e6cccf4777d5b34ea215c4aea427feb37bc9b SHA512 dd5487fc10b2007c292d8d61bf67da2726f4b1af009c364935fe13caee59b55bf9440beb1a1f6e0810e130392db9f60360b0ef31fc4d6ab250bec344d536fd7c
diff --git a/dev-ruby/hike/hike-1.2.3-r1.ebuild b/dev-ruby/hike/hike-1.2.3-r1.ebuild
index 2ccf7079dca5..9f52891f5c56 100644
--- a/dev-ruby/hike/hike-1.2.3-r1.ebuild
+++ b/dev-ruby/hike/hike-1.2.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 
@@ -21,5 +21,5 @@ SLOT="0"
 IUSE=""
 
 each_ruby_test() {
-	${RUBY} -Ilib:test -S testrb test || die
+	${RUBY} -Ilib:test -S testrb-2 test || die
 }
diff --git a/dev-ruby/hike/hike-2.1.2.ebuild b/dev-ruby/hike/hike-2.1.2.ebuild
index 34cb89e7e819..096102046e86 100644
--- a/dev-ruby/hike/hike-2.1.2.ebuild
+++ b/dev-ruby/hike/hike-2.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/hitimes/Manifest b/dev-ruby/hitimes/Manifest
index a113e474ce7d..d3b67e720171 100644
--- a/dev-ruby/hitimes/Manifest
+++ b/dev-ruby/hitimes/Manifest
@@ -1,7 +1,3 @@
-DIST hitimes-1.2.4.gem 32256 BLAKE2B b8afb45abe0a9c74f9ea98a34bd8665b080bee1174688a58be76551f44d344821311926c7bb47b719e5620fb8dfc91f08e8b117ec6e69010b2abce00f6bf1fac SHA512 a4da8590297f4472ec6e98db0083e5fb5923284fea15e9c2da62476c1200f9cb6d12b77f369c374706457b5ce260dd1d9bfc93bf4c256cb1fbc63a4c463185c3
-DIST hitimes-1.2.5.gem 32256 BLAKE2B e08c5908e7aca8bf2a802116d56d3cbc79525ca83fc9a0021b6d2d8f60a0b92b84d810e817f6e7d3e8b8c15e6e71990473fd1d6907105c39343acf638ce3301e SHA512 b59915b96076bb229213710bfe21a8efb1602ea01a7b7559e91ae770b1051300901b572655c0c030ad543632b57443fd0ff34296b9018376cdc40d460198c5e3
 DIST hitimes-1.2.6.gem 32256 BLAKE2B 8e8b2338e43776256d3c4c208dc178f9594461b53d03e2101e199bc588f5aed85826f25e5133082a861ac45118a041680e27e53d74a3eb86545ca6e724b5ef95 SHA512 41954000f38f4671b8ac7b5e408aa4a8d36756cee7807a5fc8b1584ecd463c38c36e9ac06966e2302730042193faea1a1a35dbb06f7c53bc594af8420f687257
-EBUILD hitimes-1.2.4.ebuild 906 BLAKE2B bbc384f0d8d8e45b5eca006c13b9cceafa722e9671ce64cd97b41884838d6edbc75a32011d22b8a3baaa5c993acdebd5fdb198218997fd98715a32f216c3746b SHA512 5b31a16ae5e403a84b207b2fab3d96dd145e1b0ac636eaf5b70d08a4eab5d89df4bb627bbe032849d4b5a032d07e6467f418daafc97df8740b5ab7cafda03930
-EBUILD hitimes-1.2.5.ebuild 906 BLAKE2B 89ed6691fe5cbfcf54a71ae37f3287af9b9b3dec6ca3fe45c4302965a13e3c64d21ba8a736f7c995083294a533887a81e8e632ffccffbfd271cac0edd20a7789 SHA512 1800b04816d93472f315e3c72424616eae1d6b7518c20c00723b194778b49e3fdc3c86528f87de43c1b05075e74f50fab8af9fa9499c37f81d29d4a728c5c6d9
-EBUILD hitimes-1.2.6.ebuild 906 BLAKE2B 89ed6691fe5cbfcf54a71ae37f3287af9b9b3dec6ca3fe45c4302965a13e3c64d21ba8a736f7c995083294a533887a81e8e632ffccffbfd271cac0edd20a7789 SHA512 1800b04816d93472f315e3c72424616eae1d6b7518c20c00723b194778b49e3fdc3c86528f87de43c1b05075e74f50fab8af9fa9499c37f81d29d4a728c5c6d9
+EBUILD hitimes-1.2.6.ebuild 906 BLAKE2B a932a550810cdff59fc17a88485f8c444ca5dbd77355eaad726a86e7e516be1017678920658cfba958b6ba87a17e834ff2108fc788c7e7ac46710cd628ee2150 SHA512 90839ee00255b226522c5e3847ae196de581776320493b863e06043fd3c6c5ab6aa4ea950ba1498344aaf9b876a3d618b5b682db9fba1b772149a920ced12bae
 MISC metadata.xml 349 BLAKE2B 270455dbd5303a2527a2d62a00ed7d1a935fe84e0a556492315b109ad8270572c98d126e4ca17022f3cdc712c20fd5e22fed1f0cb1a21d489f9eb77a1835ac7d SHA512 7fecd87e7396d57d383d2e3055676ab89f9328121a625dc27ecb4a8faff1fb4d7b8d90547f0caf9f7767dff9d48c99185419e1d26dba906e448040b943a3742a
diff --git a/dev-ruby/hitimes/hitimes-1.2.4.ebuild b/dev-ruby/hitimes/hitimes-1.2.4.ebuild
deleted file mode 100644
index 157f5cbc946f..000000000000
--- a/dev-ruby/hitimes/hitimes-1.2.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A fast, high resolution timer library"
-HOMEPAGE="https://github.com/copiousfreetime/hitimes"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e "/RUBY_VERSION >= '1.9.2'/,+4d"  spec/spec_helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/hitimes/c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/hitimes/c V=1
-	cp ext/hitimes/c/hitimes$(get_modname) lib/hitimes || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:spec:. -e 'Dir["spec/*_spec.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/hitimes/hitimes-1.2.5.ebuild b/dev-ruby/hitimes/hitimes-1.2.5.ebuild
deleted file mode 100644
index 2c939425fb9e..000000000000
--- a/dev-ruby/hitimes/hitimes-1.2.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A fast, high resolution timer library"
-HOMEPAGE="https://github.com/copiousfreetime/hitimes"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e "/RUBY_VERSION >= '1.9.2'/,+4d"  spec/spec_helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/hitimes/c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/hitimes/c V=1
-	cp ext/hitimes/c/hitimes$(get_modname) lib/hitimes || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:spec:. -e 'Dir["spec/*_spec.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/hitimes/hitimes-1.2.6.ebuild b/dev-ruby/hitimes/hitimes-1.2.6.ebuild
index 2c939425fb9e..bc26bf15c8dd 100644
--- a/dev-ruby/hitimes/hitimes-1.2.6.ebuild
+++ b/dev-ruby/hitimes/hitimes-1.2.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
diff --git a/dev-ruby/hoe-seattlerb/Manifest b/dev-ruby/hoe-seattlerb/Manifest
index ba333bd158e4..52b0a097094b 100644
--- a/dev-ruby/hoe-seattlerb/Manifest
+++ b/dev-ruby/hoe-seattlerb/Manifest
@@ -1,5 +1,5 @@
 DIST hoe-seattlerb-1.3.4.gem 14336 BLAKE2B b53cb91cfba8d0e53290c40c29812163b99b81ee110818f1460f1aa155be27940199e38b32a9b65261dc00cf6db2a9991ac4323a851afb1383a9907a01899d79 SHA512 5e968611f3826fcea8f1a896b1883e07d5cf8d02bb20d0de2d8c7bacc0538163b5996d0a2f41dc8f892c4629bfc9e2630f14b374d73fa0b13daa2ca5de3433cc
 DIST hoe-seattlerb-1.3.5.gem 14336 BLAKE2B 76dd4e82e4b3ceee897d484e2bbf596414bfbe50d998f2f3833e6be63dacbec4d4d1014b14d9504cbf9615736f584ea3c083c8f5b15609f400264ce5cb31856b SHA512 a5cdb38114e22e07824749e721ad7ff85724c04d8ca1c66996ca86fc9ec150a3b0b7b3bc83511932af0c4acd7e9b581d6b1583eda60160bf7ed91021ab803d0f
 EBUILD hoe-seattlerb-1.3.4.ebuild 775 BLAKE2B 85fa5cb8bf5481b33c588522a62ad57d898a272dc8b7f24abca03c8fb7a389f5b2fe5a98495219b08b1f507ca408838d07fe302aa317ef0fa9b091a4dfa0e275 SHA512 712af42765bb7a7bd5a1187fcf578e730b14d8a467ef38dd42e28bb6da98aceec79c247e9db97425a80ee1a4a29b38da24dd4235785793c4de4c36b78b996d12
-EBUILD hoe-seattlerb-1.3.5.ebuild 789 BLAKE2B 834f4f08648d3bb1fadb9bb3a842817e3064e12a76b44a69c991d3f0099fcaa7686e753fa6b7b03cdee6a103e68b45d696ec383521f45f05f928081cf324305c SHA512 5fa382ba69e1142efeb157787bda6d9bd704371a750bd7b7e1a5ea86639371d84720adae0e4b56abfad609e8e187a892d4d57ff24a34b104c2c632393117d044
+EBUILD hoe-seattlerb-1.3.5.ebuild 789 BLAKE2B 6052023790a810cf33c24bfb4aa8d33d624a4e7f07009898ecb79d8680e98a0587a531181397ab38bda7c4e5388328dc702b48e58750abc15ca26ced799894b8 SHA512 fa6f3ab87392fab95b7ba34c19a1fd2eaa6fc34e04ecf43bc32090249e4245a81c3fb911a64f4f7fe63476b78bb23b7227631de20f3a4c69c7191b454710dc3a
 MISC metadata.xml 339 BLAKE2B dfe565b89582b66fb99b6c9e50c9ca3efc0eeeb4a2c2cecd5e103f2d9526fde1a6e591c240cc83163d55c2973adb9482dc8c91ec3cea5a8f67848aa0bcdf5e4c SHA512 2e0d6992a3e11200d4373727efa7ea4c1a1eb1e1cc2a1023b0d0b651769580d2405378c4560e498ee5f52f7350fee443a443247ccedef5178be40f014f44cd20
diff --git a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
index 2e5e67eee3f6..4eb03860ae2f 100644
--- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
+++ b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 # no tests present
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/html2haml/Manifest b/dev-ruby/html2haml/Manifest
index 7b61e5628c88..f616c5ef0e5c 100644
--- a/dev-ruby/html2haml/Manifest
+++ b/dev-ruby/html2haml/Manifest
@@ -1,3 +1,3 @@
 DIST html2haml-2.2.0.gem 21504 BLAKE2B ead2c636baacb8dbba7bd650356da5e2ebfa8ab565edb38ab03df287d8d0709b9271ef3f46fae0f2d2b86d37dbf6a0212fbf6803aaf7757a9f2653b773e46482 SHA512 b6988182073f35d4d9b9f07f2cc2ba01c66679fa646fd2d1e3c8cf0643c88b04a2b1a36d584bdcca897f804e32486a618abc8fbd8db023ff9c22ee66d93ed9f0
-EBUILD html2haml-2.2.0.ebuild 779 BLAKE2B 8b3f213125da645185eee09023a888f7c9a4d710c59f0276295c2071fe35021a8e12d76d5a405c6ab6c1ac04f4e89620b810095657abda1a72ee4fa15a61a3bd SHA512 85b635a848c51ff8dbf5143b025dda785e81248af4c725b4fbd6490faa5e498e16ee014cd1508840dde2b788f79d205ffafdba3433492fe69a8a1d43d491114f
+EBUILD html2haml-2.2.0.ebuild 779 BLAKE2B cf8b8151cd0161ae82b3faf3e1311fb8ee7109c675dfc5e74021f336c9c1a3ee52f9c19d9a6a66826b7db1fc036845b81e8a8ce5f0965a62638f5ab2844ecb3b SHA512 27d1d654baf0a310011cc9176824a63f4396df1c801b74049d7448e69354880b5ae36464345b3f75ae349307fa96e35a9c85b5cc1a198225be67952ee977a79e
 MISC metadata.xml 330 BLAKE2B 5f142ee3520e2700e3a51713054c5be0819c6f35d211580d56c8473edcc8f16e1a145bf617bd038bf8727f942b71c3b7e79d7c5cb1ed01b75d24bda2c1866b2c SHA512 b1a1422d9a51ba4512a0ca500213b5d26f6fc3403782a6adf2efa970407273b9ee9cbdde4a44775a9c72c5581df739c8ea8b8a8c77426358b9d5f9694e22800d
diff --git a/dev-ruby/html2haml/html2haml-2.2.0.ebuild b/dev-ruby/html2haml/html2haml-2.2.0.ebuild
index 42b2430dc7cf..fd22986128c1 100644
--- a/dev-ruby/html2haml/html2haml-2.2.0.ebuild
+++ b/dev-ruby/html2haml/html2haml-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="README.md Changelog.markdown"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/htmlentities/Manifest b/dev-ruby/htmlentities/Manifest
index 91db9deb910c..d60484b39213 100644
--- a/dev-ruby/htmlentities/Manifest
+++ b/dev-ruby/htmlentities/Manifest
@@ -1,3 +1,3 @@
 DIST htmlentities-4.3.4.gem 31744 BLAKE2B 519f84a05ab8fa5cc2e7994785606b6d66a70169af7acdd9f5e2a71d08e06a29d93587175f7e13608bf2a05a21a7597cb435653282c2485aa07d89cbfb83d9f5 SHA512 0163d6c014ffebb4ee9bdb15d32884c8d6af60681f240d3f0177811d37647776b8f8fd0aa4f1c7559403f36a5538ce8da6926bc16cc8105bd6eed5c180db700b
-EBUILD htmlentities-4.3.4.ebuild 558 BLAKE2B 9a47a1d3c516479d893130c02ca0536cc3c83330f93d95c61db55be23cd6cd269334af846305295037ef514a2bd404668903980d821a409d068202ecc704dbaa SHA512 1ddb6654c89882d44ba3cddbb9ea66f30536375c9a5fe203d205bc8e3951d86038caa61a1e1cdadee755ce9744cc9e91401d9280bc3b0cd8a6f0806e2b2c21f5
+EBUILD htmlentities-4.3.4.ebuild 558 BLAKE2B 0e363c4f1f364ac1bd55eed80d3f19b48cf64cd2ab7f5974de2a3b1cbd97aa05a4e1e52143032a9f736c42af71fbfc7aed429641be38f55e257c224a1b3d2a69 SHA512 488991f448b1445c4cc8b22c98f869abb08c300affa59268aeef35ab305c8944d06540f5e143f12d9e2c1f186143d7222b733999bbaee15aeb70b4363b1b67e4
 MISC metadata.xml 351 BLAKE2B 270b91c22dbd5efffd574e0bfec5c90a07cbd1ad210d32817fd33863d14eed264bf45aabf008e7671343f4cb0ddcd0f5c3715bb37bcc7e5dce97eda80f8e3a82 SHA512 083e92aa92936ce5ca90881146d8999ad6685e7e024b192e61fb0dea24aa29ccf34786a73b7984dd7c8859555f8012fc9c6d40f902dae39bb0aab61565fac55d
diff --git a/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild b/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
index 0bf9bd9682cf..60522e394f8e 100644
--- a/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
+++ b/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/httpauth/Manifest b/dev-ruby/httpauth/Manifest
index 386314d2db53..19fbc15b575a 100644
--- a/dev-ruby/httpauth/Manifest
+++ b/dev-ruby/httpauth/Manifest
@@ -1,3 +1,3 @@
 DIST httpauth-0.2.1.tar.gz 17300 BLAKE2B 4609f35fd26b1eb8e3d17586553f5dd5555d3c676f2189f7da5ff23057438c91919cb0838fdf219f0b26682b2a08d903c7906edc9fbfa58ce9afae9e0f58a6a8 SHA512 c861089c2dc5242b86867e0a6561672361ba53ccaaf8a931c996502fc12bbce769abf3ebd7fce826cbcfbc943fc901ba1c96e8ce014333582c5d2fa2c3e56a60
-EBUILD httpauth-0.2.1.ebuild 601 BLAKE2B 9ff5dc5cdff7a17abfd4e49e380c5fd34dd1ca8a476687baae5514fecafe85f5cd7ffc08340943e59fd322f77a3a376fdcf4180adab70a86d88ca6733ff5b18a SHA512 91bcd18cb258e3c8663448ace2232802147d74c211610926e5b7aed0d5835ae031d008fff8a1cd02a8103c621d85b6ebe4c31f25864cd0a678a5b49dbb69814a
+EBUILD httpauth-0.2.1.ebuild 601 BLAKE2B c77adade6bc04e3834cfdcbba46f27061ca98c61bd52959ab9055dad89497374b8135be85310654f32281ffa6a423e85d13c14d8f9ec96fd8a4b1488553a2ba3 SHA512 5fc3e6bd11ee2da9cc5a9fb2e3484771e3b21f199ff00b1d4efd5b43bf8f9180da810b58a56adca3f815fed5f8b40a3df1d0b21cbc8b0add205518805a3866b4
 MISC metadata.xml 342 BLAKE2B 1506ceb0c6103d8b31db938372ec233b10ba3489f39a14ba54a10663768daaafa27a955e54ce6cfcf4f54e6263f6e10a931815c11f0d50b1dc4bf3d5b6a04162 SHA512 d5392d2d9d6d134b2341aad0f7383f303d635423a7e7cd7520c85eccf908f66d1f1cd936807066cd2e54caf4812ed93b41579430706a9c338174e659ea16a5e8
diff --git a/dev-ruby/httpauth/httpauth-0.2.1.ebuild b/dev-ruby/httpauth/httpauth-0.2.1.ebuild
index 9ef1fcefbb65..a754a68d1b88 100644
--- a/dev-ruby/httpauth/httpauth-0.2.1.ebuild
+++ b/dev-ruby/httpauth/httpauth-0.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md TODO"
diff --git a/dev-ruby/imagesize/Manifest b/dev-ruby/imagesize/Manifest
index f243156a4548..e6ed2b01b3d6 100644
--- a/dev-ruby/imagesize/Manifest
+++ b/dev-ruby/imagesize/Manifest
@@ -1,3 +1,3 @@
 DIST imagesize-0.1.1_p20100902.tar.gz 77378 BLAKE2B fae6f2a8b83b3824e184b4973e901cfdc24cfa529068cc856631b8408c225eeb00c112a0f44d369a5afa35374e95682b3b7691d6c60ee5200a1ebcf669f4476b SHA512 62f0b5d1330e5cc63cccfed79e6aaa4c9de0b2d3598d241c143067c3811788bec14128d2f2465b802b91b428c239c3df272523e3026930ce26da8c7b04c2d55b
-EBUILD imagesize-0.1.1_p20100902-r1.ebuild 681 BLAKE2B 7c0ccc573d17bd5fc74b6d6b44ddbe1d06d1a7438178d0c7cdcf5542cb1fc0f923d385d72eff090d85a80506d236321986393359619d5e06de7b899d51d9653f SHA512 c58026053b4ad5fee359da9a2a248030707018a1bb562d8074082e39ec2c04e4501c95bbdab581499d93215865c0efc7f7fcd1822be8dfe7acced4649d66b460
+EBUILD imagesize-0.1.1_p20100902-r1.ebuild 681 BLAKE2B 214b344fefd665b3a063a931ec788123f2dfcaa5c7e5b388641c0e10d6b097c002ed7878679824c976aae3c1d4c4a383233766e5435e7e41445bf3c3f57765fe SHA512 10b97e6370cb8ce901f14c2313c53c74258117086d189c76568316e192aab9e884792a7765032f560765a762e38aa2746e0589fc1b2e475d22993521b1ff5025
 MISC metadata.xml 351 BLAKE2B 475960a1a90dec2d528652113973655b363e244b4400b3a8287e506f3473e21f2cce9abc082ca6de4e1e6e0abd54e4e8fcb1c7ddf7ce79292eee54d7ca18739d SHA512 17e0b0f3696dc3fd2c6313f86db7c90911cf8adedf141d8bc91e102836ae70ea8a637d4c6212bc0ee26c0f3d5218e51c6154dee13d5a3a33f2ddce054bc81a5f
diff --git a/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r1.ebuild b/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r1.ebuild
index 7bb0c4af66e6..093c9aaa95b0 100644
--- a/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r1.ebuild
+++ b/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.txt"
diff --git a/dev-ruby/inflecto/Manifest b/dev-ruby/inflecto/Manifest
index 1757f9607969..4558fcd9d467 100644
--- a/dev-ruby/inflecto/Manifest
+++ b/dev-ruby/inflecto/Manifest
@@ -1,3 +1,3 @@
 DIST inflecto-0.0.2.gem 16384 BLAKE2B 08c23177c02459cd37f14dc39a838d587df775aa0ade13c9c0fc93749cc669534837f865ddff85cdc5f304d0c8582b28284d35b2061eae96469783137472b617 SHA512 dbd1aa3a199365aa301d2570894e347e4f4fe6202924d6337b936ce3e5ed934e7e5c57c6c4ade42d6e0ffa43c574f3ac530ec6dccc6ad8d16b6ff96e4d057628
-EBUILD inflecto-0.0.2.ebuild 411 BLAKE2B c141720aa1235ae7ae16df74084249512cb4c9728d92a29d6e8d181ebd7377bc08fd1919109c552b35b04c16c97b45c09db11708b9ba450197571cde77b80c07 SHA512 4fefe650065055c91f181dda12bf61ae74c9c8061965ea7b46bb58051f12ce698ecd99b3ecbbb400d887af21e90d91bf75b960875c926744cba4e19ae8a9624e
+EBUILD inflecto-0.0.2.ebuild 411 BLAKE2B e879ee889c72dba8964904690fc94ebb392aa46d7166622d40d18225d4e0becb5dd7eed7494ea1936d320ec55038df084fc9403bd4df1e2eb17114c89e9fb9a8 SHA512 495a895999de67f20f033107c697d8e4d39f85b2b2f0c967af598903a73b2f09c6ce5d04e3647a23e652b09cabf3666c647db16681382d9cc0086014cdb0f14d
 MISC metadata.xml 338 BLAKE2B 1c56398d57ca5047e80b990650c03994827a0b4fcbf984eb773940712289587a59ee8a6a6bde53ee0332b0c68ce468496fc041732b650808ca7465668376bb16 SHA512 a5ae77a07fd66b3295dd15cbe10ab9a64bfe953b1ecbcc920c5e97c196de2b920f3c4f35d68b9d42f8cae7161933a54093c92c9435f02bef1a5a6af13b71510a
diff --git a/dev-ruby/inflecto/inflecto-0.0.2.ebuild b/dev-ruby/inflecto/inflecto-0.0.2.ebuild
index f597c21b4ff1..ef3e62cccfe3 100644
--- a/dev-ruby/inflecto/inflecto-0.0.2.ebuild
+++ b/dev-ruby/inflecto/inflecto-0.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/inifile/Manifest b/dev-ruby/inifile/Manifest
index 6b6e52848762..b50e62bd787e 100644
--- a/dev-ruby/inifile/Manifest
+++ b/dev-ruby/inifile/Manifest
@@ -1,3 +1,3 @@
 DIST inifile-3.0.0.gem 18432 BLAKE2B 28c778b9dc49e618dd5f86ab6d87a21e6a1e8ff577ce98390a7767778033012fc3c4d5476de48d80807b0a74bace0b5f775317106949fe142e88854a95436e94 SHA512 d77344812bb62a5639b0a36e5ac2726280990210000b85bab700819fe0fb9f56415517c00436d0056ca090e3d568596bc30f8ed211a00aced5b929e534d0a72b
-EBUILD inifile-3.0.0.ebuild 571 BLAKE2B a0a2a8ae877cfa55e02a494547a166fadba19006aa526ce0adf2223d39a3838c238eb783ecaab5f4bc3de407dcb0b77cd868044ef0adf4aab4d4055811bbc1d4 SHA512 d93b9ed038bd5c246f4ff5c69c3a955461fc70b8a2b98cff84d824af0c1b980e6476a3e8f89d99c7f42d2713584255212723bb7850dc196526ad7a9d4b37203a
+EBUILD inifile-3.0.0.ebuild 571 BLAKE2B f722710dc835d794f4bcb0b940a578ccdbe9df9c18e989b0d06de52b18d64e4a0c5132848a9747e9106a0fe4601183fd4a488b3b8f46b6608bc70dd0c3afad49 SHA512 4a541a0b24a299c9df55306504779c128d2d878d282284c581db35c6efe4235920a2ea06f9b5684cba93c4b5b9ec85863f619b1c97d03618fc5a958ab372099d
 MISC metadata.xml 337 BLAKE2B c33d25d55fb6a46e6b48375526f6c1052a8e1c39231551b6911cae898445701a9ad9a9358c1f21be5b1546142a02ab3cf45441a0044464b0b798f7e07ec55ea8 SHA512 49523edec5fc510375831232351c9d1fb622da7c14a0ce2b7e7a229882d5ff1c6647461d9f1363098e90bec422d48ae711eb1a7af048387ef5636f4c9c488a43
diff --git a/dev-ruby/inifile/inifile-3.0.0.ebuild b/dev-ruby/inifile/inifile-3.0.0.ebuild
index a52f93318df7..70daab3e4ff8 100644
--- a/dev-ruby/inifile/inifile-3.0.0.ebuild
+++ b/dev-ruby/inifile/inifile-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/instance_storage/Manifest b/dev-ruby/instance_storage/Manifest
index 3fdd33d639d3..04924117b825 100644
--- a/dev-ruby/instance_storage/Manifest
+++ b/dev-ruby/instance_storage/Manifest
@@ -1,3 +1,3 @@
 DIST instance_storage-1.0.0.gem 7680 BLAKE2B e8c4f90c90c6efebcbaa577ab17824f4d759782f1b3985679200ca97b89f04245c562f6d9aa96ac894d488417f4e393bb7faf28ab18aa3f3ede1e03365706a29 SHA512 45ff98b3d0ab47d3459d868eb1b0075abb83b23bbc3a9b84f261077bdddc385ed016e81d01c19f93fa6cffd7cb9020ce1e22411636709f18af09a76c7d44598f
-EBUILD instance_storage-1.0.0.ebuild 506 BLAKE2B 3d749f27599b2b031a924fd86e7bf7eea4231ac8056f8071edf33f08e0ca81e9e10a63f605c14b49add7860e66850c5223a524fd5b2c8debb06e1d525cdc8efd SHA512 65fab539701259755567cc5c1010360fe14d04e6b287b2c0885751b466fe7645325f1917069b6974f45090bd3924c8c59bda13ec2824bbe0d5d6de231514b0b3
+EBUILD instance_storage-1.0.0.ebuild 506 BLAKE2B 676e855b121dadf778a611ae4e69722c9d04467f093f14ff16668284d920dbf55c478f449b2bd17b19b52c19da6d414daf8c1989b2a7d68ca2ce4d2a46b10385 SHA512 b5e6cd71103d24b29f136822d391cbf858968261a8a790c2363da8125f1a170649a9f3381888de1208514b91855367fa6330216e6396248929c1d694dd1fff92
 MISC metadata.xml 411 BLAKE2B 2e1ba3d431fafe85a4b3d22369eaad7de3a2e8f40a2aa7596912dd5a3c7e242731c00714b35bcb29fb641a79daaa3132aa3a4695d6faefcc8150afa38ba4f304 SHA512 2e7c66f01814ab0c9c5d677183d3bac6d67617279c422e29a4f697b328cb461d53b142e9bcf1995f8f0c43c2c7333d666d6fae3a5f30970f4da99e59bb0e1105
diff --git a/dev-ruby/instance_storage/instance_storage-1.0.0.ebuild b/dev-ruby/instance_storage/instance_storage-1.0.0.ebuild
index ab1b85a32763..add45677a736 100644
--- a/dev-ruby/instance_storage/instance_storage-1.0.0.ebuild
+++ b/dev-ruby/instance_storage/instance_storage-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/instantiator/Manifest b/dev-ruby/instantiator/Manifest
index fd8d144a2d33..7ae6ba4dcb72 100644
--- a/dev-ruby/instantiator/Manifest
+++ b/dev-ruby/instantiator/Manifest
@@ -1,5 +1,5 @@
 DIST instantiator-0.0.6.gem 6144 BLAKE2B 6add4d12cce98be209ac3d1073c17163c10c6c015eb40c9d8efcf3c4521e56c736618d11c4a06f52a0d16ffdf2b6815fb6e04ce823fc79febf997dec30aa1904 SHA512 0d24c804dd048c071e5ddd021a1adcb907eb642df16ce841fdca2efdfd5604f73d065ad4496cf6d63bdff73e7488391d7226bdc0d918d2813502ca3d4fc615a1
 DIST instantiator-0.0.7.gem 8192 BLAKE2B c1cc0bf4a3f2aaf9afd522e33fdd2b32d78ca114fc7b113f6ae297e825177827cb6aa5398917d6d05523f912bebf22e43709e53c0dfe4e1a941ebda4350d3098 SHA512 b37a9380d787252244d2b85bb99365f4a4ecdab58f76caf5e59df00b239f4981119eb5c2eb2fe6ddcf810bb0fb43695f8926370a101f4223fa28811953e6731d
 EBUILD instantiator-0.0.6.ebuild 572 BLAKE2B fa02578109dd6b75d2b729c55d1c5b1210b9e1467fb1460326177889b7e40f68e36dc7c09dc77469e3893ce9d160c09ec7e35adfde71a8d0f0ce1f5674f38f94 SHA512 e93542390c4e270377f28d9fa59a33d21396f3137128d23ffe909035e8adb6933e84342a1d8efe9c99703e26be1daf0e29c6ad1b63cdae0ed30ea6d7e7625284
-EBUILD instantiator-0.0.7.ebuild 580 BLAKE2B 96918ac5c7be99d8beed6a2cfe50bba86764f374f2465b103bbf6ea1c1e504533f2c47e265bbe4e825d3dee6fa8a630113447a24163e137a715991139470b342 SHA512 111e7b2255a764aa2e5e46b164bb1ab3e4731510c684bcfcfd2cade4c48ed7f240853b45495cc7e891f3214c4792f9c207e26184061bf6697e95304b117e493a
+EBUILD instantiator-0.0.7.ebuild 573 BLAKE2B 434cd240c4991f8f4c0bb34d69f417215e39f6b51c335fb89700412dfb0992472d13d895aacd2e22a21287766338f9e0ac9707a6d72535d2f04ed7074c850524 SHA512 94f4a4727e40cc75e45c8753b825f02f970fe458315ae1a318e43d3af395a8efcec6366c0f013ea67d2b826cc607b22572344227c79e4304e8e644287e799044
 MISC metadata.xml 350 BLAKE2B 3a675060e310b02ef2d6408b7b7114651555ae65ed76f6311947a7c6b01e18c638775ae71c504892845b5f9fde2bf5560c3e267fa478bc105c3732a2ee821fc8 SHA512 48661d17e8297087c541040534f2c19ef983be797cd9feb5a9e7d80f8bfcfba027e8c2e42d8625a0a0f76bc60247372b2ae0f984b6ae8f635f28bac33156fe1d
diff --git a/dev-ruby/instantiator/instantiator-0.0.7.ebuild b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
index d303a20dcaf2..1d7f653b0218 100644
--- a/dev-ruby/instantiator/instantiator-0.0.7.ebuild
+++ b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/itextomml/Manifest b/dev-ruby/itextomml/Manifest
index c5dc79cd9aa1..a9f199dd6814 100644
--- a/dev-ruby/itextomml/Manifest
+++ b/dev-ruby/itextomml/Manifest
@@ -1,7 +1,3 @@
-DIST itextomml-1.5.4.gem 124416 BLAKE2B a84dc60c1affe117bea5d6c75b619b3b67ecb259ee87c29a6c21801f4ed69e4c7358b962a2ec8200403c82d56dc6ee93f69cb7814102a4770da1eb3726b046c6 SHA512 18ee01adfbe128850d7bd41715a98221c425c2380ae9fe95fc8b5fe52c123e872514fc49a7b975eab1f32874b85f7e2861c8b22a9e829542eb6e4e1b97c3bc5a
-DIST itextomml-1.5.5.gem 124416 BLAKE2B e5a8f38b2200362cf0fb7effc60149441630d66d99221c3565f6b4c61edc0003ec95ed1a1d2f66ff88ef07dcab65f8bc18af417c79c3b904a36c51d15939110d SHA512 825c4f0e48e56980d23ea7ea485c50398e34b309de29ac8da218517b9d2e8a47e7dc39df8b400bb39b6828a9ac5d4e71a951554363725af20fdd460adae77e7f
 DIST itextomml-1.5.6.gem 125440 BLAKE2B b0894d26d20e85454c310589509cb0eef371f3c9139450ce8dcd25fac6b83e831557e05ba54b449557422b23d59868ee75f022fe4ba1c205d32926f923986864 SHA512 b74f5a9ca4eb669fee547bdf729e456dfe07b8be4e9ac0d1b7c3ad5d4e99371ae7b5bde565e6472ab07bbcec2754d4ee628ba07a6a7e938ea8a55a6023c2f1fd
-EBUILD itextomml-1.5.4.ebuild 731 BLAKE2B a26943deadaf346833af03adeabcb5f2991ae5b761f48ec65908a3c8c9ffee4d8e8cf353ac7a40744b571b1e7593afddd3bb1dea95eb11b19ba0ad0d70639278 SHA512 9f3cc4641146ae2f2f24c6538f9d4ac5ca5dbc383a5f50bf6e2d8e3a59b83c194ddb2332ef93ceda4d13746cc02109282a2847a415a7b14327c749a8536f3619
-EBUILD itextomml-1.5.5.ebuild 741 BLAKE2B bae6d5d748d5b74b0de1b47a4af19ddc8fe9572d5ce4d86bf90b19a7b1fcabf5fcf8bbaa0f48daab437114df83e89f8b4cc6ccfdd436492b99e94e7dc8107ee4 SHA512 f6686688b11225a7011856882ea5a4bc6afc0f25e8c5b458b2dc00546c6fa68d2fc99655ee7f0b7e89054b5f0f338e637bd48e97cb100b51fbc86892791bcbfb
 EBUILD itextomml-1.5.6.ebuild 749 BLAKE2B c2ab04d6593b672463a4f59292142ee8c726d1d268e1f10fbd175adb107551692efc653e4ea6da5cc910f3ac8d8d3dafc862d9938d8f5be7772faf50874044e4 SHA512 d38a0c9cf47dd71ea69cb13e3bfd580a59a98371823d535b86fc1870c7dc59a0cffe80f1afaefa629e132eab04507c3cf0aa84f50cd53bfd359b67ebecaf15c7
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/itextomml/itextomml-1.5.4.ebuild b/dev-ruby/itextomml/itextomml-1.5.4.ebuild
deleted file mode 100644
index 19980bdc6070..000000000000
--- a/dev-ruby/itextomml/itextomml-1.5.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Native Ruby bindings to itex2MML, which converts itex equations to MathML"
-HOMEPAGE="http://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
-
-LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-#Tests don't fail here
-RESTRICT="test"
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext
-	cp ext/itex2MML$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/test_itextomml.rb || die
-}
diff --git a/dev-ruby/itextomml/itextomml-1.5.5.ebuild b/dev-ruby/itextomml/itextomml-1.5.5.ebuild
deleted file mode 100644
index c79157554922..000000000000
--- a/dev-ruby/itextomml/itextomml-1.5.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Native Ruby bindings to itex2MML, which converts itex equations to MathML"
-HOMEPAGE="http://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
-
-LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-#Tests don't fail here
-RESTRICT="test"
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext
-	cp ext/itex2MML$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/test_itextomml.rb || die
-}
diff --git a/dev-ruby/journey/Manifest b/dev-ruby/journey/Manifest
index 88b5442ce744..282fea63369b 100644
--- a/dev-ruby/journey/Manifest
+++ b/dev-ruby/journey/Manifest
@@ -1,4 +1,4 @@
 AUX journey-1.0.4-fix-tests.patch 2149 BLAKE2B 17693a10ad41b43d17541cd93a3f7485a60766bf5bfa9f96c9e1031db44cf9ce04f02f7e5aaa78de29241346d3707591ae15dbe17f268b90a482a6158962d2f6 SHA512 d4b34ed92f131e6e17f4af6d9be5ec743b6950f86ee724d32be67fe88b378cd8998c6551e78d6dc7b72b2911afbb14ec8ddad3be414694b86c696a39513a2857
 DIST journey-1.0.4.gem 28672 BLAKE2B fe78647c9f80ad4b9874eab9488cca199cd69d354e69f3f5b47b417452ca259790109d07a27c4c2d99778683d9264413399d4d7acd7eb4d8e78f7e37ccf2a8d7 SHA512 9e6a06da8b77f6efb9941c58f53254e8cf3a1ebb6f8261a66ef3fed9c21ff4e4a90567fee88507b8e2c1fecc0fbdf204a9d3c8473b671bbb4b8c6b9faa6f2a07
-EBUILD journey-1.0.4-r1.ebuild 643 BLAKE2B d94f752b30c232f9c1f4f0d8f84ee7800a741eba08030c439345fbec0d6ac2765b078c045d05ba09c8f7578d37417930519d8b744d3c5a388b490925d4ebf853 SHA512 910cdbf152443057a20db736e80e9866f85f859d6eefe43e4fae2ee04fc85d4cf1cc3a14e8f963a93869151a4973f5e6b5492679411b5b5fcfbc12447ff782bc
+EBUILD journey-1.0.4-r1.ebuild 643 BLAKE2B bceb0774a518d5f80eb7dd089ceecc1a16f7312098051a110765e9a7f8c7f444cd0964f79cd6d5456607e34a52aa9200741a3b6a3d28b44e82d4d0c26ab296d4 SHA512 60a51c21cdb8a90dc9a1cdd1b2a7f1791eb02d9f52a1a1e513a9de7b40729bb99e9b4d2e6cb741fdc980d672c2290b2ba3036583e196eb05db33af952bb12ad7
 MISC metadata.xml 339 BLAKE2B ccf9044fae8d836e4a60fa4bb0c95bd245b55a21dfcb7367e8a41c854f32c0bf3b65bff9a0ef625bb645063f84ad01cc2cc0a13a1f2cad4732e959fae7122e1d SHA512 482ceff436735ee12e21e9519a174803b5c035dfc31df0e25eacecd6186682ec9209f5bea95d3ec8263dace8cd64145daee26986dc10820bf99db2793f942f7a
diff --git a/dev-ruby/journey/journey-1.0.4-r1.ebuild b/dev-ruby/journey/journey-1.0.4-r1.ebuild
index b83661d7fbcb..c18b64e98d2b 100644
--- a/dev-ruby/journey/journey-1.0.4-r1.ebuild
+++ b/dev-ruby/journey/journey-1.0.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/jsobfu/Manifest b/dev-ruby/jsobfu/Manifest
index 1ef6bdd33bbb..84c6d4ab979b 100644
--- a/dev-ruby/jsobfu/Manifest
+++ b/dev-ruby/jsobfu/Manifest
@@ -1,5 +1,5 @@
 DIST jsobfu-0.3.0.gem 20992 BLAKE2B 01562d1a2d590d623084d7de48500205a6eb55cf68198219a2f554c71b6213af6957cdf7fcb88f12359eb28317601be322f0dc6f0f5868f26e8423043a67c7da SHA512 64084589066bb8d5c4c775a9a910214306fc1b39ff54582a0cf6485efcca667de57e9e26c02139d1b7baabadf38947464c03bebb72aae65c7be8f993413b6389
 DIST jsobfu-0.4.2.gem 27648 BLAKE2B 280629f104a6aa1cfd4603fff2edf5d2dde5885bf074e39e790e06f03d17a2cf107a6bed61fb2279a3c1e1879e4a74d7faa266561ca10590fb67543ec52e02ec SHA512 84374c8c65691eac6fbdaef78a6faf8a1659474789df2ad0b938cd9101e5b51c69ac5fb157eff3e714decb1402372fe98015a2ef3d77775f0af22fba34f93227
 EBUILD jsobfu-0.3.0-r1.ebuild 709 BLAKE2B 2835cfe4454caafa4424601e966763672bf984d95ff39fceba60ffffa518e0aefae3cef907046e40b7cb5a51af271b988a08557eb9981594170b50897b66bf7a SHA512 adc6d91db2209ba93e28b460f1036235a1dc3d3e50800d918ff166f5265bc1071b7726ddff4afede26a9b5c4cc1e378dff7d85dbbbf26aaf3b8874c53cc99b2a
-EBUILD jsobfu-0.4.2.ebuild 878 BLAKE2B 434bebea10d195228a63c201b0edbe6091625a650fe6215558e0bbb3e8719d0907e05de1b901a898fc611a55b2a86a4dccf52f466787e8e6ea1c544759332af8 SHA512 28e5c10b05aacc80bb16a062ea5f1d0e8af630342ebb373c4ad2d7048e28d5d6a934d9469fd94a0f7f0c460b3170a523ad44655f0890c6510de34eae3a37e4c1
+EBUILD jsobfu-0.4.2.ebuild 878 BLAKE2B 25fa3969a62bce0b703026f18d50f3a0073ef8e33248b8b6fe22f3de7bbda52a109a17a68a76586b83a60a1cbac63849f7d864c619f53047867ac8db3710d9ff SHA512 9e3743324ca4495753867309003ca83c20af7f21183807804ea76137695a37507e268be0c72f2d20391577aa770f21f19e3050bbfcc6eba6830024311a9c47a1
 MISC metadata.xml 339 BLAKE2B 5d4e7345f4dbb2e4a1957cd23f1e42d0711ab7105ca78a811e66022e94ec8dbdd5a63c1206be9c1df108cb02c7d2c3010286984f16f2e48704950627273a3801 SHA512 58ed2feae94851bc7226f8a4e83cf4a76423a8b8794a0121cefde3dd637829628745bddea8a8c4c9f4917ea37d4470077f0b574ae0d224a8b2ef556eced8b0a7
diff --git a/dev-ruby/jsobfu/jsobfu-0.4.2.ebuild b/dev-ruby/jsobfu/jsobfu-0.4.2.ebuild
index 62bd2e8fa7f0..96a417bef5e6 100644
--- a/dev-ruby/jsobfu/jsobfu-0.4.2.ebuild
+++ b/dev-ruby/jsobfu/jsobfu-0.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_BINWRAP=""
diff --git a/dev-ruby/kirbybase/Manifest b/dev-ruby/kirbybase/Manifest
index 03bf0ece34fd..69a6c2ad9586 100644
--- a/dev-ruby/kirbybase/Manifest
+++ b/dev-ruby/kirbybase/Manifest
@@ -1,3 +1,3 @@
 DIST KirbyBase-2.6.1.gem 304128 BLAKE2B 4fabc7d431b607d18b1474ba815ad1d19d3362734ac0a562858ab6deca6193e6fa13e668d17d84b228af4459b75d082aebbb04cc91c6dd7bfa667e9b38613032 SHA512 84a471b77ef9c91d50b61ad9993956fb25739155fe55049c1e20f1c87593f726604801ddb7968b19d8234d1d9ad9b112df53f1a2c8c85ec3559d88eedbd2314f
-EBUILD kirbybase-2.6.1-r2.ebuild 709 BLAKE2B d105560a02407ec6b3b0c90e4bf07b018e28bc6463dd8992483b7b78f7dd6388734fa35faee3d26e6ba79de2cb3c6c943163e53d188e932b3cb276e15de68980 SHA512 c744f1760903cc10d274df9de1a67b532fa5c8a6ca11c4b078dd2fdbc4af54fadbc6a910b28b4bf60ade93a71682c98457d6938634cfebcec59560fff75cd15e
+EBUILD kirbybase-2.6.1-r2.ebuild 709 BLAKE2B 9a69f24ef3c09be5caaf8bea455c34a902ba5de4615ecfd23ca26ed8ba67aa4b3442e6c8e3d00f179a998df6ffe270d9274f05759835fd16fac6cd49bfc19f0e SHA512 ab1b5ae0a6cd7ee8499cfbdded60698e3afd55e508c7b2e8efc1c0ddf8f974e0f235384edc42eb39a7ec3f1a395f2f356d78cff2eaa8951f0db47a0998bb844e
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/kirbybase/kirbybase-2.6.1-r2.ebuild b/dev-ruby/kirbybase/kirbybase-2.6.1-r2.ebuild
index ef3c27d4fd04..26d68f5d1e6e 100644
--- a/dev-ruby/kirbybase/kirbybase-2.6.1-r2.ebuild
+++ b/dev-ruby/kirbybase/kirbybase-2.6.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_NAME="KirbyBase"
 
diff --git a/dev-ruby/kissfft/Manifest b/dev-ruby/kissfft/Manifest
index e003fc995231..0cd9e892a644 100644
--- a/dev-ruby/kissfft/Manifest
+++ b/dev-ruby/kissfft/Manifest
@@ -1,3 +1,3 @@
 DIST kissfft-0.0.2.gem 13824 BLAKE2B 89c08365e23dce06f1c9acea7ddc7d463d3b8df1a5c238656fe9a43fd411077b9dfdf90288437ec9a30bba16d8eeb5a6a2b1a9d725cbff7ef07c632be6877f88 SHA512 3513008db848c92948e35c01bb568dcb8d52656ffe3510b81fb57b71b5abab121b3f1e6f3c20f2c94d0cbf1870d612b48f983a6639588ecd8a54f8b736fe81cc
-EBUILD kissfft-0.0.2.ebuild 575 BLAKE2B de51685aabc2059cb8341e983ed4c605993895d77e48eae97a4f4b770aeaa3851fe5a1d9b7a63a9545d48938587471ad25f736fe4f26a5d1ce1594c582438c9c SHA512 9d4cc16eec95f85ed61dedecdfab986ca3f4cd5ca9a5639cd6f86df4b326d308dc1e0d63a3184670ef7c656d3d5c8c652952117bd1a4b82bfd3a8d2ee84b5d68
+EBUILD kissfft-0.0.2.ebuild 575 BLAKE2B 93f50f10b55bbd5d430f30f5e28444fa51df624276ccf7bfc012136f2446dfb5d63c049447db9940f592488eaffc10e24768ef3bdfe23eba1f9ed509f5872cc6 SHA512 6d97e79a937052f02c2c06824db096ef5aa5a8658116a16108db6e1e206ac826f153ba23b7581de0197996634558196c66e7c1ec31265b5ae82c184b9b1e71ba
 MISC metadata.xml 433 BLAKE2B 3396dd7828a0f644d784fcac7a11af8d206d55b2ed1575c9a7324721cfa50f11468d32e20e487b5625f28c136be99974470b8e6e36a6bc143da5d17c4a18c0ac SHA512 e8e7d6acfd2cd7a7891b838826b79c7c3afe7817dba6b2435d278486f46c159fd18b132ff674911c355fed89f000855d3d0c94e02a84392bc8c4dde4317f6c0d
diff --git a/dev-ruby/kissfft/kissfft-0.0.2.ebuild b/dev-ruby/kissfft/kissfft-0.0.2.ebuild
index 7b7cead2712a..d372c33187f8 100644
--- a/dev-ruby/kissfft/kissfft-0.0.2.ebuild
+++ b/dev-ruby/kissfft/kissfft-0.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/levenshtein/Manifest b/dev-ruby/levenshtein/Manifest
index fdc0995b127d..5a7363d750a8 100644
--- a/dev-ruby/levenshtein/Manifest
+++ b/dev-ruby/levenshtein/Manifest
@@ -1,3 +1,3 @@
 DIST levenshtein-0.2.2.gem 7680 BLAKE2B f10a6b4079c74bfd5ade5113fc96e3551d7b78192aeb8ad68ef40e5813b3c00707614bab362d4cd9a7331be04f74611e016c2d95f7a82964cb2d4ef7ce813e8d SHA512 a84300b6590ab8c5fe2cc4e6f243ccec397cb97f7a241f635d2344433365b846701f9f4cccd7e574a1e50cf389ed03e3fe9992b6c2f21e12806a0c3ab08f03d0
-EBUILD levenshtein-0.2.2-r2.ebuild 714 BLAKE2B d557e7fd7e5f74f239203f87d725d9e1e04d013dee19531c637511827767c4e97162bf41db6b38b039d09bc6fc8b62c91ecb6860c5de03c3e408e2e27d8f9cc7 SHA512 29f9f455ada2af17778f297b9a05006ac8354e908f95d061bae6dfa3da26fbc34138749315328a1f6ef8ae0cbd692101c56dbe61e9a177807480cbd82190cb37
+EBUILD levenshtein-0.2.2-r2.ebuild 714 BLAKE2B f386af58cd959492e1dc6816c82e51a94eb348bb77d5f1cf3c4c08793c24caff707c2571dabcd1119923e8ccfc7a82148cba7ee9b116cc0cb2358c591d5c8f69 SHA512 591644ef08503dc3bf52f94e8a4369858a36673553012508a7c63572fb9e9cd05284e7493659d15b0dabcbf3e77d3e6b348280a2b37634aa61d3e74eb34c34b0
 MISC metadata.xml 338 BLAKE2B b97d8b2698a1bbffbcd29b4e9ee96bf8cbceee7b317adec462230d979ebeef2edc7865f336ffb2a9e712596cbcb8ac308f1d23aaffa774b43278442b7cddf1c0 SHA512 924a32d980f01b8a3da22f72fc87e799929dd8c8e13102189a348bfbe4fe8a03fb1f4028322771007f33ed9fc9ca8ed9b179d25f008a9da722640e6ac49659fd
diff --git a/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild b/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
index 5c8dbbb90957..efb97d045db3 100644
--- a/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
+++ b/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 2688c15f58f2..115f05213fd5 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index 6d074d687923..41520434537d 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -1,9 +1,12 @@
 DIST racket-5.3.6-src-unix.tgz 19278914 BLAKE2B 4809523b58b0c7ec60d80a912c560550602c9016802d8bf5bf42aa64d54c9dd5165357cc5cdaf98d2c3cf6fe9f26054434da10c3f2804bbf4f51526d6fa69592 SHA512 08e8b599e800f41c9497b07e163ed43ae02ae9d9bcc3e20da31eb2f6aa20aa4b0071db51e93696ae1bd644ddfa1c3aea587a334db24ced4a3654dcf5da138e8f
+DIST racket-6.11-src-builtpkgs.tgz 122307703 BLAKE2B 395b14c15b73dfda7b6e863a83530b5266ec2f132b3b8ee23ee60bea0083b42e1dd67c60cbdfca2cac93c343e3a4edf132677c707aed62d85c43ae27edb2de74 SHA512 2b9f6b478880a9ec176018f34a3015f5e84ceb11e61519d9ab9f7df8d4b8dc664fa9103ca787664ffcd86909410fbf6812838a59d899f3487dea278e39eb597b
 DIST racket-6.7-src-builtpkgs.tgz 116773863 BLAKE2B 786552b296449cd105450450f7232ba5468aba0ed6d96aa6db058cc3eb655808f031259ee69d1ab8abb9a751151e28e923d4388860ed37d74a1f6a637f740f0f SHA512 63fdc18e72fa152434d0fb83e926c28d2b2d16c93a0a2be0c14d445671c1bff5daf500e9917e41fa2f60454377de0cc10d226c321402abf4bad55a15ac74f127
 DIST racket-6.9-src-builtpkgs.tgz 118620147 BLAKE2B 839eac29098a1255ce63886aadbd120fba75865c713b272ccbc2b7a7be361cb12ebcd4eabc94a243c5abab57d4b759c9ce2f613f2d02ef11e33b5931d00420ab SHA512 14144c408521034b9c57925cd01ca25488cdcbcd3f8b943074f8ea434b84bdd76a73095ef920051a925929e3fcb4707bfd6b1585a7debaf23069f1a0db06298b
+DIST racket-minimal-6.11-src-builtpkgs.tgz 11208413 BLAKE2B 17e979ab6e4c99f781994d48ca90e206618835e2ecfa875d0966efe2909a440c509fe9706cccb7f377675a0bb4d76971ed4dd73de2c088ae40660df50b6cf7cc SHA512 f197a645e7da04c120f1cb61d98a1cd47824576467a2fa12753576b72f258d1229cc99243f91ed87cf37be63062c26844b44469987d7ac4bfeee853aa7cb6e66
 DIST racket-minimal-6.7-src-builtpkgs.tgz 11213736 BLAKE2B 1661fe1818d0b2c0d2c058aead61e25c5df01201d3ccdb31fccca14e9c1f2f822c18bfad6be3c1b7446d692c252129b63340b37e0311848269a914197416eee9 SHA512 59c885b535ed8e91a3b2a524bbc38661a5c19848ded935cc9f068c3fd6c8da39fc0755ef8df3a69cce3d50b96ee30d91972d6a4f6d5414eefb80bdc1ede6a285
 DIST racket-minimal-6.9-src-builtpkgs.tgz 11065867 BLAKE2B 3752ffb92a4ae290339599bb6ae83dd0db952eebdeb01c0d4bc9992cd903abf9970cab9e571c06a81644dc90479e3ce72b068e6c2f959d66abb90ced0d6cdfd7 SHA512 4d619e2b2efc852b24f925b51fe452316693ce850f71298fcb2a0009fe5770c15fbe88830f8a214cbfd4e0be57e6bd47ca963c0bd919bd5fc1f986f96d7a12f5
 EBUILD racket-5.3.6.ebuild 1966 BLAKE2B b6e757f11d83f93c85e0b38fa05c8d62a13a0b4864090894bb2b8288de0e80835702d26e2690e5c00eed106ae9c7228c24686458bc54383610e549bf7be509e3 SHA512 6d653d903955e1336064c3f7f38375d7deed674af2a585ec0d3ff1978b1f0d40f97a631a007a128604f82a6d9bad91b1636f19baa68faffe0da9fea711b33389
+EBUILD racket-6.11.ebuild 2276 BLAKE2B 3233e72dd4ee8516511341f402ccc3d3646818eaf9019d8019bd0c46b649d322da345fd03eb482a40a74fd9a01a09ab7bb75ad1d6bb94812e0a5ffc1b1998e72 SHA512 797a8166f566239256b90cc32925388cbfd793f5b8576dc36c298ec21c1749851ad197f620cb678a8b9ff6b12189bb574785e04ebbef015487b71bb9567c9ae1
 EBUILD racket-6.7.ebuild 1833 BLAKE2B 7ad1c839423c322b4052c7c092244bdb09ac29cd950da33e9766fd355868c5ff355ccc4e21e72244665e73d569f6e1da646e9546b3e13579080b616b4dbe67e6 SHA512 c67c71c65491ee53b3fd0e3d33d44a7a5af6fdbd6322a985c6f52d691a51d043b1226231a7dbad5d872ad8b34e417d10e515146127f18789c2ced00264c44f3c
 EBUILD racket-6.9.ebuild 3882 BLAKE2B 2ce393fccc45d7406f817ece4eed55be16054fa0345adcf612846c875d1340ac7165160e13e689ffd8b6d6cccfbae300a0a0bfef6cc494a35915e695a6bb9b53 SHA512 a4596804668d509c03f1c5ac958a8c959b2d64525c214f9f6b2688de3d6a458262bff9bef3ca48f58faab5bcf3bc2999037f16c0406e31e8d6a0ebdc4c031a44
 MISC metadata.xml 1713 BLAKE2B 95b9014b0df1d51b91b7e1668236a48f4b7003222204dd3d350e326a0647b766c5465198da1b74263933f88ca41bdce8311bcb3603174e2ab87edbe5471be76a SHA512 03ede908f3fd71dca9e60f6064ba626386506f0b2eb310d6668f79cb48a6d7a12c04765302a0375839dea651526add8773e9b43bb888fb1b671f36b89a70003c
diff --git a/dev-scheme/racket/racket-6.11.ebuild b/dev-scheme/racket/racket-6.11.ebuild
new file mode 100644
index 000000000000..5390fb50a0ec
--- /dev/null
+++ b/dev-scheme/racket/racket-6.11.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils
+
+DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
+HOMEPAGE="http://racket-lang.org/"
+SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
+LICENSE="GPL-3+ LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc +futures +jit minimal +places +threads +X"
+REQUIRED_USE="futures? ( jit )"
+
+RDEPEND="dev-db/sqlite:3
+	media-libs/libpng:0
+	x11-libs/cairo[X?]
+	x11-libs/pango[X?]
+	virtual/libffi
+	virtual/jpeg:0
+	X? ( x11-libs/gtk+[X?] )"
+RDEPEND="${RDEPEND} !dev-tex/slatex"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	default
+	rm -r foreign/libffi || die 'failed to remove bundled libffi'
+}
+
+src_configure() {
+	# According to vapier, we should use the bundled libtool
+	# such that we don't preclude cross-compile. Thus don't use
+	# --enable-lt=/usr/bin/libtool
+	econf \
+		--enable-shared \
+		--enable-float \
+		--enable-libffi \
+		--enable-foreign \
+		--disable-libs \
+		--disable-strip \
+		$(use_enable X gracket) \
+		$(use_enable doc docs) \
+		$(use_enable jit) \
+		$(use_enable places) \
+		$(use_enable futures) \
+		$(use_enable threads pthread)
+}
+
+src_compile() {
+	if use jit; then
+		# When the JIT is enabled, a few binaries need to be pax-marked
+		# on hardened systems (bug 613634). The trick is to pax-mark
+		# them before they're used later in the build system. The
+		# following order for racketcgc and racket3m was determined by
+		# digging through the Makefile in src/racket to find out which
+		# targets would build those binaries but not use them.
+		pushd racket
+		emake cgc-core
+		pax-mark m .libs/racketcgc
+		pushd gc2
+		emake all
+		popd
+		pax-mark m .libs/racket3m
+		popd
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use jit; then
+		# The final binaries need to be pax-marked, too, if you want to
+		# actually use them. The src_compile marking get lost somewhere
+		# in the install process.
+		for f in mred mzscheme racket; do
+			pax-mark m "${D}/usr/bin/${f}"
+		done
+
+		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
+	fi
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 10e388dff85b..c4e58a965791 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 1ea465710519..c0ced9d625a0 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -11,5 +11,5 @@ DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6a
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 EBUILD boost-build-1.62.0-r1.ebuild 3916 BLAKE2B 613816f7df3ca77952d7428e1669a06e49dad9652c0d26de99d3d37a7216c91259df10b7639161216428b31eaeabd8619053756e978de612c3891991b02b59ef SHA512 56673f5714aa82b4ad00be76b7937d332814c6ac3d4e2824861ffc1565aee1d7f79050a8e4201d8f6144acd1be08f5081c997b1453724c266fcae337894178e1
 EBUILD boost-build-1.63.0.ebuild 3841 BLAKE2B 715dc3661ea600d880979356697252ed07021d3a7e0fc02a06932fba12e85576f422d700a326f27c919b1556ff7ef0d6e22e900379d1303293a6016d31a73a9a SHA512 bfd275e90dc1bf4647029545c288fee3debabbc908bb590068be9c5c7e07624fef258de8d10d2025d3b8e74204b43cbba5bbc88085680937f8b05b9ebc8fd90c
-EBUILD boost-build-1.65.0.ebuild 3848 BLAKE2B 8fa42f4597830383c91947c7f719e906e705266f8adae5aa044b78e5de40c5e4f0010644ce7ec998dfb4b0cdce47814c01ec63e7a0b11f9a9876e452de0da547 SHA512 1dae78bcf22bd0aee970c0a8333728e7f7be414d4bb86f2e0936782aac70ae1dd1da5438c49deabafe5c675aa8b329932032b3e157d51be657ffcaf30bf32efd
+EBUILD boost-build-1.65.0.ebuild 3847 BLAKE2B 708fbd51c23984513df77fa1dad8b51ff228e4171d13c2657797293fada9f22dd58621c82bcee4a0986d75838308f88682e61b64cbf6425f75245c80c9467eaf SHA512 caa5a876648fb1fd0c1b17bb20147af9c5af9d4674253aa1034d3dcd91dd6e1cf277a8d9e9386e13da8b43f092825cf10ac80c9bd64d2d9ff5798a6c7bcb6d10
 MISC metadata.xml 334 BLAKE2B 09d121b81646b5e49bdeae195df0aecab1b0ca738a29c7a89e254efca4655a0a74c1a724003ece1e4cd3363c98496a16c38dda9707d6568861590c58049628e6 SHA512 bc1fa12d69f5711c380a938546914a325ac9dee1b35b2b75136144bbf90190fdc7e113a8eedf26a5c23d1564baf71f936141d71ad715ad6f212f32226601706e
diff --git a/dev-util/boost-build/boost-build-1.65.0.ebuild b/dev-util/boost-build/boost-build-1.65.0.ebuild
index 5fddbe7a45b3..f5eaeca2758f 100644
--- a/dev-util/boost-build/boost-build-1.65.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.65.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 46a0c4e57317..6f9a5013bc59 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,6 +1,8 @@
 AUX checkbashisms-2.15.9-command-vV.patch 1269 BLAKE2B 78225d721d72871dd5512f2adc3f2d6e12c6aef55c5b712f925ecd4555eb5ebc26b865f17ee02181f1b01aa22b4cee8ff66afbfbbc69e1b337c7a6bacf129dcc SHA512 7b7966b2c5fc672b0a83f7949076af536a56e910853374b2ee876ad5032f847bd87c7d10c7836d9699e2a4412709b02f5769685acd392e94704549de639ea995
 DIST devscripts_2.17.10.tar.xz 706396 BLAKE2B 711a991bc958782e0003fd32b947dee8df829d5a3e24268160d1a507b39dea34d9e4ead3999103850c4388f2e4185f655c09c8d5f25d422107bef18eee9d0498 SHA512 eb2bcd29237696e0e768d2513fa895891cb2b368c41c6d611ad7db815400b22317324b8326d4e71b1ab511a8a7abafdf0a2f2641da955034ae58b3d4aad3fc77
 DIST devscripts_2.17.11.tar.xz 708508 BLAKE2B 54f9fccf54a760da1ce9619117040033510a48da815380f0e05beb4fb44a5d8ab9b959328fea11665b66ea36ce56a7810ac52a4010768a8ccf9753c4337c0703 SHA512 bcce427b551ba1ee19b794e4a8243ae6c8efdf7fb6f108b7cd0e43a93ce9a12bee99800fc40c2b8a2bbf6451adceaeadf6042752fa2e404cad2d014ff03474bf
+DIST devscripts_2.17.12.tar.xz 712676 BLAKE2B a0d04f042d5337ab89e5cdb7f16b4de306052e1f7517ed05ff7fab447d8425b44a37941e7672c69f36ce93b3c73c06d706bb6c0e8c0932d626789b0d141193f1 SHA512 21de10d8742c3f2c3c83fc2660ccb7aed112e78c7a7857de62c0fa1b84d7c03a9e488b60a291e5529e3c5632c3f5d206dc11e88ac133a7e84632e1885041e3c5
 EBUILD checkbashisms-2.17.10.ebuild 893 BLAKE2B b193886aa15f2deff05f513dd624bd72c00b8bcdb859ebb035abcc15ea711d034c06105d160bb851602c3ce0729ef30940aa1fdc7ec89d88d25be3141b806f7d SHA512 e4b7e855f6968adf3408c2ac96325833100c63c5ca51e9b81c0d4f679fa8e0a5e53a1ecb13b6f9dc643356ae8591da336d7fbb1bbdaca68809db9f63e8880e2f
 EBUILD checkbashisms-2.17.11.ebuild 895 BLAKE2B c2edf098e6795cfe7a59a2b73c74446886a1f120450a35469d85337c18bc6e6575c23ad52dd69f9e3cec2e0fb1d2d5184bee14de0d18d2720142829af48ad4c2 SHA512 6ae231efbf1bae391b85ca23bf231c66205bd4349014ececb8d22691882d6dc6593787745a79eb686238df10f4921daa41b65b7fc3438cfbd975f0a39ee0f986
+EBUILD checkbashisms-2.17.12.ebuild 895 BLAKE2B 52481361dbca66b0c706e80bc264dd3a8a15f461819df7ccb188c46d17e3aeb0a5e2de6833912e846ac0e21eae3e857486def02a07b95bf28c0d93822fc11c43 SHA512 f0a1ce1e79e0a480c1d901863a834b177cdc48b1457512f7904b0ec8ca1313767971f75d1f8a466e08f1d22f38a47656a64c372956b430c5131a67d473e6f7d2
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.17.12.ebuild b/dev-util/checkbashisms/checkbashisms-2.17.12.ebuild
new file mode 100644
index 000000000000..be58ae776f20
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.17.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long
+	!<dev-util/rpmdevtools-8.3-r1"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+	default
+
+	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
+
+	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index c2f3d947bbae..98224f0f9f86 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,5 +1,3 @@
-DIST devhelp-3.22.0.tar.xz 491908 BLAKE2B ef10aa5030aeac01458e4762694bb7e9d51d2ca1b086de52a4c62b604a437c67eafab63f3b336fc8f0102b4eb0806a31f0bc0a48a4e70f06b15eb95576e881e5 SHA512 16d9853c4514d7b28381e3755e34682a2e9d64d666bb7d39094289d4990eb981efac041b7bf7f8beef5a018cab71c461ecd4e7b7a099fbc132f5b8f7b79749dc
 DIST devhelp-3.24.0.tar.xz 615460 BLAKE2B b81ac9b1453c0edff45fa746a556343345a150c6436d68db4d51f716704eca70e7aa1af4f3deb5b5c2747db65de619be119f36af807490aa8f95fd070c68cc39 SHA512 56b1eeaf9d3c3357d3140002bed5c29bf7b21953d964405190a1c9cad69d08000efa0220bbc36c67db4151b15ee37c37e061e6fa63c8a79f626e1ec0ce386062
-EBUILD devhelp-3.22.0.ebuild 1455 BLAKE2B 9e2e0eb968f08fdcc02a739f59a9c860d834d3a3a1494f37c77a77edb31a73b80d3ed2f48527605283b644250a092b6865cc626c1ecd406b8e03fa9f1517c264 SHA512 3f5d630349d6eaadb41b14b3069dca5d87ac480758624844f56ff30a62172f37e6baf2dac562fea76aaf3a1b88fbc9d6249e997378894a8404c655533617a7ed
 EBUILD devhelp-3.24.0.ebuild 1620 BLAKE2B 3109dbca3591f2b8f5a3ff5bfeb8389bc91a0e07519892f900d68810f2a4780ffacd473f48e8fd79a6b21780da592a815504aa73cf0981f89a64c426770a2974 SHA512 886e1203fd56a94d812e5c870841b2e0078738299860fe70b861a6b9e0a7d4b9787242967c8fab66ac745f1a7b32d8bcce8add9f6e44cddcc636c8df7b525663
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.22.0.ebuild b/dev-util/devhelp/devhelp-3.22.0.ebuild
deleted file mode 100644
index 4630ddc6af96..000000000000
--- a/dev-util/devhelp/devhelp-3.22.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# gedit-3.8 is python3 only, this also per:
-# https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit gnome2 python-single-r1 toolchain-funcs
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-2+"
-SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="gedit"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=x11-libs/gtk+-3.19.3:3
-	>=net-libs/webkit-gtk-2.6.0:4
-"
-RDEPEND="${COMMON_DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+[introspection] )
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use gedit ; then
-		sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		myconf="--with-compile-warnings=no"
-	fi
-	gnome2_src_configure ${myconf}
-}
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
deleted file mode 100644
index 6b7a351be615..000000000000
--- a/dev-util/kdevplatform/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kdevplatform-5.1.2.tar.xz 2051776 BLAKE2B 3e7e91d5438b8a528e640671418399d302c8c9ee96d3e98cfe2ab68e64be63d7af98b1f4f11e512e9e79e17cddbd75731528d7dd9deab52c753a9f5be7dbce8e SHA512 cba58144b1c431789c6ceedee673f365af411a185944c5f6e2d8a8f46bf8bd817de0bbbb454d8ee6c2db28675a78940cb4293bb5e6430bdce77e4bd98e335889
-EBUILD kdevplatform-5.1.2.ebuild 2836 BLAKE2B 649f666faca1af531ce295e83771ab5e9b468525d2dfed0f894a8a3e6f6478f1de70678fd61b0dd68af3d8da168ea4a99ed486c9544eea7ac1102ae550891e13 SHA512 ecd1eb3c9b7b3c15d5a0b0fd4f31e6678403e322a31d19ab10930560db603eadcdc9a9c5975f7ee5da215accf3c0643c0af3969a09c97fc8a97522b46447c4fd
-MISC metadata.xml 421 BLAKE2B 7d76fad463237aca93b41fbf9a43bdbde848c5a0885b9b1a504a74500da9e1c04b9a9f0eb2ed17ad3999d435e9101880d4dfcd7767bce19b94717d26dc103486 SHA512 78367015dc92cfc16e5f10e2a57530e891339dcec777763f58d2ded933655c875c1e83402fa81a1c902a5c0765d7d43b00e2bb138b26148061d6584173681490
diff --git a/dev-util/kdevplatform/kdevplatform-5.1.2.ebuild b/dev-util/kdevplatform/kdevplatform-5.1.2.ebuild
deleted file mode 100644
index 78bfc95f5b5b..000000000000
--- a/dev-util/kdevplatform/kdevplatform-5.1.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.1"
-KDEBASE="kdevelop"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE development support libraries and apps"
-IUSE="cvs reviewboard subversion +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep threadweaver)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	reviewboard? ( dev-libs/purpose )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	cvs? ( dev-vcs/cvs )
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!dev-util/kdevelop:4
-	!dev-util/kdevplatform:4
-"
-
-REQUIRED_USE="test? ( welcomepage )"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-	# root tests subdirectory actually does not contain tests, installs stuff
-	if ! use test; then
-		sed -i -e "/add_subdirectory(tests)/ s/#DONOTCOMPILE //" \
-			CMakeLists.txt || die "Failed to fix CMakeLists.txt"
-		sed -i -e '1s/^/find_package(Qt5Test \$\{QT_MIN_VERSION\})\n/' \
-			tests/CMakeLists.txt || die "Failed to fix tests/CMakeLists.txt"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_cvs=$(usex cvs)
-		$(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		echo
-		elog "For konsole view, please install kde-apps/konsole"
-		echo
-	fi
-}
diff --git a/dev-util/kdevplatform/metadata.xml b/dev-util/kdevplatform/metadata.xml
deleted file mode 100644
index 3017fcac6063..000000000000
--- a/dev-util/kdevplatform/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="reviewboard">Enable reviewboard support</flag>
-		<flag name="welcomepage">Enable welcome page, requires <pkg>dev-qt/qtdeclarative</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 075429f1d8d3..89cc2383da00 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index e965edd2893f..7d85b34aae40 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,10 +1,10 @@
 DIST git-lfs-1.5.6.tar.gz 604139 BLAKE2B a87c3054a5ff354409581f3153b8291646c7a403a5b80f0d7e7c6efd393e93ba728689033b79030ade207c371e5726f4e7920f6ce0016b66e618109c7d8aa9e5 SHA512 f5f2da9ac44647335b25cad3104027cf5476e25ef9763019744123f9e1ef81edadbf5b08a146b8070487b32a18aa202c799f910aee6f2f0144ca411ad6d7cfd2
 DIST git-lfs-2.1.1.tar.gz 649611 BLAKE2B 6a2a499ac446cfbf04977ff56ba0c33ac49f4cfd8d269a4e16e9d15ef7010752fcdc439e09625b76c814ba1b3c3bc086c333ad44ff87da8288da86a31c19cf17 SHA512 9061cb9fdf93a0c119d5762ceebdbc0573491dedb1815512e7eae9da54574087c1e499ea97ba0a87d7356499314beb53d60d1800b5c85983ef835dae37e7dd84
 DIST git-lfs-2.2.1.tar.gz 708806 BLAKE2B f5527c45a9b2415b9c17be8bf8ff04ea1d324cef74fe72ff9c91b5831d3b866d6dd57ab047addc762a4ad84d8f92e1a8dd5a2c21a532c4dffe2f7b3675463217 SHA512 8e1edd588916e6a09c0fe84bdcd80b8773f3874554f941c65819bbb29cdce4846de6408dbb34b33e420d9bc768f6cd07c2dbb0979d243c98f25a32d4fc69dea4
-DIST git-lfs-2.3.1.tar.gz 746077 BLAKE2B 3824caaae18cdfe70064acc40dbf9711de861f9d45324366b5376c56d222cb2c85b3100e372f9c4f49ef32b3b9b7e9b67cbbeebd021bb08af4fc1cc5d3f34538 SHA512 677d963162fdaa8e1de3ecd7f3b86818ee075dc8a293752f89ce67439eebbb32a2d590b19f29547676bf2eb5090b284d5d90c029fe580a6bfbeddb47153936e9
+DIST git-lfs-2.3.4.tar.gz 747313 BLAKE2B c1b2d452894c07974f9857116cab4f2aad547584b6d713824103b2e7f82c8179146a080330ee1154369c22843766a63a09ce1f990c968b55dce9eccc7a306302 SHA512 97174dc9346979777c3951baa86cfc07c85e2df04f13a50114e016facbb3fd5fde08d38825493d4e7ff149a13c87ae44e9e40350cd4950f27fe309ef62b6724a
 EBUILD git-lfs-1.5.6.ebuild 968 BLAKE2B 8064abf9f67f61e1018c5251eb929d39cdb634f9ad35c43d54d4380d5bdf3ec0afbb5f601d942e2a910a6aa9a67f3b5ef36d04f878470738c5b4e621eb498d1f SHA512 030eab94da2e9522b2359261f9b0091c2440672a58ecfb2c67df5aa14cb1c853c6b056702a5594e3a18061e3f9bbfb27b27bb45a0a9d749c57bd943514a0ecf4
 EBUILD git-lfs-2.1.1.ebuild 1153 BLAKE2B 6c67ac1d61b9be2021bea634c5a2a7d4f50b3044d1ddf1ebdcdb21580bc723d5fe8890b098dcb12f5719d415be4fb187ca51414ab2efdbeb54bee72828b2d276 SHA512 317104891a95804da6b28e29b0930aad843597d1d9996518a18e7c71290753ac86405364426693adefc2f103a7b393a97e7d79589dfa05e58a8ed5d6a32a61b1
 EBUILD git-lfs-2.2.1.ebuild 1153 BLAKE2B 6c67ac1d61b9be2021bea634c5a2a7d4f50b3044d1ddf1ebdcdb21580bc723d5fe8890b098dcb12f5719d415be4fb187ca51414ab2efdbeb54bee72828b2d276 SHA512 317104891a95804da6b28e29b0930aad843597d1d9996518a18e7c71290753ac86405364426693adefc2f103a7b393a97e7d79589dfa05e58a8ed5d6a32a61b1
-EBUILD git-lfs-2.3.1.ebuild 1153 BLAKE2B 6c67ac1d61b9be2021bea634c5a2a7d4f50b3044d1ddf1ebdcdb21580bc723d5fe8890b098dcb12f5719d415be4fb187ca51414ab2efdbeb54bee72828b2d276 SHA512 317104891a95804da6b28e29b0930aad843597d1d9996518a18e7c71290753ac86405364426693adefc2f103a7b393a97e7d79589dfa05e58a8ed5d6a32a61b1
+EBUILD git-lfs-2.3.4.ebuild 1153 BLAKE2B 73e72eb7d312d717f3b6a91582acea976744afb8c204926485aa421f8a6d2133a068040d2b11c627e478d2667de599bd8fae984dcaf6c48600c6ab4628153195 SHA512 6d3616d85a7bc7457bfd0ee4499366273cf8b60e029b134da7201f2f087fa3945d81ef9b10f7577d7b9db653179a431fc3115f011fbb829cc86d131b014ac56a
 EBUILD git-lfs-9999.ebuild 1153 BLAKE2B 6c67ac1d61b9be2021bea634c5a2a7d4f50b3044d1ddf1ebdcdb21580bc723d5fe8890b098dcb12f5719d415be4fb187ca51414ab2efdbeb54bee72828b2d276 SHA512 317104891a95804da6b28e29b0930aad843597d1d9996518a18e7c71290753ac86405364426693adefc2f103a7b393a97e7d79589dfa05e58a8ed5d6a32a61b1
 MISC metadata.xml 331 BLAKE2B ec49bde06277ccbdacd3b6c50e0e32c5b14464ad015e1a7a57446e905d0ed9b3b0b71650a455a3b77c5e0ac2530874f37327b1fef3c924577b08c1e1c815c201 SHA512 51f68466f5396fe0326aab5f3a5fa70761647d722d02339fd6072d21976dfd27fdafa1ee44680be98dd0c1b80b29801eb7ed1508aa850104bed564c5f1a38011
diff --git a/dev-vcs/git-lfs/git-lfs-2.3.1.ebuild b/dev-vcs/git-lfs/git-lfs-2.3.4.ebuild
index 7a32ca36cc92..91e0bbf77511 100644
--- a/dev-vcs/git-lfs/git-lfs-2.3.1.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-2.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index a4c2695b2c03..985b9e4a9b57 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,8 +1,10 @@
 DIST tig-2.2.2.tar.gz 1046910 BLAKE2B b88b48fd24257f32a5892a8a60cf13a51e553c4f0e18918e36fc6afea68befa6d12155f143bcebf37e1beab513cf1a39d50254ac76e406d97b5552389c048222 SHA512 e43cf8b4e7938342b581a1238222d5cbf62e242208cd65fc9b3261c4076b7c60c182f9a80613538fcf8b50187cc2844c22f6d1aeaaa8b23864670667a91dbfcd
 DIST tig-2.3.0.tar.gz 1080956 BLAKE2B 48eaa4803a189df8dd8456b58687d4a7cd3b13c003165fba3f705a3e15eb19d4d1e23f9cc1306c5463e21501ee547ce9551c2278d10a6b069cb49e7af93d449f SHA512 d5e8bf04689fdbeab4f2ee60eef1e8e7686827228dc2f87b20c40a3a1c31aa3476d5088423ba8bcb72616a9f0f211a2dbb631a72cc946553e41cb225ea60ab37
 DIST tig-2.3.2.tar.gz 1083036 BLAKE2B 382e17486e79348b72ec67b71db2c09276262b8a9b092e657814f9d3693f2c70c46dc54a7b05ef890497f55fbc41f2232603c936f16d26a0c4d9b73d0d9281fc SHA512 092e1ea876b077a5026ee7b820e908d1d7aaa340805eb4ff975791f88ba1983eab13af669f5e663b28dfdd9e014cb92ef8c164a335705b777be417e3a7d1d5fb
+DIST tig-2.3.3.tar.gz 1082818 BLAKE2B 0e9bcd02726b004c233a5efd7f58e4fda478dc1d2b738a7f8c086a3d71807d319ac8bd296b0f7c7569ed69a5b2b1db18e5c957cc5ce890a67b8f6ee7ead29551 SHA512 1d1cdf7184eeb3fea301c1959023f4aa97c4f8e25fc96cd61933ca39cf7549b6c7e1d9517f7ffd45d212ae9542ea4be07370b41c623cf6d0db8d025634b1d6d1
 EBUILD tig-2.2.2.ebuild 1242 BLAKE2B 9467f9b83664ace378deaed3ff4083515b8d027f67a018a7c82e554e22a0dd6bb5a86c49a78bda76bbfb857a1d0bbf15ba6fc974c58ca2384212d42e45b9bcb7 SHA512 a42a3cf7b2c4b77f7ab8079092b093d1ba83434263a2cf35278466b2bd50edd3165514ac87f6928ea0356e233880bd6ee38d0e6213c70e45090e293a406094cc
 EBUILD tig-2.3.0.ebuild 1247 BLAKE2B 01007fd3d5d4f56aefda7ad21e9df0ef141b8f292e8692f30f5ea0b4b2acfaed4bdcb0c2356a206c85c0103d212d3806ada0ddfcc158c39118b9a2147f6843f5 SHA512 f72db9554da8ad7d348a8c71b0a0e5d8d58ed07f8f2d933df6572e0450dfb26ac1fb49bfcf724a650a264c47bd7833914681b934b2e9719a1b6a057f8f97ead2
 EBUILD tig-2.3.2.ebuild 1247 BLAKE2B 01007fd3d5d4f56aefda7ad21e9df0ef141b8f292e8692f30f5ea0b4b2acfaed4bdcb0c2356a206c85c0103d212d3806ada0ddfcc158c39118b9a2147f6843f5 SHA512 f72db9554da8ad7d348a8c71b0a0e5d8d58ed07f8f2d933df6572e0450dfb26ac1fb49bfcf724a650a264c47bd7833914681b934b2e9719a1b6a057f8f97ead2
-EBUILD tig-9999.ebuild 1245 BLAKE2B a7725f6ee9bba619b877f432c16d00307d771a51d528122c5d8103e114058953850557bfe90ee93b6f744080ed033e46f1c247620faaa367c538c82aa97b8386 SHA512 6fc626f7ff9ebc0bbc83872b75cf9d4d8ad808d3930467de76ff23ac71cb454defc9393ddfd855daa5c7955baad38b4f30c36fe69109532d18e5fa6d3a8d24a8
+EBUILD tig-2.3.3.ebuild 1322 BLAKE2B 6f0cd425ccbe143e45fa5934b2340560a1cad00863cd4691cfb062b745d3f2a8f67672e2e112943d096df23297e11c457d6223e05036780a70cac977591d9302 SHA512 22c37d4453001599b3c7e2cd57da25cb29ac00f44538a916ce1b5cc1c0c95b0e8847a0d5c5223f5fe797355c2c64343eb33dabd34fe84d25ae74a7b26117bafb
+EBUILD tig-9999.ebuild 1322 BLAKE2B 6f0cd425ccbe143e45fa5934b2340560a1cad00863cd4691cfb062b745d3f2a8f67672e2e112943d096df23297e11c457d6223e05036780a70cac977591d9302 SHA512 22c37d4453001599b3c7e2cd57da25cb29ac00f44538a916ce1b5cc1c0c95b0e8847a0d5c5223f5fe797355c2c64343eb33dabd34fe84d25ae74a7b26117bafb
 MISC metadata.xml 330 BLAKE2B b73d4c5a79937e78cff86c138950085a6c69ed2b28c8615d37065c7143df047237c014e8c3306b795a3b4fb64a4584fe06bf23d41caa75138f5d6ca07eb75b22 SHA512 bc921303a62d48f0b1b9792df22bf54c1555545c17a2c44a4f946b800c012067cc122011f7735b0f44d0275279450d6290970f127132dc6947ebe09fcba83e98
diff --git a/dev-vcs/tig/tig-2.3.3.ebuild b/dev-vcs/tig/tig-2.3.3.ebuild
new file mode 100644
index 000000000000..59b31c7161c2
--- /dev/null
+++ b/dev-vcs/tig/tig-2.3.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jonas/tig.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+
+DESCRIPTION="text mode interface for git"
+HOMEPAGE="https://jonas.github.io/tig/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test unicode"
+REQUIRED_USE="test? ( unicode )"
+
+DEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc app-text/xmlto"
+
+# encoding/env issues
+RESTRICT="test"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with unicode ncursesw)
+}
+
+src_compile() {
+	emake V=1
+	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
+}
+
+src_test() {
+	# workaround parallel test failures
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-doc-man
+	dodoc doc/manual.html README.html NEWS.html
+	newbashcomp contrib/tig-completion.bash ${PN}
+
+	docinto examples
+	dodoc contrib/*.tigrc
+}
diff --git a/dev-vcs/tig/tig-9999.ebuild b/dev-vcs/tig/tig-9999.ebuild
index 6e50ecf1bf1c..59b31c7161c2 100644
--- a/dev-vcs/tig/tig-9999.ebuild
+++ b/dev-vcs/tig/tig-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,8 @@ HOMEPAGE="https://jonas.github.io/tig/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="unicode"
+IUSE="test unicode"
+REQUIRED_USE="test? ( unicode )"
 
 DEPEND="
 	sys-libs/ncurses:0=[unicode?]
@@ -27,6 +28,9 @@ RDEPEND="${DEPEND}
 	dev-vcs/git"
 [[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc app-text/xmlto"
 
+# encoding/env issues
+RESTRICT="test"
+
 src_prepare() {
 	default
 	[[ ${PV} == "9999" ]] && eautoreconf
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 1690d69a4483..25ed9c41c13a 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 3df6fe39dbb5..88d9ef89ad15 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -1,6 +1,8 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
+# @DEAD
+# Removal on 2018-03-06.
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
 # kde@gentoo.org
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 82855656e040..939a048d3d42 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -42,6 +42,14 @@ esac
 # definitions, which are then merged together with all other Qt5 packages
 # installed on the system to obtain the global qconfig.{h,pri} files.
 
+# @ECLASS-VARIABLE: QT5_GENTOO_PRIVATE_CONFIG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array of <useflag:feature> pairs that are evaluated in src_install
+# to generate the per-package list of enabled QT.global_private features,
+# which are then merged together with all other Qt5 packages installed on the
+# system to obtain the global qmodule.pri file.
+
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
 # For proper description see virtualx.eclass man page.
@@ -319,7 +327,7 @@ qt5-build_src_install() {
 		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
 	fi
 
-	qt5_install_module_qconfigs
+	qt5_install_module_config
 	prune_libtool_files
 }
 
@@ -327,7 +335,7 @@ qt5-build_src_install() {
 # @DESCRIPTION:
 # Regenerate configuration after installation or upgrade/downgrade.
 qt5-build_pkg_postinst() {
-	qt5_regenerate_global_qconfigs
+	qt5_regenerate_global_configs
 }
 
 # @FUNCTION: qt5-build_pkg_postrm
@@ -335,7 +343,7 @@ qt5-build_pkg_postinst() {
 # Regenerate configuration when a module is completely removed.
 qt5-build_pkg_postrm() {
 	if [[ -z ${REPLACED_BY_VERSION} && ${PN} != qtcore ]]; then
-		qt5_regenerate_global_qconfigs
+		qt5_regenerate_global_configs
 	fi
 }
 
@@ -675,6 +683,9 @@ qt5_base_configure() {
 		# do not build with -Werror
 		-no-warnings-are-errors
 
+		# enable in respective modules to avoid poisoning QT.global_private.enabled_features
+		$([[ ${QT5_MINOR_VERSION} -ge 9 ]] && echo -no-gui -no-widgets)
+
 		# module-specific options
 		"${myconf[@]}"
 	)
@@ -762,15 +773,17 @@ qt5_qmake() {
 		|| die "qmake failed (${projectdir#${S}/})"
 }
 
-# @FUNCTION: qt5_install_module_qconfigs
+# @FUNCTION: qt5_install_module_config
 # @INTERNAL
 # @DESCRIPTION:
-# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files.
-qt5_install_module_qconfigs() {
-	local x qconfig_add= qconfig_remove=
+# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} and
+# ${PN}-qmodule.pri files.
+qt5_install_module_config() {
+	local x qconfig_add= qconfig_remove= qprivateconfig_add= qprivateconfig_remove=
 
 	> "${T}"/${PN}-qconfig.h
 	> "${T}"/${PN}-qconfig.pri
+	[[ ${QT5_MINOR_VERSION} -ge 9 ]] && > "${T}"/${PN}-qmodule.pri
 
 	# generate qconfig_{add,remove} and ${PN}-qconfig.h
 	for x in "${QT5_GENTOO_CONFIG[@]}"; do
@@ -803,14 +816,46 @@ qt5_install_module_qconfigs() {
 		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
 		doins "${T}"/${PN}-qconfig.pri
 	)
+
+	if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
+		# generate qprivateconfig
+		for x in "${QT5_GENTOO_PRIVATE_CONFIG[@]}"; do
+			local flag=${x%%:*}
+			x=${x#${flag}:}
+			local feature=${x%%:*}
+			x=${x#${feature}:}
+
+			if [[ -z ${flag} ]] || { [[ ${flag} != '!' ]] && use ${flag}; }; then
+				[[ -n ${feature} ]] && qprivateconfig_add+=" ${feature}"
+			else
+				[[ -n ${feature} ]] && qprivateconfig_remove+=" ${feature}"
+			fi
+		done
+
+		# generate and install ${PN}-qmodule.pri
+		[[ -n ${qprivateconfig_add} ]] && echo "QT.global_private.enabled_features = ${qprivateconfig_add}" >> "${T}"/${PN}-qmodule.pri
+		[[ -n ${qprivateconfig_remove} ]] && echo "QT.global_private.disabled_features = ${qprivateconfig_remove}" >> "${T}"/${PN}-qmodule.pri
+		[[ -s ${T}/${PN}-qmodule.pri ]] && (
+			insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
+			doins "${T}"/${PN}-qmodule.pri
+		)
+	fi
+
+	# install also the original qconfig.pri
+	[[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]] && (
+		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
+		newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri
+		newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qmodule.pri qmodule-qtcore.pri
+	)
 }
 
-# @FUNCTION: qt5_regenerate_global_qconfigs
+# @FUNCTION: qt5_regenerate_global_configs
 # @INTERNAL
 # @DESCRIPTION:
-# Generates Gentoo-specific qconfig.{h,pri} according to the build configuration.
+# Generates Gentoo-specific qconfig.{h,pri} and qmodule.pri according to the
+# build configuration.
 # Don't call die here because dying in pkg_post{inst,rm} only makes things worse.
-qt5_regenerate_global_qconfigs() {
+qt5_regenerate_global_configs() {
 	einfo "Regenerating gentoo-qconfig.h"
 
 	find "${ROOT%/}${QT5_HEADERDIR}"/Gentoo \
@@ -824,10 +869,15 @@ qt5_regenerate_global_qconfigs() {
 	einfo "Updating QT_CONFIG in qconfig.pri"
 
 	local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri
+	local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri
 	if [[ -f ${qconfig_pri} ]]; then
 		local x qconfig_add= qconfig_remove=
-		local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}")
-		local new_qt_config=
+		local qt_config new_qt_config=
+		if [[ -f ${qconfig_pri_orig} ]]; then
+			qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}")
+		else
+			qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}")
+		fi
 
 		# generate list of QT_CONFIG entries from the existing list,
 		# appending QCONFIG_ADD and excluding QCONFIG_REMOVE
@@ -849,4 +899,61 @@ qt5_regenerate_global_qconfigs() {
 	else
 		ewarn "${qconfig_pri} does not exist or is not a regular file"
 	fi
+
+	if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
+		einfo "Updating QT.global_private in qmodule.pri"
+
+		local qmodule_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qmodule.pri
+		local qmodule_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qmodule-qtcore.pri
+		if [[ -f ${qmodule_pri} && -f ${qmodule_pri_orig} ]]; then
+			local x
+			local qprivateconfig_enabled= qprivateconfig_disabled=
+			local qprivateconfig_orig_enabled= qprivateconfig_orig_disabled=
+			local new_qprivateconfig_enabled= new_qprivateconfig_disabled=
+
+			# generate lists of QT.global_private.{dis,en}abled_features
+			qprivateconfig_orig_enabled="$(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${qmodule_pri_orig}")"
+			qprivateconfig_orig_disabled="$(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${qmodule_pri_orig}")"
+			eshopts_push -s nullglob
+			for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qmodule.pri; do
+				qprivateconfig_enabled+=" $(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${x}")"
+				qprivateconfig_disabled+=" $(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${x}")"
+			done
+			eshopts_pop
+
+			# anything enabled is enabled, but anything disabled is
+			# only disabled if it isn't enabled somewhere else.
+			# this is because we need to forcibly disable some stuff
+			# in qtcore to support split qtbase.
+			new_qprivateconfig_enabled=${qprivateconfig_enabled}
+			for x in ${qprivateconfig_disabled}; do
+				if ! has "${x}" ${qprivateconfig_enabled}; then
+					new_qprivateconfig_disabled+=" ${x}"
+				fi
+			done
+
+			# check all items from the original qtcore qmodule.pri,
+			# and add them to the appropriate list if not overriden
+			# elsewhere
+			for x in ${qprivateconfig_orig_enabled}; do
+				if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then
+					new_qprivateconfig_enabled+=" ${x}"
+				fi
+			done
+			for x in ${qprivateconfig_orig_disabled}; do
+				if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then
+					new_qprivateconfig_disabled+=" ${x}"
+				fi
+			done
+
+			# now replace the existing QT.global_private.{dis,en}abled_features
+			# with the generated list
+			sed \
+				-e "s/^QT.global_private.enabled_features\s*=.*/QT.global_private.enabled_features =${new_qprivateconfig_enabled}/" \
+				-e "s/^QT.global_private.disabled_features\s*=.*/QT.global_private.disabled_features =${new_qprivateconfig_disabled}/" \
+				-i "${qmodule_pri}" || eerror "Failed to sed QT.global_private.enabled_features in ${qmodule_pri}"
+		else
+			ewarn "${qmodule_pri} or ${qmodule_pri_orig} does not exist or is not a regular file"
+		fi
+	fi
 }
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index b6d0902b5d0a..64901baa3c9f 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest
index 4862eaa4d55c..9a2d53986c6c 100644
--- a/games-arcade/gnome-nibbles/Manifest
+++ b/games-arcade/gnome-nibbles/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-nibbles-3.22.2.2.tar.xz 1594596 BLAKE2B 9bdf1aba88e5d0307e748b3a267a2043c52aeb8d027b89d3249c95c2fbb6e29a7a9817655323a4922f16f1f77c59e095c311c3dee2987ab80021850c766c35b8 SHA512 2cbe56dbbe40393cd233f0c2d9cb7327eafa7e837d194970490752ed1525e512efccd6b41b27dbf49b8b29ba9caa788fd5b44554b114eefbf5eed7187e073cbf
 DIST gnome-nibbles-3.24.0.tar.xz 1614604 BLAKE2B 04ba4f761bf21af466cb7761a8d7ac511f92871548df9e8ff8950efe6ea95c3674e00360dc9c3e02ce670dc66ae7639094c9c8c53fe0a0134089db976976ce99 SHA512 716a79541fa8dd0f86cce5bc211574d4ad50f762bb2b74a2881ad4adcdde47520784f67672e2da3fb33fbc60928d710a2afebb8997d6dd10f633289e0d8163b7
-EBUILD gnome-nibbles-3.22.2.2.ebuild 753 BLAKE2B 1f8c87d7f7c020263fcde8ebdeb6da0de2e3e607edab4ed214bdc1c83cc135d6ca69a264c1c57076f66aeb1aafca872c702829f5be5a42a2ee880b14a8e1beea SHA512 71d5fa29853d62f9bd334996726a7ffef786733c35037c479a739531162082020f7ccab570a0759f74792cf8535351dfc1586fa73f12e4816168fb357b97e287
 EBUILD gnome-nibbles-3.24.0.ebuild 753 BLAKE2B 565574cace28e1371697bd7feae61748410817f7429efef86021708a04237e6ac697b15a90f9649a96a68646628d76861e20d580124e0aba772b4d05a1079a5a SHA512 9025a2dc26d2e6ffb63803b89a9a632dc6d79f77ce69fba88d8bdcf3d0e9179bbc4266958cc32d7ae2c05e4f8f893d40b733ff563786f30b5e2655ad9b4a22b4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.22.2.2.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.22.2.2.ebuild
deleted file mode 100644
index 510d0bebe83c..000000000000
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.22.2.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 vala
-
-DESCRIPTION="Nibbles clone for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libgee:0.8=
-	dev-libs/libgnome-games-support:1
-	>=media-libs/clutter-1.22.0:1.0
-	>=media-libs/clutter-gtk-1.4.0:1.0
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.18.0:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50.2
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index e58223867ed3..71b3ac13c18f 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
index bc6d58e08110..cfb18bac721c 100644
--- a/games-board/gnome-chess/Manifest
+++ b/games-board/gnome-chess/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-chess-3.22.2.tar.xz 2774176 BLAKE2B 58f01b71cd59001601dcd29894051c90421b0c12e8c2f6e6b18d72838cb59f0be3eef271528ab27bf33f1f7a8f7addd9fa6fa7d09a5e783c79ca5d2c869aa88e SHA512 ae939c5a79b4f0ae24a8a5b4a3efa0620aaf913ef46d944abad7f638477b0d711e6ca6b7c1e593a67100ad1ae4b423c7d87c51808911cc38e6022a3fbeafb47e
 DIST gnome-chess-3.24.1.tar.xz 2808208 BLAKE2B 6b6eefb8de8e7b91b23752d78d00704546566f060c8971c4fb17b26a28ca44b659891e036f5cc1f42bbfca41d1aaaca153758115eafb4456a3ddb45fe4caf1a8 SHA512 738bae74a547ccf9f0f3dcccaf164af785086ab54190094d602effae0f3f7c07fb6be4eba4aa8706045f70cb12c407a5151bc836d784c0cd254b1c371670e559
-EBUILD gnome-chess-3.22.2.ebuild 902 BLAKE2B 8e526191c677cf3d481f1f1f0ede729e985acfe7129740911d7930dd9bce8099aabb2bc47b61e0f859c4af7539533fc55066ec6eb77e8f78abfad8d989278931 SHA512 91d08b2329c354fa14a7bd7ed6df17ff54ced6891a65d0be51cd2d43d14a845b4d9ba0cfb3c504bbb8fa4063988480ce9d63896e0ef8ef2ac20cee274b63ae85
 EBUILD gnome-chess-3.24.1.ebuild 902 BLAKE2B 848f9c4ecfb05c94f03ce66d22e7b4541931b2751cad353cf931459e19c7a959dc9da5d0769d3dddec46cdf3ed982a40101b2e722715ac5d09c72b7c5f8ce9de SHA512 170391ed43fa640321a36bbea5a2fec6d035583fd6035f801610fe23a868734c8c5a0a6f55c77b8caeb73ef944da2fffdb8d0a4055bb932c639eee75a21b4b07
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-chess/gnome-chess-3.22.2.ebuild b/games-board/gnome-chess/gnome-chess-3.22.2.ebuild
deleted file mode 100644
index a292ac6bfa84..000000000000
--- a/games-board/gnome-chess/gnome-chess-3.22.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 vala readme.gentoo-r1
-
-DESCRIPTION="Play the classic two-player boardgame of chess"
-HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=gnome-base/librsvg-2.32:2
-	>=x11-libs/gtk+-3.19:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="For being able to play against computer you will
-	need to install a chess engine like, for example, games-board/gnuchess"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/games-board/gnome-mines/Manifest b/games-board/gnome-mines/Manifest
index 2cb0247cce6e..3fe2e52a2670 100644
--- a/games-board/gnome-mines/Manifest
+++ b/games-board/gnome-mines/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-mines-3.20.1.tar.xz 3147092 BLAKE2B 899a66905a95a41f007f0b74f8b4054c505b4b46eff6c0ebbefaf1826d36093307a9bbc55e42b6c1abd8a0f9a419a3d1822deb113414bd5eadcba1c3a9896614 SHA512 cdde771736b9110a416ec68d6e4ce2ce10e3de36915b57905f6f5d86a937c75a2dbfafd1ecc0c5f31dd5e267d13444a8a95d38815f400d4597e2fe73a908bd13
-DIST gnome-mines-3.22.2.tar.xz 3138168 BLAKE2B d08cd9b5a6c4da3f8ed4b5a431a853c2ec2056caa69690f8ee41a830dc5411a8aff5c24e0fb464b5b9f3b8e256892fcb743d1ad2ff4be69f1a8ef28b6ec52cec SHA512 3d1be7be2e6ad58c8c57df4790e83674f7da5df42b7be8d692c80e5eabb61d73d825736833f3fb7da6fb8a506cff225c2d557b17c30c8b27e3e22d1c756b5bd0
 DIST gnome-mines-3.24.0.tar.xz 3145152 BLAKE2B e3867ccadb3966e86075d7fbfa1e4ccbf262e5fb3ae0edf8eb162a6bbb411e4cafb9fd7599156153fc0b10a486e3731beb862299586f31df2393049d3e5bac36 SHA512 6975bd0b60160843441f6143f86e55d732be31583c09f17878d7d09199370b65c42e34d61cf447751de686978eb3fd1dbc74ffcec2dca1adc5ab4ceb208af2c0
 EBUILD gnome-mines-3.20.1.ebuild 689 BLAKE2B 206f912abc192a345aac4c0f8edd7f30e07ee1f6df499803cf03102af2c424006e9d089ef91edb71d3d707288c8b58ae3c0b24b9fe6002a59af3ea6be32b9c05 SHA512 15fd8c2465405beb5f33a850ebd96ee94be75aa83ae8486cc723506a5102cace778ba005379da61d583c6b5ae0eaba43cc8055ef4822a910c6d73467df8aa773
-EBUILD gnome-mines-3.22.2.ebuild 712 BLAKE2B d3f8a1b0e7cc245d5be898a4eb89b610262be29d4185c3331400317aa26ddd7c93a712c4c9b3f05fc554162bde799842db92ec8ed69b94f27e4c998996d4549a SHA512 162ec599eb4e0b0b735bda81b9348c13d33a5f5777a09e6e600ef56a58aee552ff337c0a26950896d6752e84956a68182d7431d1a8835d653396749c7dd81193
 EBUILD gnome-mines-3.24.0.ebuild 712 BLAKE2B 5779dfe1a6f9c8c2453a6cda669b9d4fae5d79065c8f0d9fe99164b8dd2e16a378eb45af903364e7557047226dac55b6343ba4810ea7ed91a30d0abf416486f2 SHA512 521d4c00fc00fe81130e1104ced511ca0ca9f8750a3f962b22152f202af9bd9bab04a2d2741c2ae63877b60e32353afb1a37fa2182e1d0e92b4c0f1d9a8b7ad3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-mines/gnome-mines-3.22.2.ebuild b/games-board/gnome-mines/gnome-mines-3.22.2.ebuild
deleted file mode 100644
index b492fb7efc8f..000000000000
--- a/games-board/gnome-mines/gnome-mines-3.22.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 vala
-
-DESCRIPTION="Clear hidden mines from a minefield"
-HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgnome-games-support:1
-	>=gnome-base/librsvg-2.32.0:2
-	>=x11-libs/gtk+-3.12:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 257c5f887f97..0e68797bffca 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index 1cf2962a4f14..e7ce3ce75c74 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-sudoku-3.22.2.tar.xz 2884852 BLAKE2B 69efa4d81c42b39847160038abf7c39fa9473fa7ff65dd4b4189551663ea2a1f215d017f61c2f0db7b081fa80a5dfbc020fb457e1293470bff108fbc6bb63d44 SHA512 4f25848490d3ca1c9a777f7eaf183797c2cff9159851145520ea68d280e46743f5a0f24d5e7290c45d5d5b272ed7cd4d4748116bc573bd117638b620981f6069
 DIST gnome-sudoku-3.24.0.tar.xz 2890256 BLAKE2B 81e8c2cf8df3a441979dfcd6d5726439231d9c4175be1fc765f02aef5bd13bee3675708cd33694f1c2a3a0097e35a83023b6add3bfe7930c4289be576fbfbf2f SHA512 3e00726be6ceebe6107f0e7c1100e1072f815dcaf0f4d5f2ce5cf75ae0393457aead001fe8b43420d20ef6e09bc8a7d6fd79d8aaa72a87c21e7c9f8d18ee0809
-EBUILD gnome-sudoku-3.22.2.ebuild 772 BLAKE2B 5d35e2faf37c16095a88c82e6110c82dbb2455b2a077d63045c6c9d40a44fda04cff6450571d44e7380f26799a4ec596af408f279e4c4c74f2e67eeb21fdf1fe SHA512 d9ccd40508c807d91a5b77c9bb3e7699d36cd06b299889d0d546a4e7175e2062a730e15712ac31de96d0c5837887398ad33ef44cc06e36ea0a30615ecdd5ff4e
 EBUILD gnome-sudoku-3.24.0.ebuild 772 BLAKE2B 7716caf3d721948cba678ee7e260aacb2defb1839c990a81d1686fcd211d48b3ff89f989e702938325a3967f8fc888af543a27fb4fe40538b2101fb2e7eed072 SHA512 b940bda715837ad7814a04e13ac1526cdd42a0c4673524783519d15e7eb91a29d0a45f5e76ec49e4b82227972f6200b1ecbf1172588fcec24bef3f9b3a58d8d5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.22.2.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.22.2.ebuild
deleted file mode 100644
index a6275aec895e..000000000000
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.22.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 vala
-
-DESCRIPTION="Test your logic skills in this number grid puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgee:0.8=[introspection]
-	dev-libs/json-glib
-	>=dev-libs/qqwing-1.3.4
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.19.0:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
index 1934f575af09..43ddd5bb79e7 100644
--- a/games-puzzle/lightsoff/Manifest
+++ b/games-puzzle/lightsoff/Manifest
@@ -1,5 +1,3 @@
-DIST lightsoff-3.22.2.tar.xz 1930644 BLAKE2B 6f9a4ed9ce49a978a68606e672f9f71d0e046141be2e8f5bcbfbb51036fc71953744a6da578de0a9ace3fb3e1a45e9ad10e6fb4b79383186e670338c8bc13705 SHA512 7ea73db9199f1db0d321a10540a15db245684284fc7a5f7860770f01ffe1a5febb287b2d597d1e1a03e1a2bb917ec58df318caca0a6622215469a2e76a2fc05a
 DIST lightsoff-3.24.0.tar.xz 1943672 BLAKE2B fc6c8643e791a7b6e3e1183ea9678138d53aab5ba7234c4c6417b576dda571a741c3eeb8fab36ae5a00b25420fcc1269e412800a4a5c56efc16943905d6002f5 SHA512 ef036512b3c4e60b4419005864c3f6f4f9447af2e4d12fac1df7603f5837adf2cbe0f41f6089d3e683c3606d021d35e0cc41589938054988506aef3881936e6a
-EBUILD lightsoff-3.22.2.ebuild 660 BLAKE2B a261eabe3c7d4975d7c431400b80f0a4de9bbd4b01dc99429c39ed3904e149b02412fa5aa6279b4355dd8422683867b47aa51b285b52a06cdef8b9697a189cb1 SHA512 e2a845b1d957011faa8c3824cb2aae5bfedc9866dbb231b278c44d2a00d8b71d7cd401b0714a08ac75689c9826f32628be6773e14ca12a254b5fe3d115da0ac7
 EBUILD lightsoff-3.24.0.ebuild 660 BLAKE2B 4dbace47d031bc653108e807136c5541794358b6140a92ba5b5f9a8d2925599020fe1401828a2e1175d03311ee030a149c80ff8583457803ea7ce2a10e431886 SHA512 f7631fa627778f32c69cb79091b20f4fdf11e6fdfb771a81b0fdea79de7345ad3e5c48234f8532290b06729e9558eefb8c98ff08d187eda8446fc9e0a3ec95cd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/lightsoff/lightsoff-3.22.2.ebuild b/games-puzzle/lightsoff/lightsoff-3.22.2.ebuild
deleted file mode 100644
index bbd45dd9c4de..000000000000
--- a/games-puzzle/lightsoff/lightsoff-3.22.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 vala
-
-DESCRIPTION="Turn off all the lights"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/librsvg-2.32:2
-	>=media-libs/clutter-1.14:1.0
-	>=media-libs/clutter-gtk-1.5.5:1.0
-	>=x11-libs/gtk+-3.13.4:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index f187046afcb0..a41bb5a51b16 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,5 +1,3 @@
-DIST swell-foop-3.22.2.tar.xz 2294160 BLAKE2B 1bff0a03149e26b00bfda88e58529d4e59a5b68bc3c0891c4337602f88abec810c6de65ad605e3d0e56b24ad8ed6ce701d656d719fca865898122f3a18a400ae SHA512 ada002a883c274cd834db825879cd5c16b222df39212843b0718f953256838af8689bec10a02133dcb140f3567b1a9203c73e1e0c6530469630df6dfdaf7167f
 DIST swell-foop-3.24.0.tar.xz 2313656 BLAKE2B 2a52751eb1390a7bff7956ed21058fef913e5b125f04f6415ccb9aef28cd5517d1c4683318379dafa820c8124d7798ed2142c4ed1277234d70c1b9dfe8403b86 SHA512 470bcf9715e280b9cc7bba79d1d50e924416b6d29058ba0105aee48d30ee58971262e2304610334f92f2f6a9fc6983898047d3ad05443a2cb062e15564388ab0
-EBUILD swell-foop-3.22.2.ebuild 666 BLAKE2B f5a30f8634167ce452c96284393e7e632766275d7e0c1091c62aa9d6f71c8112b63f3a496348f3629f8747ee87d81a7c14d7acea8753f6fcd63e4f457c1ea2a1 SHA512 e7730dbb331706d762d06dcc2d7fb57b07aac42ecb183040d6e4ae6867495d6ea76fdcc330f8068ba62d3ffb8aac4b01bfc1a883f22d5320ba65be0630a82352
 EBUILD swell-foop-3.24.0.ebuild 666 BLAKE2B 6813c366536c6a35d6b47417d8474922ac41371d1646989393ce5ab9eb335092f79ba0c6e27cf0b4e46b1af0d41f8d3f3982c607dd9bbd33191a1add264a2a8b SHA512 195d833ba4322ebcc2c6f8a1f1bfd2e871961b8f533eebf280a14730d1eb303b6c72a1545ead8356187322d40cf55ed2447c3dc9b56267c647ad2ec5ad53b174
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/swell-foop/swell-foop-3.22.2.ebuild b/games-puzzle/swell-foop/swell-foop-3.22.2.ebuild
deleted file mode 100644
index 03c0f5ad7250..000000000000
--- a/games-puzzle/swell-foop/swell-foop-3.22.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 vala
-
-DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=media-libs/clutter-1.14:1.0
-	>=media-libs/clutter-gtk-1.5:1.0
-	>=x11-libs/gtk+-3.12:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index ce23d447513c..b8067bad949d 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 1ac5eefef420..5b5b9fc2bd6a 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -2,5 +2,7 @@ AUX openttd-1.6.0-cflags.patch 1028 BLAKE2B bc71e2620a834b37f5957d3da885dcd5e692
 AUX openttd.initd 412 BLAKE2B 04a18d4a8cd30a600b2e033792714f2a8bee16e0b9207d6609a3c1ef2101a611cf17d028af23c61fcaef3233c7199e45612b90a5c9af14e992a5d7d74b1695f6 SHA512 eb14a32baa8a6601945e5f0cd844e2dc9620661ee4ab841d5085b75a0fb4a1ea8698b9292a489d63792d1163a13c7843795ef843fe0babdeac0a0468313667a3
 AUX openttd.initd-r1 306 BLAKE2B d36e2f405a1b8808c708edd0c66e23d9976c2f5ef0fc2af3430bb8ba287c237dffe3d11cde6428b8ab668886ac4ff5eb4bc4fe5b39f205da4bf3d7773f66f7ef SHA512 bd04f9d812d5d68eebd953e9a667e5138d8e440139eb9c07f8da089495774b7d45e3b23bfb2af38ed053b333d4ead5f4be5c5fa877ad9f9bb0effee5c4a499dc
 DIST openttd-1.7.1-source.tar.gz 10090311 BLAKE2B 339171cd2895398ee1fedcfd24d1126fbc060b6d4530b267310b3f220448f8e6469a726e71e9882bea117585ea7b9f7271205f576ee2b26de6dec079f57f1620 SHA512 4a0d2ee424374b50fe0d089b86ff16b5de3159848a38143ca6745e349b6126567f1e4beda9afe2e6bc21ffffce1166acf719d3f5c95703a14c1379f8857e83d3
+DIST openttd-1.7.2-source.tar.gz 10097175 BLAKE2B a027b6ca6d3116dc3e6ad6ae43965682107268e367032418200cf1c1e16c5b5dad39c275ea57d923f17564d80cceb0e9909dc5aaf7ee230242f0ce0f46f06b1a SHA512 44d25061c42cb9c81baa67a40ff31a6681dcbb121c61db74c5179a31f189919471a82b7fd3f79c2cdeef02af5b47ec35fdbdc7feed74ca2360c028869fe772e8
 EBUILD openttd-1.7.1-r1.ebuild 4811 BLAKE2B 0a362bab76f8ffd48b5f565111aeee4517dc0e3b5c6b93e823189dd314ca83649827173611fca36ca529375c60ceebd654c4f5959dc0c959d0c38a5ba684cf40 SHA512 e54396fa54e8e065be21964fea386b1b734c72395e156b343eec1e2789393bf381093e7212e8ff673dfb849d9d36afc4c11bfc70620543dda7462bda9ccc8787
+EBUILD openttd-1.7.2.ebuild 4811 BLAKE2B 1ff782a7493162f1c76b93c45bbe5509c2d5f090d518e41428b0d04adeb3205ca9ced894b85011c92bc65ce67fe6c581b5685da9c7233d03e0e5f291d1d979ad SHA512 586fcfd067dc19abf56d3064fd7478ea2c7cb4cc38a870bee7d79fc615056b8183b420908897d3739686dcd4f5d5054b3e836d8410ca85a8d0cce92228dc86ee
 MISC metadata.xml 752 BLAKE2B 85476f4dbf68d94a5d95e35cff935edfe35caee4bd2a253c7bad747b0915b80f0f7009bf78e419417a05345210bed17dff8f82ce603480c96781323d7d5a89fd SHA512 ddb1fbbe98d5e0bc1e23385b38502603819b89bd1d9285b0193a55efe2263b8ab6e045c7befdc908303eea27de8c9148dbcc8e7b6c035b267f5c8ff0f16b4b56
diff --git a/games-simulation/openttd/openttd-1.7.2.ebuild b/games-simulation/openttd/openttd-1.7.2.ebuild
new file mode 100644
index 000000000000..f6e90e926ac5
--- /dev/null
+++ b/games-simulation/openttd/openttd-1.7.2.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils gnome2-utils
+
+DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
+HOMEPAGE="http://www.openttd.org/"
+SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
+RESTRICT="test" # needs a graphics set in order to test
+
+RDEPEND="!dedicated? (
+		media-libs/libsdl[sound,X,video]
+		icu? (
+			dev-libs/icu-layoutex
+			dev-libs/icu-le-hb
+			>=dev-libs/icu-58.1:=
+		)
+		truetype? (
+			media-libs/fontconfig
+			media-libs/freetype:2
+			sys-libs/zlib
+		)
+	)
+	lzo? ( dev-libs/lzo:2 )
+	iconv? ( virtual/libiconv )
+	png? ( media-libs/libpng:0 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="
+	!dedicated? (
+		openmedia? (
+			games-misc/openmsx
+			games-misc/opensfx
+		)
+		aplaymidi? ( media-sound/alsa-utils )
+		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
+	)
+	openmedia? ( >=games-misc/opengfx-0.4.7 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-cflags.patch
+)
+
+src_configure() {
+	local myopts=()
+	# there is an allegro interface available as well as sdl, but
+	# the configure for it looks broken so the sdl interface is
+	# always built instead.
+	local myopts+=( --without-allegro )
+
+	# libtimidity not needed except for some embedded platform
+	# nevertheless, it will be automagically linked if it is
+	# installed. Hence, we disable it.
+	myopts+=( --without-libtimidity )
+
+	use debug && myopts+=( --enable-debug=3 )
+
+	if use dedicated ; then
+		myopts+=( --enable-dedicated )
+	else
+		use aplaymidi && myopts+=( --with-midi='/usr/bin/aplaymidi' )
+		myopts+=(
+			$(use_with truetype freetype)
+			$(use_with icu)
+			--with-sdl
+		)
+	fi
+	if use png || { use !dedicated && use truetype; } || use zlib ; then
+		myopts+=( --with-zlib )
+	else
+		myopts+=( --without-zlib )
+	fi
+
+	# configure is a hand-written bash-script, so econf will not work.
+	# It's all built as C++, upstream uses CFLAGS internally.
+	CFLAGS="" ./configure \
+		--disable-strip \
+		--prefix-dir="${EPREFIX%/}/usr" \
+		--binary-dir="bin" \
+		--install-dir="${D}" \
+		--menu-group="Game;Simulation;" \
+		${myopts[@]} \
+		$(use_with iconv) \
+		$(use_with png) \
+		$(use_with cpu_flags_x86_sse sse) \
+		$(use_with lzo liblzo2) \
+		|| die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	default
+	if use dedicated ; then
+		newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
+	fi
+	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use lzo ; then
+		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
+		elog "required, disabling it does mean that loading old savegames"
+		elog "or scenarios from ancient versions (~0.2) will fail."
+		elog
+	fi
+
+	if use dedicated ; then
+		ewarn "Warning: The init script will kill all running openttd"
+		ewarn "processes when triggered, including any running client sessions!"
+	else
+		if use aplaymidi ; then
+			elog "You have emerged with 'aplaymidi' for playing MIDI."
+			elog "This option is for those with a hardware midi device,"
+			elog "or who have set up ALSA to handle midi ports."
+			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
+			elog "Available ports can be listed by using 'aplaymidi -l'."
+		else
+			if ! use timidity ; then
+				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
+				elog "in USE. Music may or may not work in-game. If you happen"
+				elog "to have timidity++ installed, music will work so long"
+				elog "as it remains installed, but OpenTTD will not depend on it."
+			fi
+		fi
+		if ! use openmedia ; then
+			elog
+			elog "OpenTTD was compiled without the 'openmedia' USE flag."
+			elog
+			elog "In order to play, you must at least install:"
+			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
+			elog "following 6 files from a version of Transport Tycoon Deluxe"
+			elog "(windows or DOS) to ~/.openttd/data/ or"
+			elog "${GAMES_DATADIR}/${PN}/data/."
+			elog
+			elog "From the WINDOWS version you need: "
+			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
+			elog "OR from the DOS version you need: "
+			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
+			elog
+			elog "File names are case sensitive, but should work either with"
+			elog "all upper or all lower case names"
+			elog
+			elog "In addition, in-game music will be unavailable: for music,"
+			elog "install games-misc/openmsx, or use the in-game download"
+			elog "functionality to get a music set"
+			elog
+		fi
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 3257ddf02eee..d30b15426e8b 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 44cc1360e0eb..5fd258cd32f4 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,5 +1,7 @@
+DIST freeciv-2.5.10.tar.bz2 40920632 BLAKE2B 1fb6d3d8130088c818ffe95c68a4061732278da8b7e477347cc67e7cc770526a65006844db0d3ecdb462a903fb5589d18666ffe6c9262956bf30fbc0c79742e5 SHA512 198ea42af083ebbfc4d79cbcbc9fc2dd548c92581301d77fd9cff0e2addc7b7255090471dc52aceb966320958b3a4c542615d5ec91a114dfc805fe993864a6f5
 DIST freeciv-2.5.9.tar.bz2 41176249 BLAKE2B d590318e8f03c726fd36714751ed666574951bf988a37b1ee6527a07dcdf4e637cfa525c2ecdf83d537fefdc4c3fd4a3db2c0e037424825af6d1c38f009293c9 SHA512 e8002dc2d0c313ec34d6245f69bf8cc9ed4f98a826d9f564e21cbca379529f6060b8efb3453ec38cb2c7efd222a4aea04033c3ff84b191271ba0af5b770c7677
-DIST freeciv-2.6.0-beta1.tar.bz2 51744941 BLAKE2B e9d25aee0b13c189ff3a0c6a94c8925075fb7da22f40308db5db8d3bec580f46179228bd278279f0aa1d2fff606913af94ed1b25ae4d51f677f98738a056fb97 SHA512 5e70239e375710ec61f69f6daaa62d1c6881df3f5ddb2905229e2c0cec5cad9ce33688693580b2a24aa5aff79471cda4dbef4f9d51df34bd491b5284b12782e5
+DIST freeciv-2.6.0-beta2.tar.bz2 51503051 BLAKE2B 45bf863a530d726261670cbdcd16daefeecaa72e3f090d98d274baa0cd52f3cd0dd1807d660863c822a2dafd170ad51a6b45d756c43aaf6e95e70c74460ce90b SHA512 e92411f43192dc28bcd492f7e78f455cbc18264c7720dd8d35eb86fcc6da5e3927d79751bd1cd6f88d2904283c0844910415df5d7e36d0b9b76ab5fe3c872976
+EBUILD freeciv-2.5.10.ebuild 4479 BLAKE2B 32598e62346d6dce4a2619b3dfc0b420570096c22c0d8fd1370b3ed993ad8de94f8f19bccd2f507cbabf486c26a15242842c538e1964d44e05e9e7035bbfa45f SHA512 1c0e9534ae300177ffa95270cc2ab3771f22c10fb824595353a05347db88afbc28c394eb6be69a4a5ea2e1ea963bf6a7600196080d326e7b4e9aabbbe9c46f24
 EBUILD freeciv-2.5.9.ebuild 4479 BLAKE2B 485d96ca30a282fbb74123f7b790a0542ac2afe9840926f035316aa1a7a07a7363d7be9fc8bceff80648e869804ef528e5c59546731d4d463cc61871f7adb4b2 SHA512 74e95249151f15bf63cb82a0bf7f3d3472ff33eb47882fce67e4dfe531dc9f6ec207f522faf0b8b6ae47583600b54328b636cb0103d864823374d2819561acd4
-EBUILD freeciv-2.6.0_beta1.ebuild 4645 BLAKE2B 3ccc20fa4e1db55cc6de71a7e7420019172a3c787a22a3bed4bb7f0e4b8d179d4abd2a1f81de4e29fcb172d4f61dbc071a077338637b60b05ebbe61fe110ee6f SHA512 ac35d5ea418b765360f1771eb14e9a03c47c725b379d4e30f679dd8189b4a14dd15d98f1d32db505c5e4fb92aa79568ea71898e5c699447ce5b966cb2ccd2e35
+EBUILD freeciv-2.6.0_beta2.ebuild 4645 BLAKE2B 98fcba2d7b6b879e0446c56bf380b863b9862456568b6d674260a89077bec082af9c7d792938f3550ff05ea7ff5adb4a35f74e4664a8798f2b0812e320e377c7 SHA512 1d2994b0c2b5f3eb6112ffd9ff4f51a3e8d21a7ce99f119b9e00ec1b4b86960e767860d1ec8322f3f85505ce4d55dec0451a5c71d1fd9bd673ba9acec556d75d
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/freeciv-2.5.10.ebuild b/games-strategy/freeciv/freeciv-2.5.10.ebuild
new file mode 100644
index 000000000000..b235bb640ff1
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.10.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic gnome2-utils
+
+DESCRIPTION="multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/"
+SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+	app-arch/xz-utils
+	net-misc/curl
+	sys-libs/zlib
+	auth? (
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		!mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+	)
+	readline? ( sys-libs/readline:0= )
+	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+	!dedicated? (
+		media-libs/libpng:0
+		gtk? ( x11-libs/gtk+:2 )
+		mapimg? ( media-gfx/imagemagick:= )
+		modpack? ( x11-libs/gtk+:2 )
+		nls? ( virtual/libintl )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		sdl? (
+			media-libs/libsdl[video]
+			media-libs/sdl-gfx
+			media-libs/sdl-image[png]
+			media-libs/sdl-ttf
+		)
+		server? ( aimodules? ( sys-devel/libtool:2 ) )
+		sound? (
+			media-libs/libsdl[sound]
+			media-libs/sdl-mixer[vorbis]
+		)
+		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+	)
+	system-lua? ( >=dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!dedicated? (
+		x11-proto/xextproto
+		nls? ( sys-devel/gettext )
+	)"
+
+pkg_setup() {
+	if use !dedicated && use !server ; then
+		ewarn "Disabling server USE flag will make it impossible"
+		ewarn "to start local games, but you will still be able to"
+		ewarn "join multiplayer games."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# install the .desktop in /usr/share/applications
+	# install the icons in /usr/share/pixmaps
+	sed -i \
+		-e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+		client/Makefile.in \
+		server/Makefile.in \
+		tools/Makefile.in \
+		data/icons/Makefile.in || die
+	sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
+}
+
+src_configure() {
+	local myclient mydatabase myeconfargs
+
+	if use auth ; then
+		if ! use mysql && ! use sqlite ; then
+			einfo "No database backend chosen, defaulting"
+			einfo "to mysql!"
+			mydatabase=mysql
+		else
+			use mysql && mydatabase+=" mysql"
+			use sqlite && mydatabase+=" sqlite3"
+		fi
+	else
+		mydatabase=no
+	fi
+
+	if use dedicated ; then
+		myclient="no"
+		myeconfargs+=( --enable-server )
+	else
+		if use !sdl && use !gtk && ! use qt5 ; then
+			einfo "No client backend given, defaulting to"
+			einfo "gtk2 client!"
+			myclient="gtk2"
+		else
+			use sdl && myclient+=" sdl"
+			use gtk && myclient+=" gtk2"
+			if use qt5 ; then
+				myclient+=" qt"
+				append-cxxflags -std=c++11
+			fi
+		fi
+		myeconfargs+=( $(use_enable server) --without-ggz-client )
+	fi
+
+	myeconfargs+=(
+		--enable-aimodules="$(usex aimodules "yes" "no")"
+		--enable-client="${myclient}"
+		--enable-fcdb="${mydatabase}"
+		--enable-fcmp="$(usex modpack "gtk2" "no")"
+		# disabling shared libs will break aimodules USE flag
+		--enable-shared
+		--localedir=/usr/share/locale
+		$(use_enable ipv6)
+		$(use_enable mapimg)
+		$(use_enable nls)
+		$(use_enable sound sdl-mixer)
+		$(use_enable system-lua sys-lua)
+		$(use_with readline)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use dedicated ; then
+		rm -rf "${ED%/}/usr/share/pixmaps"
+		rm -f "${ED%/}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
+	else
+		if use server ; then
+			# Create and install the html manual. It can't be done for dedicated
+			# servers, because the 'freeciv-manual' tool is then not built. Also
+			# delete freeciv-manual from the GAMES_BINDIR, because it's useless.
+			# Note: to have it localized, it should be ran from _postinst, or
+			# something like that, but then it's a PITA to avoid orphan files...
+			./tools/freeciv-manual || die
+			docinto html
+			dodoc manual*.html
+		fi
+		if use sdl ; then
+			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
+		else
+			rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl*
+		fi
+		rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw*
+	fi
+	find "${ED}" -name "freeciv-manual*" -delete
+
+	rm -f "${ED%/}/usr/$(get_libdir)"/*.a
+	prune_libtool_files
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild b/games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild
index 4fc0202df506..85687658671c 100644
--- a/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 6be376cd2f2f..4da778041b53 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest
index 9fb48265a8c2..8ef0066a6143 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,5 +1,3 @@
-DIST dconf-editor-3.22.3.tar.xz 394760 BLAKE2B 9270d75f64bb0426de2667f7f40d6ec862c3486cc25df7f5103fc3ca4ab6692aaa41b18434a77c7dcb26b0cff4d65f73a0ebb15b07aa48e7e3eb21924a8cf8c6 SHA512 0e1ddce6e970ea23329c6233ed87e6d4541b6f1e991e3159bda44c43b8092a4d983acbca18bbedb88304ac1afb541a15073a261dab9ffe94c94cfd06e3e412dc
 DIST dconf-editor-3.24.3.tar.xz 503520 BLAKE2B 57b0b0de36e2bb5cef33e0171e77f506f16f240d5ab4ab79d7689b7541ce445bce4d87753f312cf9353b2aa44d5cb2f7c734050a5f57ba2b7eae9894fb74d0e3 SHA512 10c98df210cd465e21601342963a19cd5a255abfaa6e96c833070db52d13531288237a129471bf9424d7ea8fef4c2cd4954652850bbb57dd161ce9cf99265361
-EBUILD dconf-editor-3.22.3.ebuild 737 BLAKE2B 08a39097a3b99a70c08f8ab13ab956d3b482d7c513256e31feb003f10f1869864dd65d86a7235fa00616cc054275287b93c2ccf4368bbb4a60619aa7bc25b767 SHA512 98c32c0c2d72a9ee208bccb0c8ed6b0896b2a84d0931d4fd4819271892b74332c98ff0e62bacdc62bfbe32d87bd028f767a1699818ec4828489af7315fb83d54
 EBUILD dconf-editor-3.24.3.ebuild 720 BLAKE2B e172d4b725df1313465113df6b9c3e2a3147c751b80546ed76bb5d895799ce6e6ed8d747cc268bb6cfb80977edf30f21587b169bee7e1fc53bb8b3fb5c584577 SHA512 8092ff30e165e70ce074f3cd5ca08b6a8bb5f1717bdc467ab498a8716c59c750a5c968e99e0b876cc1ae829636a30f15567e7cf9543f5d6fa67835f7b3aef1fb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.22.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.22.3.ebuild
deleted file mode 100644
index 66f2f23f1549..000000000000
--- a/gnome-base/dconf-editor/dconf-editor-3.22.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Graphical tool for editing the dconf configuration database"
-HOMEPAGE="https://git.gnome.org/browse/dconf-editor"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
-
-COMMON_DEPEND="
-	dev-libs/appstream-glib
-	>=dev-libs/glib-2.46.0:2
-	>=gnome-base/dconf-0.25.1
-	>=x11-libs/gtk+-3.22.0:3
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/dconf-0.22[X]
-"
-
-src_configure() {
-	gnome2_src_configure \
-		VALAC="$(type -P true)"
-}
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 6d86b280c590..78be7b40b54d 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,14 +1,9 @@
 AUX 49-keychain-r1 193 BLAKE2B e4653256b9a0a23be84286d25278d2addf464cc541d43f57a33ed0390b562d03acf7f9d8510ad1b09d4a3736d2bb2a323f5fcc473014b6f351abb5bee71a419b SHA512 32a6d72de9b6b7bfbac0a563fc8710576419e6d989fe48da294b92b197722059ee0e46672d5df2833cd1a7dacf5ae4ebc31b12b605416fd25a0924c35e505d21
 AUX 50-ssh-agent-r1 255 BLAKE2B d197daa7db7da3fc667e5bd561d2edf46b484365130a2d72259c4a2f316ec3af957599cd2c755f7e517ff32ed59e068d1dbcd47da6961534668786403590ff20 SHA512 85c8eca948646508ecc52a30a15b94c626196037ab65b4d797df472df34c714aacf800261902febda5b7bc051bff29efc9fff474a0c029838881b7f8704b13ba
 AUX gdm-2.32.0-xinitrc-ssh-agent.patch 842 BLAKE2B 98233eaf06fbe0950aa36bbc8bee2ac7ffa3cdebe75e32b8ef9a5035c383135bfc77e201d2ee07e7ec6b53770bef20484a3fba93b1cd7f434253704b70563e38 SHA512 40630ec2e7bee66102e141a0ba4d02e4202d052bb829606f684b6c23c9f3dbc2d43cea71d7eba163398251af2d7c7b34d0abafee76ccd6400521551de1c385bd
-AUX gdm-3.22.1-pam-module-dir.patch 1565 BLAKE2B ba47933229197cc5d58db61e0ec2ccf4f349f12ff11681774458cc1cd8d8aeecc63dda38d942a9d682d182211cf0e4c6afa54dfdd03ee5f1e87e005d14d206cd SHA512 ccb0e16f6e10501b10fbdbe28d06d14b261db4f66a4b5ed5092005e5b34f10938bfb0124f98e2fb2c793259da44b2fb14e6dd45d227b9a40886e275d6e45cfc3
 AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5
 AUX gdm-3.8.4-logo.patch 805 BLAKE2B 80c323529acfe9287009494060f3e4d588dcf415845d3502840674ac0108cdd721e9af71e2df7cf94bb69fb3526d76e96bd21f31ed002fce460b30fd2afa3a20 SHA512 98dc0b01f4a4cbb87b32ec52450eb21f07bf96dc4d919cf662314c50fe0f2b1a19c90e3d8d2a0de905e8ada41642c0f89aa89dd640ead7e3d732468c9e363fb2
-DIST gdm-3.22.3.tar.xz 1110740 BLAKE2B 9b41a5e4a01acf14037622ee344613f80d6fc6ef352f8b655e9ec1ce939ca2d20de43f982aa54a24763695c612da5b3d9de8d0ce6080f487ccf1d644df95cbef SHA512 b87acfca13c1d71ed1d7390625d1c36d58cfcde0ea969fa29cde5cabcb2fdf386e30e3b4d3ca057c2cdb99c202dca19d2a478b55083c468c7fb595e69881aebf
-DIST gdm-3.24.2.tar.xz 1113644 BLAKE2B 597187008b8ef0ce05d0d3641550a0738a1eabc6d9f683b37bfd49bf71bcfa0b41f46951fe95bcbf18169c9a846df4ed63dda27a3c55dfabf8b5386f5023808a SHA512 6e2649bce5520532a2976bac8a47629fc4c852d7127b913c29a9c43a7dba26d75472a083cbfff7b64bab56deb38ed13d8387d4d302d55f263c80120255a4a270
 DIST gdm-3.24.3.tar.xz 1113992 BLAKE2B 79ae5ccf0477779bdb05cea4f0e8b2766caee0552efe8fe044da655037bfd603f1e4ab89a4eb0687f786bf44e9fd1c27e07bc498a769c8f88f0cc22b2dd1c9b1 SHA512 d8edffb582545f452ec071990fd7d07d6cb755458bc77a9e1b807816f8202f70fc8177e4bb345125075347942c6760c5a5460e3570dc32ee2570ecc15e5f3345
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-3.22.3-r1.ebuild 6173 BLAKE2B 7da9f2ced8335995dfbf121d4be3225405fd9d02590a8bbed1aa7243ea345c78995beab829b65be26ad6042c2e92ea87e360600e25058b05e89922fc168bcffc SHA512 8bb19f74b768ae4a03da42d0bceb9c9d61ecab486419ffae552d6976c5177d0764318d4f5361b024322725f26367edd5f4147a570f7fbfd6d09a194faeca3756
-EBUILD gdm-3.24.2.ebuild 6053 BLAKE2B ce39f0c78046843ab811cf7925d74dc3d58e793bd5fc87492835cc5f6c4a1148c790a63fa38c502e2d34dee1c6060d1f90d65859fb55522b55a5e00517012fe6 SHA512 2c8f15ea34137391cbc33e580f348d43cb50b56cefb58eb2e0b0d643e3c1b1141fc00d985bcb32513fceb0d76274696f66955d6ddf843044f87ae1700c2b4a8e
 EBUILD gdm-3.24.3.ebuild 6051 BLAKE2B b90e06dadb05634f0afe218571c2ebcabc611f6f41ca01a8d40cfea2c35f17457f4181ec6c6a158a7f7c81acadbfc577661285b70ee40cc168d56b2c4dc4ad42 SHA512 b147cc536c6cc94513af5e57422e322a77453225f66b0b9deae9c0ef70a4622f818efa2e53e6d7ba09ffc05c598ded4a608466ff32c56d858aa8fb033fad0997
 MISC metadata.xml 477 BLAKE2B 29eb8d343cd5195f35dc73d07c695dd3090f8f8ea436b88c8a8fb7f15beac82aaeb2b83215443851866e7fcec51aa14ff19c30597a74cd9a73b384ee801b16f0 SHA512 4da6d5a4f518596834d4138db716bf58d2b2f28f07fed6379a6f0d8bdecb6b803fb3b24880dfcb93ff5aac03f512bf08af7f9742d01a497dd4fc6d7a74d1a844
diff --git a/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch b/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch
deleted file mode 100644
index 7dc4392e41cb..000000000000
--- a/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 4fc9023bb86689f1391651fa744d9e63ee1d7bbc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Mon, 21 Nov 2016 08:18:32 +0100
-Subject: [PATCH] pam_gdm: allow setting pam module dir at configure time
-
-Code taken almost verbatim from gnome-keyring.
----
- configure.ac        | 10 +++++++++-
- pam_gdm/Makefile.am |  2 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index dd98992..e0074dd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -476,7 +476,7 @@ dnl ---------------------------------------------------------------------------
- dnl - Check for PAM stuff
- dnl ---------------------------------------------------------------------------
- 
--dnl PAM prefix
-+dnl PAM prefix (configuration files)
- withval=""
- AC_ARG_WITH(pam-prefix,
-             AS_HELP_STRING([--with-pam-prefix=<prefix>],
-@@ -492,6 +492,14 @@ else
- fi
- AC_SUBST(PAM_PREFIX)
- 
-+dnl PAM dir (dynamic modules)
-+AC_ARG_WITH([pam-dir],
-+            [AC_HELP_STRING([--with-pam-dir=DIR],
-+                             [directory to install pam modules in])],
-+             [], [with_pam_dir='${libdir}/security'])
-+PAM_DEST_DIR="$with_pam_dir"
-+AC_SUBST(PAM_DEST_DIR)
-+
- have_pam=no
- AC_CHECK_LIB(pam, pam_start, have_pam=yes)
- 
-diff --git a/pam_gdm/Makefile.am b/pam_gdm/Makefile.am
-index 61d672b..980b31c 100644
---- a/pam_gdm/Makefile.am
-+++ b/pam_gdm/Makefile.am
-@@ -36,4 +36,4 @@ pam_gdm_LTLIBRARIES = \
- 	pam_gdm.la \
- 	$(END_OF_LIST)
- 
--pam_gdmdir = $(libdir)/security
-+pam_gdmdir = $(PAM_DEST_DIR)
--- 
-2.10.2
-
diff --git a/gnome-base/gdm/gdm-3.22.3-r1.ebuild b/gnome-base/gdm/gdm-3.22.3-r1.ebuild
deleted file mode 100644
index ea15676a90dc..000000000000
--- a/gnome-base/gdm/gdm-3.22.3-r1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 pam readme.gentoo-r1 systemd user versionator
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
-
-SRC_URI="${SRC_URI}
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-BY-SA-4.0 )
-"
-
-SLOT="0"
-
-IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.36:2[dbus]
-	>=x11-libs/gtk+-2.91.1:3
-	>=gnome-base/dconf-0.20
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	>=media-libs/fontconfig-2.5.0:1.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	sys-apps/dbus
-	>=sys-apps/accountsservice-0.6.12
-
-	x11-apps/sessreg
-	x11-base/xorg-server
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libxcb
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	virtual/pam
-
-	>=sys-apps/systemd-186:0=[pam]
-
-	sys-auth/pambase[systemd]
-
-	audit? ( sys-process/audit )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	plymouth? ( sys-boot/plymouth )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-# gnome-session-3.6 needed to avoid freezing with orca
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-session-3.6
-	>=gnome-base/gnome-shell-3.1.90
-	x11-apps/xhost
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		gnome-extra/mousetweaks )
-	fprint? (
-		sys-auth/fprintd
-		sys-auth/pam_fprint )
-
-	!gnome-extra/fast-user-switch-applet
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40.0
-	dev-util/itstool
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/randrproto
-	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-DOC_CONTENTS="
-	To make GDM start at boot, run:\n
-	# systemctl enable gdm.service\n
-	\n
-	For passwordless login to unlock your keyring, you need to install
-	sys-auth/pambase with USE=gnome-keyring and set an empty password
-	on your keyring. Use app-crypt/seahorse for that.\n
-	\n
-	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
-	for smartcard support
-"
-
-pkg_setup() {
-	enewgroup gdm
-	enewgroup video # Just in case it hasn't been created yet
-	enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
-	# For compatibility with certain versions of nvidia-drivers, etc., need to
-	# ensure that gdm user is in the video group
-	if ! egetent group video | grep -q gdm; then
-		# FIXME XXX: is this at all portable, ldap-safe, etc.?
-		# XXX: egetent does not have a 1-argument form, so we can't use it to
-		# get the list of gdm's groups
-		local g=$(groups gdm)
-		elog "Adding user gdm to video group"
-		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
-	fi
-}
-
-src_prepare() {
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# Gentoo does not have a fingerprint-auth pam stack
-	eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
-	# Show logo when branding is enabled
-	use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch"
-
-	# allow setting pam module dir, bug #599714
-	eapply "${FILESDIR}/${PN}-3.22.1-pam-module-dir.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	# Xevie is obsolete, bug #482304
-	# --with-initial-vt=7 conflicts with plymouth, bug #453392
-	! use plymouth && myconf="${myconf} --with-initial-vt=7"
-
-	gnome2_src_configure \
-		--enable-gdm-xsession \
-		--enable-user-display-server \
-		--with-run-dir=/run/gdm \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		--with-xdmcp=yes \
-		--enable-authentication-scheme=pam \
-		--with-default-pam-config=exherbo \
-		--with-pam-dir=$(getpam_mod_dir) \
-		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
-		--without-xevie \
-		--enable-systemd-journal \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(use_with audit libaudit) \
-		$(use_enable ipv6) \
-		$(use_with plymouth) \
-		$(use_with selinux) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable wayland wayland-support) \
-		$(use_with xinerama) \
-		${myconf}
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}/49-keychain-r1" 49-keychain
-	newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
-
-	# gdm user's home directory
-	keepdir /var/lib/gdm
-	fowners gdm:gdm /var/lib/gdm
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local d ret
-
-	gnome2_pkg_postinst
-
-	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
-	chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
-	for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
-		[[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
-	systemd_reenable gdm.service
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-base/gdm/gdm-3.24.2.ebuild b/gnome-base/gdm/gdm-3.24.2.ebuild
deleted file mode 100644
index 98e6db80fbba..000000000000
--- a/gnome-base/gdm/gdm-3.24.2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 pam readme.gentoo-r1 systemd user versionator
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
-
-SRC_URI="${SRC_URI}
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-BY-SA-4.0 )
-"
-
-SLOT="0"
-
-IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.36:2[dbus]
-	>=x11-libs/gtk+-2.91.1:3
-	>=gnome-base/dconf-0.20
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	>=media-libs/fontconfig-2.5.0:1.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	sys-apps/dbus
-	>=sys-apps/accountsservice-0.6.35
-
-	x11-apps/sessreg
-	x11-base/xorg-server
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libxcb
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	virtual/pam
-	>=sys-apps/systemd-186:0=[pam]
-
-	sys-auth/pambase[systemd]
-
-	audit? ( sys-process/audit )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	plymouth? ( sys-boot/plymouth )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-# gnome-session-3.6 needed to avoid freezing with orca
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-session-3.6
-	>=gnome-base/gnome-shell-3.1.90
-	x11-apps/xhost
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		gnome-extra/mousetweaks )
-	fprint? (
-		sys-auth/fprintd
-		sys-auth/pam_fprint )
-
-	!gnome-extra/fast-user-switch-applet
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40.0
-	dev-util/itstool
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/randrproto
-	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-DOC_CONTENTS="
-	To make GDM start at boot, run:\n
-	# systemctl enable gdm.service\n
-	\n
-	For passwordless login to unlock your keyring, you need to install
-	sys-auth/pambase with USE=gnome-keyring and set an empty password
-	on your keyring. Use app-crypt/seahorse for that.\n
-	\n
-	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
-	for smartcard support
-"
-
-pkg_setup() {
-	enewgroup gdm
-	enewgroup video # Just in case it hasn't been created yet
-	enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
-	# For compatibility with certain versions of nvidia-drivers, etc., need to
-	# ensure that gdm user is in the video group
-	if ! egetent group video | grep -q gdm; then
-		# FIXME XXX: is this at all portable, ldap-safe, etc.?
-		# XXX: egetent does not have a 1-argument form, so we can't use it to
-		# get the list of gdm's groups
-		local g=$(groups gdm)
-		elog "Adding user gdm to video group"
-		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
-	fi
-}
-
-src_prepare() {
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# Gentoo does not have a fingerprint-auth pam stack
-	eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
-	# Show logo when branding is enabled
-	use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	# Xevie is obsolete, bug #482304
-	# --with-initial-vt=7 conflicts with plymouth, bug #453392
-	! use plymouth && myconf="${myconf} --with-initial-vt=7"
-
-	gnome2_src_configure \
-		--enable-gdm-xsession \
-		--enable-user-display-server \
-		--with-run-dir=/run/gdm \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		--with-xdmcp=yes \
-		--enable-authentication-scheme=pam \
-		--with-default-pam-config=exherbo \
-		--with-pam-mod-dir=$(getpam_mod_dir) \
-		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
-		--without-xevie \
-		--enable-systemd-journal \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(use_with audit libaudit) \
-		$(use_enable ipv6) \
-		$(use_with plymouth) \
-		$(use_with selinux) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable wayland wayland-support) \
-		$(use_with xinerama) \
-		${myconf}
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}/49-keychain-r1" 49-keychain
-	newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
-
-	# gdm user's home directory
-	keepdir /var/lib/gdm
-	fowners gdm:gdm /var/lib/gdm
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local d ret
-
-	gnome2_pkg_postinst
-
-	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
-	chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
-	for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
-		[[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
-	systemd_reenable gdm.service
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index f8cc3f75d6c1..315ee2530c02 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,9 +1,4 @@
-DIST gnome-control-center-3.22.2-patchset.tar.xz 8204 BLAKE2B 5e0c32a2bc48d620def362967ec064772060f9a7d313998c2e970485ff99daf61841532335cb6fa987cf9319a5142b6731173fe400e5081df73ea505e4688dda SHA512 f20b4e53f82fcf31c635aa070e1af7f69a125eb4f67b1ac9e1e9f594da4649031d9e4cc6021a674abfee0046fe1af944f73ed68451db9fc7b168dcd6e765afe7
-DIST gnome-control-center-3.22.2.tar.xz 7277380 BLAKE2B 0966189d3f1e791e11920261bfc37c6ae77af0a4f312263b6623850becd3ba1ad22e886d6a96cc3cdfccc492dc998c6891d583ce8d55f9a4e08daa5de829f55e SHA512 a9ed72c47703fcbbd0d6f3301be7d5b3a8eff2f0c400bde19e14c5d013404fc5907765fb20af40022f7700547d06c02203a919b4db4c191f64f3ac20cb12626a
 DIST gnome-control-center-3.24.2-patchset.tar.xz 8496 BLAKE2B 8bdbfcef3917ec12e82e7a5ea163f14954f9793b806c4a827620d1f693220527540f1b8a8ac0f121dae0bc8fc687f1974544b35cccd0b9e50474386c28d9ddbf SHA512 967258cf003c013881a2555be7624bad227d898cff72fe2899243692f7a06730e5dc79a849728cce6f9a7234a74b2b8433d1689c2846e8389eb9813fe5df1da1
-DIST gnome-control-center-3.24.2.tar.xz 7269112 BLAKE2B 41049a7176eb3de146d8ac8034cce9cdc7365eec11f6db9a1bd21964c5a30b73c22debcd48058ad72cf6ac24bf60e1956ec203502a3dadcceb83350461302387 SHA512 5041d4907cba0ea188663ad574ddaac6c341ec22b69f7a3d6332b8ae0a572fe33eb19eed758f3d593fe6224d793f2ecc3677584ebf0971f3ae145363a1769cc0
 DIST gnome-control-center-3.24.3.tar.xz 7302120 BLAKE2B 026ad3bb34c2bfc2f7a6d398a3c47bc3f620a3f947a0cb43336b437b4926e7a360e287d6020dc0e82eda43955cfb38ffcd7ed94593adac119d7413f63bc437c8 SHA512 70b827f70fb95e8db0ee01e3ba80242dfdb0f90e31c391ca470c372cb6c8626f054e1e5b79e954935e9b567564129b80957091039e16e921e1c93b3d584c71cb
-EBUILD gnome-control-center-3.22.2-r1.ebuild 5245 BLAKE2B 141297b816965b48778e6bf62ef84e395fd3c3075bfbd5d11c97e4e98840792f4e6841dc577a34c14cb43c788993d8389d662aa7fe4102e450c6f1e37fd32c5b SHA512 44612716ac751b1e73f9fc7526c93e154843bfe78f5a302bcc9ef7f881c94535f02e39b38dbd0d4bc9f970554f51bbc76a61fcf42f4278e90671fcae11a0c39b
-EBUILD gnome-control-center-3.24.2.ebuild 5309 BLAKE2B cd087cde303cf9255f6086831cae71725954b3836ae3e910ff844f3ade9c42c4953299d2b4fb2b5e199cb65dc2c33e29e2d97f1ddb0a07aaa355d5b67ecf4c41 SHA512 cdff94b284057745e2abee9c8ff1756fbfe138c6a377d7137f929c34ab25deef145cbe2ac52a7a4a209cb543f3aef206216f01ab789d9c845b3516125264c2c3
 EBUILD gnome-control-center-3.24.3.ebuild 5402 BLAKE2B f964d533504d01348b00859128c7b072de5df21519a80e4ef9311b4ceb6db4a80c874305ad4d4ae1f1b12e1e5bc3f90fb3a3239fd75c4014a8a45a9b463893fd SHA512 9a742f54d74c7cc66c6a010e430694eaf42b8a05bd3532c8a7abd50f3c1a17f2856c6e505d0c7bd86b22cbe7c051a11393d4ba5cd82710f59ef1e554efb5da01
 MISC metadata.xml 592 BLAKE2B b868af571d6fb58f3a7baaa586261025de5be5a928f963f6fde8db3b6549b6dd30c0d73752e296f9ba3b128c96f3a942ed6cecc8acb98d745502483822c9866b SHA512 af75d12dbd91e798b6f81933f5e6cbb73aa0a81858ec711e88e79c2a4a239dbefa9da0375bf01f2614b5098af6a883b5baf27f2f74fc166838ab00e00108b104
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild
deleted file mode 100644
index 0ac1e28bd663..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit bash-completion-r1 gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# udev could be made optional, only conditions gsd-device-panel
-# (mouse, keyboards, touchscreen, etc)
-COMMON_DEPEND="
-	>=dev-libs/glib-2.44.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.22.0:3[X,wayland?]
-	>=gnome-base/gsettings-desktop-schemas-3.21.4
-	>=gnome-base/gnome-desktop-3.21.2:3=
-	>=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit]
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-	>=sys-apps/accountsservice-0.6.39
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99:=
-
-	virtual/libgudev
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.3.0:0.3=
-		>=net-libs/gnome-online-accounts-3.21.5:= )
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-1.2.0
-		>=net-misc/networkmanager-1.2.0:=[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	v4l? (
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${COMMON_DEPEND}
-	|| ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
-	x11-themes/adwaita-icon-theme
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-	sys-devel/autoconf-archive
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-#	sys-devel/autoconf-archive
-
-PATCHES=(
-	# From gnome-3-22 branch
-	"${WORKDIR}"/${P}-patchset/${PV}-fix-build-without-wayland.patch # bug 613192
-	"${WORKDIR}"/${P}-patchset/${PV}-fix-dual-gpu-crash.patch
-	# Make some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	"${WORKDIR}"/${P}-patchset/${PN}-3.22.0-optional.patch
-	"${WORKDIR}"/${P}-patchset/${PN}-3.22.0-make-wayland-optional.patch
-	"${WORKDIR}"/${P}-patchset/${PN}-3.22.0-keep-panels-optional.patch
-	"${WORKDIR}"/${P}-patchset/${PN}-3.22.0-make-networkmanager-optional.patch
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/${P}-patchset/${PN}-3.22.0-gentoo-paths.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable ibus) \
-		$(use_enable kerberos) \
-		$(use_enable networkmanager) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_install() {
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild
deleted file mode 100644
index 553249321083..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit bash-completion-r1 gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# udev could be made optional, only conditions gsd-device-panel
-# (mouse, keyboards, touchscreen, etc)
-# display panel requires colord
-# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional)
-COMMON_DEPEND="
-	>=dev-libs/glib-2.44.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.22.0:3[X,wayland?]
-	>=gnome-base/gsettings-desktop-schemas-3.21.4
-	>=gnome-base/gnome-desktop-3.21.2:3=
-	>=gnome-base/gnome-settings-daemon-3.23.90[colord?,policykit]
-	>=x11-misc/colord-0.1.34:0=
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-	>=sys-apps/accountsservice-0.6.39
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99:=
-
-	virtual/libgudev
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.3.0:0.3=
-		>=net-libs/gnome-online-accounts-3.21.5:= )
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-1.2.0
-		>=net-misc/networkmanager-1.2.0:=[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	v4l? (
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${COMMON_DEPEND}
-	|| ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
-	x11-themes/adwaita-icon-theme
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-	sys-devel/autoconf-archive
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-#	sys-devel/autoconf-archive
-
-PATCHES=(
-	# Make some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	"${WORKDIR}"/${P}-patchset/${PV}-optional.patch
-	"${WORKDIR}"/${P}-patchset/${PV}-optional-wayland.patch
-	"${WORKDIR}"/${P}-patchset/${PV}-optional-networkmanager.patch
-	"${WORKDIR}"/${P}-patchset/${PV}-optional-cups.patch
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/${P}-patchset/${PV}-gentoo-paths.patch
-	# https://bugzilla.gnome.org/show_bug.cgi?id=780544
-	"${WORKDIR}"/${P}-patchset/${PV}-fix-without-gdkwayland.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable ibus) \
-		$(use_enable kerberos) \
-		$(use_enable networkmanager) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_install() {
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-}
diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
index 302fe9695254..501616c677ef 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,5 +1,3 @@
 EBUILD gnome-core-apps-3.20.0.ebuild 1446 BLAKE2B f14dc6f63582ab8f9a11c55e780d3a56a3e9642ed8ebd6c109e9aaabf8f95910c266e124a16adf14f8b4af367fa74c27ac30a4c198c1fb779fd226e6dbd64daa SHA512 265e62a1341dc6dcd4da66ae67e11ae43a5b434fac1b18c329646871201663cee4c7fa1cb1b16526193057d7da9345a38d62e9f82c2f64be8323b2411ef3bd8f
-EBUILD gnome-core-apps-3.22.2.ebuild 1577 BLAKE2B 49c557127cb74dcdf1f0ad52019dcb6078167183135fc336e013839e28b8d54d71187de8065f5e25827ddfde924814ded30f7dccad6086ceada629717b598aaa SHA512 cd1d1c939e04a1b6850b25c7c0a8a0279a5b90f490b61b9b0015fc4eea0e40926cb9e9e9164fd59bab071cb2caba7ae55233a3d47f3c95e95819e6f2a98954d2
-EBUILD gnome-core-apps-3.24.0.ebuild 1571 BLAKE2B 5f93c5c018c2f08f10216036eede44951ca4eebc2a6e119b4a18e2ebe5f42e43d9dd767071ecaba4311834c36da31dd1a5e9016720ff55bb0e37167200487ea6 SHA512 e33c6f3231804e2b764b4ec9b4ca8adf1197913820a4a6743c4462e907e22736191bb4c9e1dd40b6d005173247ec7e0a5fd1f9bb0fb515d51cd49ddc2d824069
 EBUILD gnome-core-apps-3.24.2.ebuild 1506 BLAKE2B 514feee02bfe57ff00f83db8a0beb317a6be0678a066658b39b7740000625ba647410a90384769b7041aa19ea681803124fd492dde4209089a65e769dbe11f59 SHA512 5e7f9285e94ca98f1ea51d17d91f994a657b4a25f41e64357130e40aa287bc10106376b5f98f67fc44664ceb82519886a03d9ff218008ee85a1de4bba191476a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.22.2.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.22.2.ebuild
deleted file mode 100644
index e286334dd136..000000000000
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.22.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+bluetooth +cdr cups"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
-
-# Note to developers:
-# This is a wrapper for the core apps tightly integrated with GNOME 3
-# gtk-engines:2 is still around because it's needed for gtk2 apps
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-settings-daemon-3.22.1[cups?]
-	>=gnome-base/gnome-control-center-3.22.1[cups?]
-
-	>=app-crypt/gcr-3.20.0
-	>=gnome-base/nautilus-3.22.1
-	>=gnome-base/gnome-keyring-3.20.0
-	>=gnome-extra/evolution-data-server-${PV}
-
-	>=app-crypt/seahorse-3.20.0
-	>=app-editors/gedit-3.22.0
-	>=app-text/evince-3.22.1
-	>=gnome-extra/gnome-contacts-3.22.1
-	>=media-gfx/eog-3.20.5
-	>=media-video/totem-3.22.0
-	>=x11-terms/gnome-terminal-3.22.1
-
-	>=gnome-extra/gnome-user-docs-3.22.0
-	>=gnome-extra/yelp-3.22.0
-
-	>=x11-themes/adwaita-icon-theme-3.22.0
-	>=x11-themes/gnome-themes-standard-${PV}
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.20.0 )
-	cdr? ( >=app-cdr/brasero-3.12.1 )
-
-	!gnome-base/gnome-applets
-"
-DEPEND=""
-
-# >=gnome-base/gnome-menus-3.13.3:3  # not used by core gnome anymore, just gnome-classic extensions
-# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.24.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.24.0.ebuild
deleted file mode 100644
index cbe71dc74215..000000000000
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.24.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+bluetooth +cdr cups"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-# Note to developers:
-# This is a wrapper for the core apps tightly integrated with GNOME 3
-# gtk-engines:2 is still around because it's needed for gtk2 apps
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
-	>=gnome-base/gnome-control-center-${PV}[cups?]
-
-	>=app-crypt/gcr-3.20.0
-	>=gnome-base/nautilus-${PV}
-	>=gnome-base/gnome-keyring-3.20.0
-	>=gnome-extra/evolution-data-server-${PV}
-
-	>=app-crypt/seahorse-3.20.0
-	>=app-editors/gedit-3.22.1
-	>=app-text/evince-${PV}
-	>=gnome-extra/gnome-contacts-3.22.1
-	>=media-gfx/eog-${PV}
-	>=media-video/totem-${PV}
-	>=x11-terms/gnome-terminal-${PV}
-
-	>=gnome-extra/gnome-user-docs-${PV}
-	>=gnome-extra/yelp-3.22.0
-
-	>=x11-themes/adwaita-icon-theme-${PV}
-	>=x11-themes/gnome-themes-standard-3.22.3
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.20.0 )
-	cdr? ( >=app-cdr/brasero-3.12.1 )
-
-	!gnome-base/gnome-applets
-"
-DEPEND=""
-
-# >=gnome-base/gnome-menus-3.13.3:3  # not used by core gnome anymore, just gnome-classic extensions
-# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest
index ce8d1cfe7c2d..2ab84d652d38 100644
--- a/gnome-base/gnome-core-libs/Manifest
+++ b/gnome-base/gnome-core-libs/Manifest
@@ -1,4 +1,2 @@
-EBUILD gnome-core-libs-3.22.2.ebuild 1087 BLAKE2B 604caa643e1f198e35c8e753b27e539d925fd349cf5fd5e6d643204ae5fa399d47ff08111a8a325ac5ecba66b75dfa5f838150af97f9b6591f93328eec8ffcbe SHA512 4e69a5b10cffe7e9aca337371d6c105ae6d3dcf802b074bbb4477b3586b0d447baaea4027f204c8c04c22bbde9c1ca762fdb17a73c669a4245dd788688bbd844
-EBUILD gnome-core-libs-3.24.0.ebuild 1083 BLAKE2B 47ca35d840526083ec93a128632f549c0dc8ff0a3606bf5e92d22a72c53899bdb5b956da6b653aab099e354ec4f691bbdcbabfa928b1c23ceaf5e32f6f196bf1 SHA512 1d07361fcd70ce3d90ff0fd02b8619161810f19fb1c1be7bca51509085ccb4ba36406e675e10a85023bee1bbf67a71c14879e670d29d773e9b8cb37d46645275
 EBUILD gnome-core-libs-3.24.2.ebuild 1053 BLAKE2B baea5363a73c2a7ea9f77417d3e224d24983405572d4aaa48fdf41198b489aee0ca9c5df2820a8f676adf2b28b28bc31c9154e8dcab1deee390782b5c14c46d9 SHA512 48301a8470a7d2179ee9a8b639cf449d7493b41abfe48a33f454fe66f88eb67d888827d15f2bccbc63a93923bcbca074ade6e185251a93eac2cc374506284ac0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.22.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.22.2.ebuild
deleted file mode 100644
index b3dc6e221e02..000000000000
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.22.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Sub-meta package for the core libraries of GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="cups python"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# Note to developers:
-# This is a wrapper for the core libraries used by GNOME 3
-RDEPEND="
-	>=dev-libs/glib-2.50.2:2
-	>=x11-libs/gdk-pixbuf-2.36.0:2
-	>=x11-libs/pango-1.40.3
-	>=media-libs/clutter-1.26.0:1.0
-	>=x11-libs/gtk+-3.22.3:3[cups?]
-	>=dev-libs/atk-2.22.0
-	>=gnome-base/librsvg-2.40.16
-	>=gnome-base/gnome-desktop-3.22.2:3
-	>=x11-libs/startup-notification-0.12
-
-	>=gnome-base/gvfs-1.30.2
-	>=gnome-base/dconf-0.26.0
-
-	>=media-libs/gstreamer-1.8.3:1.0
-	>=media-libs/gst-plugins-base-1.8.3:1.0
-	>=media-libs/gst-plugins-good-1.8.3:1.0
-
-	python? ( >=dev-python/pygobject-3.22.0:3 )
-"
-DEPEND=""
-
-# >=x11-libs/libwnck-3.20.1:3 - not used by core packages anymore
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.24.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.24.0.ebuild
deleted file mode 100644
index af22bc2b50b7..000000000000
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.24.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Sub-meta package for the core libraries of GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="cups python"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# Note to developers:
-# This is a wrapper for the core libraries used by GNOME 3
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/gdk-pixbuf-2.36.6:2
-	>=x11-libs/pango-1.40.9
-	>=media-libs/clutter-1.26.2:1.0
-	>=x11-libs/gtk+-3.22.16:3[cups?]
-	>=dev-libs/atk-2.24
-	>=gnome-base/librsvg-2.40.18
-	>=gnome-base/gnome-desktop-${PV}:3
-	>=x11-libs/startup-notification-0.12
-
-	>=gnome-base/gvfs-1.32
-	>=gnome-base/dconf-0.26
-
-	>=media-libs/gstreamer-1.10.5:1.0
-	>=media-libs/gst-plugins-base-1.10.5:1.0
-	>=media-libs/gst-plugins-good-1.10.5:1.0
-
-	python? ( >=dev-python/pygobject-${PV}:3 )
-"
-DEPEND=""
-
-# >=x11-libs/libwnck-3.20.1:3 - not used by core packages anymore
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index f107f33a9f02..03a7703fdfa5 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,9 +1,7 @@
 AUX gnome-desktop-2.32.1-gold.patch 493 BLAKE2B 4a7e5a1d834bb2a8f753e279a96875a34e25126a4a51167a37bcc2d749e1c28694bc53ee32ffe5490e20f6dc1a4f82e9201b5d9753928119be2ff2f3e19ba53b SHA512 1ceb79f150cc271547766044277cb38c45cb8ebaab9edaf5fd7bfc29ed25920c80d4a0331fdc6ed91f5b47cb51d820270714d72d3bec7cd55939f1a1ef7a9c0b
 AUX gnome-desktop-2.32.1-thumbnails.patch 3530 BLAKE2B 5ebed12840808f13e8116ff6e55c08269813dcc5f6acd863c2f845b75efb1879c36539c7690e9812ed034a4756da6b04bd271ecd9f3f07e22831edd6c7e81734 SHA512 8683aae51ba9a97074442b226d24267857d64a911608fc1c8a207fadc69222583c26281d4c16dddfbf7c975eb76fc6d5c08291ff594468dbee6dd92ef0313263
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 BLAKE2B 9c69504b0f904fe04bdaa2e2fd3c6fbdd0cdd67033bae6e21377cce2deb68f05ed85bc735547c036923978ebdb8952c262676a01a33f8d7acffb0b964f97366a SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28
-DIST gnome-desktop-3.22.2.tar.xz 1064496 BLAKE2B 51c4420f7d6c37ee516f1d4c87828f7f3317b51d767b1c2956a4953142f1e8c9bc78497a8b1e0cff63544dd18246336d175e26e56a46fb430ade003df63706a3 SHA512 11ca2e8f6d8c104e11faee614d52039576a69a0e701cde296ec8ce0cdfdedf29a820771b1ee08dafa37f20612f06201875365c9976b48d8b82a137c7e5438046
 DIST gnome-desktop-3.24.2.tar.xz 1064808 BLAKE2B 8574d26f2c2adedd7a287651fb34170e75d1744ad14e6caab8ede87af63b93197bcf4cde60dd9f6352dae8ae7bf8d598d0b24588d3a06cc2192c651b58577562 SHA512 691817fda97fc1c560c72213668eb4c2a8d03cc2433470a78149b3f785e95d9b4b681bceb733a67e1bfda649a6aed7ca4569b4891ee89f824a28d7a95f2782c2
 EBUILD gnome-desktop-2.32.1-r2.ebuild 2321 BLAKE2B 36bbc9ad0c5fadd3eb323e20cdb7bcfcc2a90acaed43c2319f4dc7c6835dd113e8eeeb6fa9a15468320e30a2b549a59e055fde416a9376248cf30b8261080316 SHA512 2631840d679cfdd6522a073012093a9cf532b990016ed6b4317d2a505c1c4dbdfe3b6a80deda8c7f37a69cd4a9edf718266e7c5ffac95f6e3378bc43212b9234
-EBUILD gnome-desktop-3.22.2.ebuild 1599 BLAKE2B 767473a884ce2e4f8c67579a0d9b0b4559ac2be65b7fc3a79b586c47e90696f88613c7fa86d51e58456d178e7b228c52164b4ac96f0a3cd12c4be8a9052c7276 SHA512 95b56cad878377f21fa2acf7892c0c4c01b8b9bb33881a33aaa117276893c7f97d2114b6f00efb0e14d74fb2c84da75161e1e4a793772076ce19005745b3ffd8
 EBUILD gnome-desktop-3.24.2.ebuild 1599 BLAKE2B 320d3099a184f6a2dcb148c74fdc3af8e447877a33af8f8c532dee9e4627f7da6e95e3aa884bad7270ad150d9e2c1082514d7092df34782254b89833b812d70a SHA512 bccc39c9205f7cb40d40dd9456f0abc795fba003215b60f25cc6337d58569fdaf3cdce1a12a4df9d64a3927eedfdfdc1f435a035b968a775f9a11dc99048db6f
 MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.22.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.22.2.ebuild
deleted file mode 100644
index 2ef37f4cb330..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.22.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/12" # subslot = libgnome-desktop-3 soname version
-IUSE="debug +introspection udev"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.44.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.33.0:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.6
-	dev-util/itstool
-	sys-devel/gettext
-	x11-proto/xproto
-	virtual/pkgconfig
-"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-distributor=Gentoo \
-		--enable-desktop-docs \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable debug debug-tools) \
-		$(use_enable introspection) \
-		$(use_enable udev)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index 24be7d9c98ec..b35cfc764173 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,4 +1,2 @@
-EBUILD gnome-extra-apps-3.22.2.ebuild 2294 BLAKE2B 3f0454bbccdb639b285d775c3abc0576d5f0f88db10319d53cf7c09abea58cbb74fe6e9fcdcd869fac0f522133225bbb7d2419c1340d488a5857f60249718dbc SHA512 3621f7dd842bf43f6f53fa84816796b32510250de026fd8bb9d028ee392c48d1797d61d2b1a610ea4540959ce22e4ac2e4d8af58a685bcfa38e51c05a515041a
-EBUILD gnome-extra-apps-3.24.0.ebuild 2271 BLAKE2B cf08ccb749f4447fa49fa7aba6ba792fde0187363f12baeba8ba19d4db9e5b1866778c609a24b929f5e9f525ea1a23e7e5085f232dbab418fbc3f94a5618c7f6 SHA512 9bba68301ecb21e31e582a21b3f1403c088ca6ca86969232d2f472e2ea31adf4dbbb4f5473f3273224184a00564a33fde060a331d295303d32d87b16ae146a91
 EBUILD gnome-extra-apps-3.24.2.ebuild 2335 BLAKE2B 2bafe0766ef3e641f0a7281defcfdb2b75b05b222a5098a552d0a5cd9b4ba7925c82a3fa8889bca4183360a39d7a4a5840c1343e30bf92495f2a1e76b9829645 SHA512 671d41127a5144a31985b96e9768312cb4e4cdfd9a5e45269a18bd3c6d7bae4dc644b265dc358181017542131a8c5f77825cee5c884673f2ee1605b921489f95
 MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.22.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.22.2.ebuild
deleted file mode 100644
index 1936ed666835..000000000000
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.22.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-KEYWORDS="amd64 x86"
-
-# Note to developers:
-# This is a wrapper for the extra apps integrated with GNOME 3
-# Keep pkg order within a USE flag as upstream releng versions file
-# TODO: Should we keep these here: gnome-power-manager, gucharmap, sound-juicer
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}
-
-	>=sys-apps/baobab-3.22.1
-	>=media-video/cheese-3.22.1
-	>=www-client/epiphany-3.22.2
-	>=app-arch/file-roller-3.22.1
-	>=gnome-extra/gnome-calculator-${PV}
-	>=gnome-extra/gnome-calendar-3.22.1
-	>=gnome-extra/gnome-characters-3.22.0
-	>=sys-apps/gnome-disk-utility-3.22.1
-	>=media-gfx/gnome-font-viewer-3.22.0
-	>=gnome-extra/gnome-power-manager-${PV}
-	>=media-gfx/gnome-screenshot-3.22.0
-	>=gnome-extra/gnome-system-monitor-${PV}
-	>=gnome-extra/gnome-weather-3.20.2
-	>=gnome-extra/gucharmap-9.0.2:2.90
-	>=gnome-extra/sushi-3.21.91
-	>=media-sound/sound-juicer-3.22.1
-	>=net-misc/vino-3.22.0
-
-	>=gnome-base/dconf-editor-3.22.1
-	>=app-dicts/gnome-dictionary-3.20.0
-	>=mail-client/evolution-${PV}
-	>=net-analyzer/gnome-nettool-3.8.1
-	>=gnome-extra/gnome-tweak-tool-3.22.0
-	>=gnome-extra/nautilus-sendto-3.8.4
-	>=net-misc/vinagre-3.22.0
-
-	games? (
-		>=games-puzzle/five-or-more-${PV}
-		>=games-board/four-in-a-row-3.22.1
-		>=games-board/gnome-chess-${PV}
-		>=games-puzzle/gnome-klotski-3.22.1
-		>=games-board/gnome-mahjongg-3.22.0
-		>=games-board/gnome-mines-${PV}
-		>=games-arcade/gnome-nibbles-3.22.1
-		>=games-arcade/gnome-robots-3.22.1
-		>=games-puzzle/gnome-sudoku-3.22.2
-		>=games-puzzle/gnome-taquin-3.22.0
-		>=games-puzzle/gnome-tetravex-3.22.0
-		>=games-puzzle/hitori-3.22.0
-		>=games-board/iagno-3.22.0
-		>=games-puzzle/lightsoff-3.22.2
-		>=games-puzzle/quadrapassel-3.22.0
-		>=games-puzzle/swell-foop-${PV}
-		>=games-board/tali-3.22.0
-	)
-	share? ( >=gnome-extra/gnome-user-share-3.18.3 )
-	shotwell? ( >=media-gfx/shotwell-0.24 )
-	tracker? (
-		>=app-misc/tracker-1.10.1
-		>=gnome-extra/gnome-documents-3.22.0
-		>=media-gfx/gnome-photos-${PV}
-		>=media-sound/gnome-music-3.22.1 )
-"
-DEPEND=""
-S=${WORKDIR}
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.0.ebuild
deleted file mode 100644
index e7fe28b82abb..000000000000
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-KEYWORDS="~amd64 ~x86"
-
-# Note to developers:
-# This is a wrapper for the extra apps integrated with GNOME 3
-# Keep pkg order within a USE flag as upstream releng versions file
-# TODO: Should we keep these here: gnome-power-manager, gucharmap, sound-juicer
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}
-
-	>=sys-apps/baobab-${PV}
-	>=media-video/cheese-${PV}
-	>=www-client/epiphany-${PV}
-	>=app-arch/file-roller-${PV}
-	>=gnome-extra/gnome-calculator-${PV}
-	>=gnome-extra/gnome-calendar-${PV}
-	>=gnome-extra/gnome-characters-${PV}
-	>=sys-apps/gnome-disk-utility-${PV}
-	>=media-gfx/gnome-font-viewer-${PV}
-	>=gnome-extra/gnome-power-manager-${PV}
-	>=media-gfx/gnome-screenshot-3.22.0
-	>=gnome-extra/gnome-system-monitor-${PV}
-	>=gnome-extra/gnome-weather-${PV}
-	>=gnome-extra/gucharmap-10:2.90
-	>=gnome-extra/sushi-${PV}
-	>=media-sound/sound-juicer-${PV}
-	>=net-misc/vino-3.22.0
-
-	>=gnome-base/dconf-editor-3.22.3
-	>=app-dicts/gnome-dictionary-${PV}
-	>=mail-client/evolution-${PV}
-	>=net-analyzer/gnome-nettool-3.8.1
-	>=gnome-extra/gnome-tweak-tool-${PV}
-	>=gnome-extra/nautilus-sendto-3.8.4
-	>=net-misc/vinagre-3.22.0
-
-	games? (
-		>=games-puzzle/five-or-more-3.22.2
-		>=games-board/four-in-a-row-3.22.1
-		>=games-board/gnome-chess-${PV}
-		>=games-puzzle/gnome-klotski-3.22.1
-		>=games-board/gnome-mahjongg-3.22.0
-		>=games-board/gnome-mines-${PV}
-		>=games-arcade/gnome-nibbles-${PV}
-		>=games-arcade/gnome-robots-3.22.1
-		>=games-puzzle/gnome-sudoku-${PV}
-		>=games-puzzle/gnome-taquin-3.22.0
-		>=games-puzzle/gnome-tetravex-3.22.0
-		>=games-puzzle/hitori-3.22.0
-		>=games-board/iagno-3.22.0
-		>=games-puzzle/lightsoff-$PV
-		>=games-puzzle/quadrapassel-3.22.0
-		>=games-puzzle/swell-foop-${PV}
-		>=games-board/tali-3.22.0
-	)
-	share? ( >=gnome-extra/gnome-user-share-3.18.3 )
-	shotwell? ( >=media-gfx/shotwell-0.26 )
-	tracker? (
-		>=app-misc/tracker-1.12
-		>=gnome-extra/gnome-documents-${PV}
-		>=media-gfx/gnome-photos-${PV}
-		>=media-sound/gnome-music-${PV} )
-"
-DEPEND=""
-S=${WORKDIR}
diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index b853b43fc0bf..b3d80a61b66b 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,5 +1,3 @@
 EBUILD gnome-light-3.22.0.ebuild 1762 BLAKE2B 7aece5726a0453567f9a0191f42fbe888cb567aad79b5066d19e3fc5f190d451f926cd1298868d137b996fde0111c30c6214ec52c72da04c20a0a889586d8a3c SHA512 6d835eee81128178793ce60d96687f0cf7a5d7e2c6d8329a7df0d1bc54f1fd1fd746a3151c8e1510b66598488a35647c65c01dc06cdc14ff6ae3cad864dec3b5
-EBUILD gnome-light-3.22.2.ebuild 1708 BLAKE2B 7baebff7de3ebd4e9d23277900092da05d778478207e81f4353e8492905f84937a9885498bd38341e25dbe5d0e11cd7dd36ac76c2ed7f4da0bf71192245a947b SHA512 5ed974788a11b4e11fb196f66488a3ab59133ad0ee10ed813878124da6f8c790d1299f71ba9da7d5c7b41ef292f1f436b92e81586cf24cc6568ec01368880fa7
-EBUILD gnome-light-3.24.0.ebuild 1709 BLAKE2B addf0fbfbaab3ee6dee5990daead095913fa2440c4791727a7015ad45d9d16cee6a59b0f617d39f5ab1b3c93988caf27cc50248d21f6bd56b7cfa163165bdd20 SHA512 1dde665871cc76cc788f30db21faad8a24bed02fd8a7d0b7eed70f391c4c91c564086a4eae6e04d97a67af756a340638d2ff5460e56039fc83d66227f1d4b898
 EBUILD gnome-light-3.24.2.ebuild 1709 BLAKE2B a95ca9100ad9842d54fff566dfd4088adf709636eb5a1458446c400ff1f55b807a7a8eef295002ea798c94a064dc7af93de5d693445dfeb1586e5913286c068e SHA512 5a79223238c824c08a835bb6e35036d5ef0d3244a92c04684d716b35a89220830a0a59a19ea44af108b54bbc650b2e85140adf042c81d5fe6a377e28520a4f1e
 MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047
diff --git a/gnome-base/gnome-light/gnome-light-3.22.2.ebuild b/gnome-base/gnome-light/gnome-light-3.22.2.ebuild
deleted file mode 100644
index f1799dbcd4bb..000000000000
--- a/gnome-base/gnome-light/gnome-light-3.22.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-P_RELEASE="$(get_version_components 2)"
-
-DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="2.0"
-IUSE="cups +gnome-shell"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
-
-# XXX: Note to developers:
-# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
-# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
-# any apps, but shouldn't be used by users unless they know what they are doing.
-RDEPEND="!gnome-base/gnome
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
-	>=gnome-base/gnome-control-center-${PV}[cups?]
-
-	>=gnome-base/nautilus-${PV}
-
-	gnome-shell? (
-		>=x11-wm/mutter-${PV}
-		>=gnome-base/gnome-shell-${PV} )
-
-	>=x11-themes/adwaita-icon-theme-${P_RELEASE}
-	>=x11-themes/gnome-themes-standard-${PV}
-	>=x11-themes/gnome-backgrounds-${P_RELEASE}
-
-	>=x11-terms/gnome-terminal-${PV}
-"
-DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.30.2"
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if ! use gnome-shell; then
-		# Users probably want to use e16, sawfish, etc
-		ewarn "You're not installing GNOME Shell"
-		ewarn "You will have to install and manage a window manager by yourself"
-	fi
-}
-
-pkg_postinst() {
-	# Remember people where to find our project information
-	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
-	elog "for information about the project and documentation."
-}
diff --git a/gnome-base/gnome-light/gnome-light-3.24.0.ebuild b/gnome-base/gnome-light/gnome-light-3.24.0.ebuild
deleted file mode 100644
index 8c7d85930318..000000000000
--- a/gnome-base/gnome-light/gnome-light-3.24.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-P_RELEASE="$(get_version_components 2)"
-
-DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="2.0"
-IUSE="cups +gnome-shell"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-# XXX: Note to developers:
-# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
-# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
-# any apps, but shouldn't be used by users unless they know what they are doing.
-RDEPEND="!gnome-base/gnome
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
-	>=gnome-base/gnome-control-center-${PV}[cups?]
-
-	>=gnome-base/nautilus-${PV}
-
-	gnome-shell? (
-		>=x11-wm/mutter-${PV}
-		>=gnome-base/gnome-shell-${PV} )
-
-	>=x11-themes/adwaita-icon-theme-${P_RELEASE}
-	>=x11-themes/gnome-themes-standard-3.22.3
-	>=x11-themes/gnome-backgrounds-${P_RELEASE}
-
-	>=x11-terms/gnome-terminal-${PV}
-"
-DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.32"
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if ! use gnome-shell; then
-		# Users probably want to use e16, sawfish, etc
-		ewarn "You're not installing GNOME Shell"
-		ewarn "You will have to install and manage a window manager by yourself"
-	fi
-}
-
-pkg_postinst() {
-	# Remember people where to find our project information
-	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
-	elog "for information about the project and documentation."
-}
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 4580218302bd..5a1bfe04695c 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,16 +1,10 @@
 AUX 10-user-dirs-update-gnome-r1 299 BLAKE2B ba1537eb23474b47f69937d38cb5b9f0de56631d06b888292b96fd7179e60593c3b9c6c2da86a589a45ae35ccb0e03f169895462044b9fb3e1d600e768a65da1 SHA512 9e4b7e32546433e913928f0e357eef2936750bea0996dbb33443bc1f2ac32a3e38880abad6985a229382ef06138583de65b6f1e76dea3ac4577e10fec7f46b2a
 AUX 15-xdg-data-gnome-r1 262 BLAKE2B 8ea3192680b1cda2076ebceafd7cd4f340f6f4c5f5bbb309f3dfe5af1d50283ca024a508d0d4dc92a6c5fa65de1489cad55451df3016eae3f5cc4070d16e4c78 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc
-AUX 3.22.3-wayland-login-shell.patch 1253 BLAKE2B 8d9a78caf20da8fbd070b1427fbc2df6afd49ad0e68f65443d74582ec46d71c4c1d6187a43c9cfa39ffc9516dc800f68aceea6e896afa6be3c07449338bd0de6 SHA512 3abcdf697b3d1160b37031232e223759e24aff23b97dd1b8e4f1347071bf1575832ac00eae0414d2b9839636b85aaceb028bfbc2e488e38ff5fd17d3497a1b6e
-AUX 3.22.3-xorg-default-translations.patch 15908 BLAKE2B bd3192bc608d7247d51ecc5f5ddb5147cf211c3185bd64eb7aa9af4eec4ce79d415131ecd77eb2931c7dd8b03a20d0f5fdf03c4165b6be3f76546ee2f18b333e SHA512 e71b0dc296b4fd43b6bdc2251d8f1d9eb9d5f5e369100e66427254038de7e2e8e6cc8fed3173a618cf1a2677dc4346c1061a99926f3d8e2f40e2789d4f32f7a3
 AUX 3.22.3-xorg-default.patch 1929 BLAKE2B 0af17b6f73c4c431c4815dd3f1f23a7aef81727ddc179f3f8ad5aa10875562ecc6904e35ccdc55aae76dc956423bd30c4469768a5797023ab79da7e84d125599 SHA512 025ba94a21a3c42b816083e6d99c85ece695487af1153990c1fec63bbb215284efb95a2c8d505afe36b0e4575b0796ca57fe83ae715a8593c8db886b7eacfca1
 AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b
 AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
 AUX defaults.list-r3 18178 BLAKE2B 77d04148ddb7a1ad76b4c59e3d1bd216791c88bc8b25b6f506e36000279610a8742e9a30b1cda5ad364f562e3ac043a2e887d95dfa82c1aa2f8ed2d255aeb2a7 SHA512 1c8cd1a07f0aaacaef2adf7d009a90996b177b348dd6780fc9692728424d8803e517ae4d357fa2324e447b8d082836b60565497b505d54e0559704757b6ecbf3
-DIST gnome-session-3.22.3.tar.xz 777420 BLAKE2B 34d438e1fefcd197f2c51ce9c2866a6d10848c28c2f2cab24ae9ca7b69a6b149aa698fa62c34415ee3c34e72f153b5f62028047604a332ebad73b8f05fbfae66 SHA512 2350ddc485f9e47df9d9351e413b847336506a694e34daa672111784f64d6d24d3e5e6fc25ad03dd13b318b139809ba2312a542801993db586937650b1422ccd
-DIST gnome-session-3.24.1.tar.xz 780632 BLAKE2B efd1c297d4af08e9bbf47e74aa28b4899b22d00248eb4d786afdd688f5c6117f4865561ca5cf4a47bb6fb003e1d9c365a585f7009f24992fe9752391607a3cfb SHA512 507f9f1cddab37f1b66c72291e1885397f7e8b6bfb7c365f6f1ff827649a71380706fe0e3a8c6e74c3c159349a0eea0aabe3d5c7bbae5b29aeb2d49ae715affb
 DIST gnome-session-3.24.2-xorg-default-translations.patch.xz 3392 BLAKE2B afe0e04c6218377e91508fc67add8ec0894dc75d47c039c44a8c47635c0418986e0949f916d6269995c1c8853c3dfaab21a3db86c427d966029ed747d4106aa8 SHA512 0af7d4025647c6dd2c78243d91ec8a61fd171b78904ac28ce48c4f3f7cafb9fd28263410d31d08431e73417ff7910e9bdfc1ea4de0a3290cd5229a96bffc56dc
 DIST gnome-session-3.24.2.tar.xz 783288 BLAKE2B 24b06404b9206a53f394db86a90f9c22c2774432bcb33f136eedd333e813139ded8b9445b4e597f3270ec0b2ef167ce3c2dca2c5b75d5fba977ebcfc4c1bb8ea SHA512 52a609d60303e7d733567cc81698fe4a4042ac17d0260aadb334ab8ad2c355086f8f87c2bcac05f659c28f8f3290128f9ca8875806d199ee27ff84d972333e27
-EBUILD gnome-session-3.22.3.ebuild 4478 BLAKE2B 5300ef756f4547eb290858caf3ae3962a03f4a0e44d17cef37f8a1ec216339909ad45801ea4655d00acdc6dc7febf9bbc2e29c77d63007ab191d1854362c6496 SHA512 90e4d7df11c52df4f6d5b5c13e37a1b2c704b8e21b69f643486d59e95263f9ae5e38cceea12bdabd453ad4b1d4097ec2553eb53c7c79371a5c771da6dcf8277c
-EBUILD gnome-session-3.24.1.ebuild 3593 BLAKE2B 29398b30cbfb735ad5cf85b667b09ebb68e353de2a2578c0c00e151a7f1f9faf5df15b40f2f7b4c85841d1d2a91a6ca59a24280b50e50cefb5fee3e16b93f9f3 SHA512 8c7bfdae77e91973aa0a4517a28843b3ee1a6eb0ac969ce6b1a63e5c6fca10be8de5b692b4597c99c7613ef744fcb168f668a26d71c6d2f136af5cc8c2232545
 EBUILD gnome-session-3.24.2-r1.ebuild 4552 BLAKE2B c5aee03290d0fb718777313002f2a3fe2c7df2d6403e00ca1bbcb3105f21fad2eede1f487e1e9b2b06f2554b436d73310ae3fad994a42f92ca64be81b18f5e11 SHA512 e2ebe3cb856799af58998e74a9d642eb0599bfc0ebed80c7e5047977a8337c925c909ed8fb19bea33ffcd93bf7b5f587bb2ec97f4d97942f6b263bb58c866e89
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch b/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch
deleted file mode 100644
index f82825f4822e..000000000000
--- a/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 97229b322d30cf531e7b7cc7757f83ed80e831bc Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Thu, 5 Jan 2017 10:02:58 -0500
-Subject: [PATCH 1/3] gnome-session: make sure wayland sessions get a login
- shell
-
-Users expect their shell profiles to get sourced at startup, which
-doesn't happen with wayland sessions.
-
-This commit brings back that feature, by making the gnome-session
-wrapper script run a login shell.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=736660
----
- gnome-session/gnome-session.in | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
-index 530299d..04ea741 100644
---- a/gnome-session/gnome-session.in
-+++ b/gnome-session/gnome-session.in
-@@ -1,5 +1,18 @@
- #!/bin/sh
- 
-+if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
-+   [ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
-+   [  -n "$SHELL" ] &&
-+   grep -q "$SHELL" /etc/shells &&
-+   ! (echo "$SHELL" | grep -q "false") &&
-+   ! (echo "$SHELL" | grep -q "nologin"); then
-+  if [ "$1" != '-l' ]; then
-+    exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
-+  else
-+    shift
-+  fi
-+fi
-+
- SETTING=$(gsettings get org.gnome.system.locale region)
- REGION=${SETTING#\'}
- REGION=${REGION%\'}
--- 
-2.10.1
-
diff --git a/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch b/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch
deleted file mode 100644
index 8c259de9d157..000000000000
--- a/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch
+++ /dev/null
@@ -1,619 +0,0 @@
-From abc07aa67043d0013dfcf812101208296bbfa4ac Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 18 Mar 2017 11:42:40 +0200
-Subject: [PATCH 3/3] po: Forward port "GNOME on Wayland" translations
-
----
- po/POTFILES.in | 2 +-
- po/bg.po       | 4 ++++
- po/cs.po       | 4 ++++
- po/da.po       | 4 ++++
- po/de.po       | 4 ++++
- po/el.po       | 4 ++++
- po/es.po       | 4 ++++
- po/eu.po       | 4 ++++
- po/fa.po       | 4 ++++
- po/fi.po       | 4 ++++
- po/fr.po       | 4 ++++
- po/fur.po      | 4 ++++
- po/gd.po       | 4 ++++
- po/gl.po       | 4 ++++
- po/gu.po       | 4 ++++
- po/he.po       | 4 ++++
- po/hr.po       | 4 ++++
- po/hu.po       | 4 ++++
- po/id.po       | 4 ++++
- po/is.po       | 4 ++++
- po/it.po       | 4 ++++
- po/kk.po       | 4 ++++
- po/ko.po       | 4 ++++
- po/lt.po       | 4 ++++
- po/lv.po       | 4 ++++
- po/nb.po       | 4 ++++
- po/pl.po       | 4 ++++
- po/pt.po       | 4 ++++
- po/pt_BR.po    | 4 ++++
- po/ru.po       | 4 ++++
- po/sk.po       | 4 ++++
- po/sr.po       | 4 ++++
- po/sr@latin.po | 4 ++++
- po/sv.po       | 4 ++++
- po/tr.po       | 4 ++++
- po/uk.po       | 4 ++++
- po/vi.po       | 4 ++++
- po/zh_CN.po    | 4 ++++
- 38 files changed, 149 insertions(+), 1 deletion(-)
-
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index cc1170a..0feb5cf 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -2,9 +2,9 @@
- # Please keep this file sorted alphabetically.
- data/gnome-custom-session.desktop.in
- data/gnome.desktop.in
--data/gnome-xorg.desktop.in
- data/gnome-dummy.session.desktop.in.in
- data/gnome.session.desktop.in.in
-+data/gnome-wayland.desktop.in
- [type: gettext/glade]data/session-selector.ui
- gnome-session/gsm-fail-whale-dialog.c
- gnome-session/gsm-manager.c
-diff --git a/po/bg.po b/po/bg.po
-index 7d243fc..7bb73b6 100644
---- a/po/bg.po
-+++ b/po/bg.po
-@@ -50,6 +50,10 @@ msgstr "GNOME с Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME — фиктивна"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME с Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Друга сесия"
-diff --git a/po/cs.po b/po/cs.po
-index a9acc59..4efd144 100644
---- a/po/cs.po
-+++ b/po/cs.po
-@@ -54,6 +54,10 @@ msgstr "GNOME na Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME na Waylandu"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Vlastní sezení"
-diff --git a/po/da.po b/po/da.po
-index de709ac..62a49c3 100644
---- a/po/da.po
-+++ b/po/da.po
-@@ -65,6 +65,10 @@ msgstr "GNOME på Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME-attrap"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME på Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Tilpasset session"
-diff --git a/po/de.po b/po/de.po
-index 051c9ee..a283114 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -61,6 +61,10 @@ msgstr "GNOME unter Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME Platzhalter"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME unter Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Benutzerdefinierte Sitzung"
-diff --git a/po/el.po b/po/el.po
-index 99f92ba..9f1d419 100644
---- a/po/el.po
-+++ b/po/el.po
-@@ -72,6 +72,10 @@ msgstr "GNOME σε Xorg"
- msgid "GNOME dummy"
- msgstr "Εικονικό GNOME"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME σε Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Προσαρμοσμένη συνεδρία"
-diff --git a/po/es.po b/po/es.po
-index 79e3a6d..a9b73b2 100644
---- a/po/es.po
-+++ b/po/es.po
-@@ -56,6 +56,10 @@ msgstr "GNOME en Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME «dummy»"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME en Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sesión personalizada"
-diff --git a/po/eu.po b/po/eu.po
-index da3969d..6b57df1 100644
---- a/po/eu.po
-+++ b/po/eu.po
-@@ -48,6 +48,10 @@ msgstr "GNOME Xorg gainean"
- msgid "GNOME dummy"
- msgstr "Probako GNOME"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME Wayland gainean"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Saio pertsonalizatua"
-diff --git a/po/fa.po b/po/fa.po
-index 1737204..8b1b6e5 100644
---- a/po/fa.po
-+++ b/po/fa.po
-@@ -50,6 +50,10 @@ msgstr "گنوم بر روی Xorg"
- msgid "GNOME dummy"
- msgstr "گنوم ساختگی"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "گنوم بر روی Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "نشست سفارشی"
-diff --git a/po/fi.po b/po/fi.po
-index a3cd0ca..8b5025c 100644
---- a/po/fi.po
-+++ b/po/fi.po
-@@ -51,6 +51,10 @@ msgstr "Gnome Xorgia käyttäen"
- msgid "GNOME dummy"
- msgstr "Gnome-malli-istunto (dummy)"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "Gnome Waylandia käyttäen"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Omavalintainen istunto"
-diff --git a/po/fr.po b/po/fr.po
-index e209804..5fe647a 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -54,6 +54,10 @@ msgstr "GNOME sur Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME factice"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME sur Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Session personnalisée"
-diff --git a/po/fur.po b/po/fur.po
-index 8245a6f..1dc5f85 100644
---- a/po/fur.po
-+++ b/po/fur.po
-@@ -42,6 +42,10 @@ msgstr "GNOME su Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME su Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Session personalizade"
-diff --git a/po/gd.po b/po/gd.po
-index beb1618..ebb67bc 100644
---- a/po/gd.po
-+++ b/po/gd.po
-@@ -48,6 +48,10 @@ msgstr "GNOME air Xorg"
- msgid "GNOME dummy"
- msgstr "Caochag GNOME"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME air Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Seisean gnàthaichte"
-diff --git a/po/gl.po b/po/gl.po
-index 02b9879..2d9c944 100644
---- a/po/gl.po
-+++ b/po/gl.po
-@@ -51,6 +51,10 @@ msgstr "GNOME en Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME de proba"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME en Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sesión personalizada"
-diff --git a/po/gu.po b/po/gu.po
-index c83ed6b..fa92f6a 100644
---- a/po/gu.po
-+++ b/po/gu.po
-@@ -44,6 +44,10 @@ msgstr "Xorg પર GNOME"
- msgid "GNOME dummy"
- msgstr "GNOME ડમી"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "Wayland પર GNOME"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "વૈવિધ્ય સત્ર"
-diff --git a/po/he.po b/po/he.po
-index 22045b6..c197658 100644
---- a/po/he.po
-+++ b/po/he.po
-@@ -45,6 +45,10 @@ msgstr "‏GNOME על גבי Xorg"
- msgid "GNOME dummy"
- msgstr "מדומה של GNOME"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "‏GNOME על גבי Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "הפעלה מותאמת אישית"
-diff --git a/po/hr.po b/po/hr.po
-index db64d1a..46ba1af 100644
---- a/po/hr.po
-+++ b/po/hr.po
-@@ -41,6 +41,10 @@ msgstr "GNOME na Xorgu"
- msgid "GNOME dummy"
- msgstr "GNOME lažno"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME na Waylandu"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Prilagođena sesija"
-diff --git a/po/hu.po b/po/hu.po
-index 403b0a1..f207056 100644
---- a/po/hu.po
-+++ b/po/hu.po
-@@ -49,6 +49,10 @@ msgstr "GNOME Xorgon"
- msgid "GNOME dummy"
- msgstr "GNOME példa"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME Wayland-en"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Egyéni környezet"
-diff --git a/po/id.po b/po/id.po
-index 04848d8..3519b35 100644
---- a/po/id.po
-+++ b/po/id.po
-@@ -46,6 +46,10 @@ msgstr "GNOME pada Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME pada Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sesi Gubahan"
-diff --git a/po/is.po b/po/is.po
-index 5cfbfa2..a95c1e7 100644
---- a/po/is.po
-+++ b/po/is.po
-@@ -44,6 +44,10 @@ msgstr "GNOME á Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME sýnishorn"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME á Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sérsniðin seta"
-diff --git a/po/it.po b/po/it.po
-index 3a95eff..6119ff2 100644
---- a/po/it.po
-+++ b/po/it.po
-@@ -46,6 +46,10 @@ msgstr "GNOME su Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME su Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sessione personalizzata"
-diff --git a/po/kk.po b/po/kk.po
-index 7168f0d..8fede72 100644
---- a/po/kk.po
-+++ b/po/kk.po
-@@ -43,6 +43,10 @@ msgstr "Xorg негізіндегі GNOME"
- msgid "GNOME dummy"
- msgstr "GNOME жалған сессиясы"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "Wayland негізіндегі GNOME"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Таңдауыңызша сесия"
-diff --git a/po/ko.po b/po/ko.po
-index 8c90323..359a65d 100644
---- a/po/ko.po
-+++ b/po/ko.po
-@@ -49,6 +49,10 @@ msgstr "그놈 (Xorg)"
- msgid "GNOME dummy"
- msgstr "그놈 더미"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "그놈, 웨일랜드"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "사용자 지정 세션"
-diff --git a/po/lt.po b/po/lt.po
-index 9a4bfb9..221c293 100644
---- a/po/lt.po
-+++ b/po/lt.po
-@@ -49,6 +49,10 @@ msgstr "GNOME Xorg aplinkoje"
- msgid "GNOME dummy"
- msgstr "GNOME netikra"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME Wayland aplinkoje"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Pasirinktinis seansas"
-diff --git a/po/lv.po b/po/lv.po
-index 14e4180..688efe2 100644
---- a/po/lv.po
-+++ b/po/lv.po
-@@ -52,6 +52,10 @@ msgstr "GNOME ar Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME makets"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME ar Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Pielāgota sesija"
-diff --git a/po/nb.po b/po/nb.po
-index afad648..471fb14 100644
---- a/po/nb.po
-+++ b/po/nb.po
-@@ -41,6 +41,10 @@ msgstr "GNOME på Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME på Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Egendefinert økt"
-diff --git a/po/pl.po b/po/pl.po
-index 92b0cfe..1b92056 100644
---- a/po/pl.po
-+++ b/po/pl.po
-@@ -48,6 +48,10 @@ msgstr "GNOME (Xorg)"
- msgid "GNOME dummy"
- msgstr "Pusta sesja GNOME"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME (Wayland)"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Niestandardowa sesja"
-diff --git a/po/pt.po b/po/pt.po
-index fc4bb99..573908d 100644
---- a/po/pt.po
-+++ b/po/pt.po
-@@ -50,6 +50,10 @@ msgstr "GNOME em Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME de teste"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME no Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sessão personalizada"
-diff --git a/po/pt_BR.po b/po/pt_BR.po
-index 6a2a88a..7d6a66a 100644
---- a/po/pt_BR.po
-+++ b/po/pt_BR.po
-@@ -59,6 +59,10 @@ msgstr "GNOME sobre Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME experimental"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME sobre Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sessão personalizada"
-diff --git a/po/ru.po b/po/ru.po
-index 4378126..52eda37 100644
---- a/po/ru.po
-+++ b/po/ru.po
-@@ -52,6 +52,10 @@ msgstr "GNOME на Xorg"
- msgid "GNOME dummy"
- msgstr "Фиктивный сеанс GNOME"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME на Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Другой сеанс"
-diff --git a/po/sk.po b/po/sk.po
-index 0f75b10..49fbf5d 100644
---- a/po/sk.po
-+++ b/po/sk.po
-@@ -53,6 +53,10 @@ msgstr "GNOME cez Xorg"
- msgid "GNOME dummy"
- msgstr "Fingované GNOME"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME cez Wayland"
-+
- # GtkWindow title
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
-diff --git a/po/sr.po b/po/sr.po
-index 7ec002a..2a71f45 100644
---- a/po/sr.po
-+++ b/po/sr.po
-@@ -48,6 +48,10 @@ msgstr "Гном на Икс серверу"
- msgid "GNOME dummy"
- msgstr "Гномов лажњак"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "Гном на Вејланду"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Прилагођена сесија"
-diff --git a/po/sr@latin.po b/po/sr@latin.po
-index 677444e..b148d70 100644
---- a/po/sr@latin.po
-+++ b/po/sr@latin.po
-@@ -48,6 +48,10 @@ msgstr "Gnom na Iks serveru"
- msgid "GNOME dummy"
- msgstr "Gnomov lažnjak"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "Gnom na Vejlandu"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Prilagođena sesija"
-diff --git a/po/sv.po b/po/sv.po
-index 2894eec..3072075 100644
---- a/po/sv.po
-+++ b/po/sv.po
-@@ -50,6 +50,10 @@ msgstr "GNOME med Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME-attrapp"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME med Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Anpassad session"
-diff --git a/po/tr.po b/po/tr.po
-index 3ede169..87bba43 100644
---- a/po/tr.po
-+++ b/po/tr.po
-@@ -54,6 +54,10 @@ msgstr "Xorg üzerinde GNOME"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "Wayland üzerinde GNOME"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Özel Oturum"
-diff --git a/po/uk.po b/po/uk.po
-index de980dc..c98fd8d 100644
---- a/po/uk.po
-+++ b/po/uk.po
-@@ -46,6 +46,10 @@ msgstr "GNOME через Xorg"
- msgid "GNOME dummy"
- msgstr "Несправжній GNOME"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME через Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Власний сеанс"
-diff --git a/po/vi.po b/po/vi.po
-index 1cdee0a..cf249e3 100644
---- a/po/vi.po
-+++ b/po/vi.po
-@@ -46,6 +46,10 @@ msgstr "GNOME trên Xorg"
- msgid "GNOME dummy"
- msgstr "Giả lập GNOME"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME trên Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Phiên làm việc tự chọn"
-diff --git a/po/zh_CN.po b/po/zh_CN.po
-index 6f07716..8d36444 100644
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -55,6 +55,10 @@ msgstr "运行于 Xorg 的 GNOME"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
- 
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "基于 Wayland 的 GNOME"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "自定义会话"
--- 
-2.10.1
-
diff --git a/gnome-base/gnome-session/gnome-session-3.22.3.ebuild b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild
deleted file mode 100644
index 311a3798511f..000000000000
--- a/gnome-base/gnome-session/gnome-session-3.22.3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://git.gnome.org/browse/gnome-session"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elibc_FreeBSD ipv6 systemd"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND="
-	>=dev-libs/glib-2.46.0:2[dbus]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.18.0:3
-	>=dev-libs/json-glib-0.10
-	>=gnome-base/gnome-desktop-3.18:3=
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-
-	media-libs/mesa[egl,gles2]
-
-	media-libs/libepoxy
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	x11-apps/xdpyinfo
-
-	systemd? ( >=sys-apps/systemd-183:0= )
-"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-settings-daemon
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	x11-themes/adwaita-icon-theme
-	sys-apps/dbus[X]
-	!systemd? (
-		sys-auth/consolekit
-		>=dev-libs/dbus-glib-0.76
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.6
-	>=sys-devel/gettext-0.10.40
-	virtual/pkgconfig
-	!<gnome-base/gdm-2.20.4
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )
-	gnome-base/gnome-common
-"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-PATCHES=(
-	# Make gnome wayland session launch inside a login shell for /etc/env.d and other stuff to work, bug 604110
-	"${FILESDIR}/${PV}-wayland-login-shell.patch"
-	# Restore Xorg as the default GNOME session instead of Wayland for the 3.22 release, bug 611146
-	"${FILESDIR}/${PV}-xorg-default.patch" # remove ewarn about this below when removing for 3.24
-	"${FILESDIR}/${PV}-xorg-default-translations.patch"
-)
-
-src_configure() {
-	# 1. Avoid automagic on old upower releases
-	# 2. xsltproc is always checked due to man configure
-	#    switch, even if USE=-doc
-	# 3. Disable old gconf support as other distributions did long time
-	#    ago
-	gnome2_src_configure \
-		--disable-deprecation-flags \
-		--disable-gconf \
-		--enable-session-selector \
-		$(use_enable doc docbook-docs) \
-		$(use_enable ipv6) \
-		$(use_enable systemd) \
-		$(use_enable !systemd consolekit) \
-		UPOWER_CFLAGS="" \
-		UPOWER_LIBS=""
-		# gnome-session-selector pre-generated man page is missing
-		#$(usex !doc XSLTPROC=$(type -P true))
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	insinto /usr/share/applications
-	newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
-	# Set XCURSOR_THEME from current dconf setting instead of installing
-	# default cursor symlink globally and affecting other DEs (bug #543488)
-	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
-	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ewarn "The Gentoo GNOME team has decided to retain Xorg session default instead of"
-	ewarn "Wayland for GNOME 3.22 stable version, even if USE=wayland is set on applicable"
-	ewarn "packages. You can still choose the 'GNOME on Wayland' session explicitly, if"
-	ewarn "desired. GNOME 3.24 will default to Wayland again as upstream GNOME does, if"
-	ewarn "USE=wayland is used globally, but 'GNOME on Xorg' session will be a choice."
-
-	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-}
diff --git a/gnome-base/gnome-session/gnome-session-3.24.1.ebuild b/gnome-base/gnome-session/gnome-session-3.24.1.ebuild
deleted file mode 100644
index ccbcf8130268..000000000000
--- a/gnome-base/gnome-session/gnome-session-3.24.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://git.gnome.org/browse/gnome-session"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elibc_FreeBSD ipv6 systemd"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND="
-	>=dev-libs/glib-2.46.0:2[dbus]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.18.0:3
-	>=dev-libs/json-glib-0.10
-	>=gnome-base/gnome-desktop-3.18:3=
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-
-	media-libs/mesa[egl,gles2]
-
-	media-libs/libepoxy
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	x11-apps/xdpyinfo
-
-	systemd? ( >=sys-apps/systemd-183:0= )
-"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-settings-daemon-3.23.2
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	x11-themes/adwaita-icon-theme
-	sys-apps/dbus[X]
-	!systemd? (
-		sys-auth/consolekit
-		>=dev-libs/dbus-glib-0.76
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.6
-	>=sys-devel/gettext-0.10.40
-	virtual/pkgconfig
-	!<gnome-base/gdm-2.20.4
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )
-"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-src_configure() {
-	# 1. Avoid automagic on old upower releases
-	# 2. xsltproc is always checked due to man configure
-	#    switch, even if USE=-doc
-	# 3. Disable old gconf support as other distributions did long time
-	#    ago
-	gnome2_src_configure \
-		--disable-deprecation-flags \
-		--disable-gconf \
-		--enable-session-selector \
-		$(use_enable doc docbook-docs) \
-		$(use_enable ipv6) \
-		$(use_enable systemd) \
-		$(use_enable !systemd consolekit) \
-		UPOWER_CFLAGS="" \
-		UPOWER_LIBS=""
-		# gnome-session-selector pre-generated man page is missing
-		#$(usex !doc XSLTPROC=$(type -P true))
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	insinto /usr/share/applications
-	newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
-	# Set XCURSOR_THEME from current dconf setting instead of installing
-	# default cursor symlink globally and affecting other DEs (bug #543488)
-	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
-	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-}
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 36ba1673f91c..4a0a14869b6e 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,12 +1,8 @@
-AUX 3.22.2-udevrulesdir-configure.patch 1858 BLAKE2B babac28f3c55ea6d320106fddc35987e87041804174c3518162cd5ec16c95a891f9bc80af5f36188e31d45492d6ae4911b4274fb456ea23bdc1226b6fd9d5ca5 SHA512 f2435821bedcf8858c7017053ce0a55591d75da741ee00a1ba54ce70ab6839fe34183425d07a0ebf6ceb18051bdc4d21dd3027b893acfb8eecf05d02d826a020
 AUX 3.24.2-reduce-memory-usage.patch 6121 BLAKE2B 8420de9b07a1a3b5d882c5aae516350d4ea203d9205fe8e69329951e869c1fd8c120372c024407e5b057643e307835659040edf2268b79966468844211fcfdb0 SHA512 c6b172e171461d79f2dfc37b26a0f17a44b2bba0ce6392053129a9137b76c35956d9ab88e22e111d2613c0ff6ee2affc87756c8e0c4fd28d928d948feebd2a41
 AUX 3.24.2-remove-unneeded-gtk-init.patch 2101 BLAKE2B 7983b10dd3ba55e15209640dd1edd822d8515bd7ee5ff4d7865529491ca26fcd3a852f5af3589a715d118fa8bf86e8ea70e89244b5ebbc37e8dc3f9bc587fb96 SHA512 6da74748bbee31bb2b98ba090927c0e787552cabe2ef028781f3e12ccf9b444bf41480f561a307cc71777efaca23ce2f65e2ebb559a33b6a0d9a4270e9da5016
 AUX 3.24.2-udevrulesdir-configure.patch 1918 BLAKE2B 3e831c580ac4348c2d528c5162d821eee42283360651c802be6467bfe6868ac6e51802639e2bf7fd22d1326f46457f697d5ed8ad9bf77d0c9e41ac6de095ad60 SHA512 4d30c85add1c667a4c2fd712c7bf208f358a9313baf29172407eab4236817c86b30d8fca0141541abf8ff0ccd09f51065ceee12a2dbb39827d4facac255c8564
 AUX 3.24.3-fix-wayland-build.patch 1836 BLAKE2B 32bae28672ca5e779826dd908ca2349a0c90898de77138c1ad73157590d51638311640ab59025d2196302d0c60de52ece2d60422536a28967ffbd3c60306b26b SHA512 edf8bcea8fa705cc0a212c1523ebc948751aba61fd2060245439fbf9825b2416bb79c35b1873b49deddb77eff21ee41644e2c6bf311f88607343227ca3526193
 AUX 3.24.3-optional.patch 5311 BLAKE2B d2f9f7dd3e58f88b23604703773f1bb783798d48f81388043bce3c288535d48e14de0dca33c4ddb9ccf266ffc43f772b58f999ed460789b0f6803a566fd12038 SHA512 a466e658f5c02070620aaf6b96f1c2516664d20092ba555f5fa3cd01e5738e79ba4418062380923401c9e8b7b52478b3468335100757babe4326102d55eb4717
-AUX gnome-settings-daemon-3.22.0-optional.patch 4101 BLAKE2B 34bfc06d2a37a8567dc4cf2cd16befe537d83513cc8991dca6ef4b303e7b5e0cc3be44a4faa884de7e0e885a4952ad3b1552fb9bd9e1b597a8a0526049a09167 SHA512 0f064dd2ea491f725eca74e2efe9534459719f8bccd8ba03f381a6f4979624c157ef299b805a38fcd11244232eeb66fb7074f57d0803b0781e458b5a47bfe765
-DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 BLAKE2B 4582793b2c13b4cecb1e93ff5053f94af16dc72436fbfe83a74b21b21c4bf8473409f52acae30e717176b01fd60165e43a69ae16787883ee862fe7fa3b9c448c SHA512 7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3
 DIST gnome-settings-daemon-3.24.3.tar.xz 1583044 BLAKE2B f075abe574663cb9e6092e9698efb12d598584fe004042b5ac63df7e30ba9dfdb28ac4d0fac4148fa8fd49ccb6991414dc9a3dc49400efbe2cf4752d6295d62c SHA512 2450c3bb31746fe4883f194094cf79e94207e74d39c992107244d89f36c3ea373a33a2dca4a55af138f03fb4abd8733da4bacb215e2202bbc0976b566f8529a6
-EBUILD gnome-settings-daemon-3.22.2-r1.ebuild 4185 BLAKE2B 74666ed2940c5e35e4c178b239ef05e190284ed5c63b92dd0408217fe46b04d3a1bfe30b18657a582ab559c62b62231af8fd1818362aaeb1e173d827b32af4d1 SHA512 676d36c8d9bd465792a1e1cb911ad727d4e6d00458507cb083a266f4e6bb8b2ca7a8c6a92247eeec152d77f78f6af6555a9c89ad8d150d54809e5b8b948c1ac4
 EBUILD gnome-settings-daemon-3.24.3.ebuild 4904 BLAKE2B 8b38af85f86bd9f4b694f9b4dad4d4ade3da5cda4241cc5ce70e0882567555eb3ec6d5a8b711b0a1be9a71375efc8947f4afd07e9c000ff49602add3510f4ace SHA512 5f60a54dfd9c0eb1eeedc18692be773916e4e62442e02441f45a657d5060caee941ae157526635b3c942ffb702c43612f5fbfdacfae838d956074ed262ca0695
 MISC metadata.xml 591 BLAKE2B 6dfcef2c04291096bef621cb68ed9f2fa2c379920fb2072783b6245673fb37a6b6903d80ac8da46439a6a6be81372a3474585abbe4234559b558f48c3e23a1a6 SHA512 8cd323d8cfa69cb2630805fca3cffcf373980ea9da041e5088dc6cef83acf4b001dead2cce394e41f0d57152b4b0f06498918d54324367941049f4cf180be96a
diff --git a/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch
deleted file mode 100644
index d0436ecdc6e1..000000000000
--- a/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 19394974869513ab4a98d72593dce18f08105983 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 21 Mar 2017 01:30:52 +0200
-Subject: [PATCH] build: Get udevrulesdir from pkg-config
-
-Use the standard way to find the udev rules directory via pkg-config by default,
-and support specifying it, should it be necessary.
-This is the same logic as in colord.
----
- configure.ac               | 9 +++++++++
- plugins/rfkill/Makefile.am | 1 -
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8d4f5cb..5390404 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -135,6 +135,15 @@ fi
- AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
- 
- dnl ---------------------------------------------------------------------------
-+dnl - Where to install udev rules
-+dnl ---------------------------------------------------------------------------
-+AC_ARG_WITH([udevrulesdir],
-+            AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]),
-+            [],
-+            [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d])
-+AC_SUBST([udevrulesdir], [$with_udevrulesdir])
-+
-+dnl ---------------------------------------------------------------------------
- dnl - ALSA integration (default enabled)
- dnl ---------------------------------------------------------------------------
- ALSA_PKG=""
-diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
-index fed7adc..05f2c78 100644
---- a/plugins/rfkill/Makefile.am
-+++ b/plugins/rfkill/Makefile.am
-@@ -59,7 +59,6 @@ plugin_in_files = rfkill.gnome-settings-plugin.in
- 
- plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
- 
--udevrulesdir = $(prefix)/lib/udev/rules.d
- udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
- 
- EXTRA_DIST = $(plugin_in_files) $(udevrules_DATA)
--- 
-2.10.1
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch
deleted file mode 100644
index 9b5369bb3462..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 2aa9a92b06418642339cf27a3df5051f63eb8ddb Mon Sep 17 00:00:00 2001
-From: Ole Reifschneider <mail@ole-reifschneider.de>
-Date: Sat, 11 Apr 2015 23:10:21 +0200
-Subject: [PATCH] Make colord and wacom support optional
-
----
- configure.ac        | 41 ++++++++++++++++++++++++++++++-----------
- plugins/Makefile.am |  9 +++++++--
- 2 files changed, 37 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6d9408a..628af0e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -245,7 +245,17 @@ dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION])
-+AC_ARG_ENABLE([color],
-+  AS_HELP_STRING([--disable-color],
-+                 [turn off color plugin]),
-+       [],
-+       [enable_color=yes])
-+
-+AS_IF([test "$enable_color" = "yes"],
-+      [PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION])
-+       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
-+      ])
-+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
- 
- dnl ---------------------------------------------------------------------------
- dnl - datetime
-@@ -270,22 +280,31 @@ case $host_os in
-     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
-       have_wacom=no
-     else
--      if test x$enable_gudev != xno; then
--        PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
--        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
--        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
--      else
--        AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
--      fi
--      AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
--      have_wacom=yes
-+      have_wacom=no
-+      AS_IF([test "$enable_gudev" != "no"],
-+        [AC_ARG_ENABLE([wacom],
-+           AS_HELP_STRING([--disable-wacom],
-+                          [turn off wacom plugin]),
-+                          [],
-+                          [enable_wacom=no]) dnl Default value
-+         AS_IF([test "x$enable_wacom" = "xyes"],
-+               [
-+                 PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
-+                 PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
-+                 PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+                 have_wacom=yes
-+                 AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
-+               ])
-+        ], [
-+          AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
-+        ])
-     fi
-     ;;
-   *)
-     have_wacom=no
-     ;;
- esac
--AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
-+AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes)
- 
- dnl ==============================================
- dnl smartcard section
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 9324b40..ee78d6d 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -4,7 +4,6 @@ enabled_plugins =	\
- 	a11y-keyboard	\
- 	a11y-settings	\
- 	clipboard	\
--	color		\
- 	datetime	\
- 	dummy		\
- 	power		\
-@@ -22,13 +21,19 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if SMARTCARD_SUPPORT
- enabled_plugins += smartcard
- else
- disabled_plugins += smartcard
- endif
- 
--if HAVE_WACOM
-+if BUILD_WACOM
- enabled_plugins += wacom
- else
- disabled_plugins += wacom
--- 
-2.10.1
-
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild
deleted file mode 100644
index 76625b33ba7b..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit gnome2 python-any-r1 systemd udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland"
-REQUIRED_USE="
-	input_devices_wacom? ( udev )
-	smartcard? ( udev )
-"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.7:2[dbus]
-	>=x11-libs/gtk+-3.15.3:3
-	>=gnome-base/gnome-desktop-3.11.1:3=
-	>=gnome-base/gsettings-desktop-schemas-3.20
-	>=gnome-base/librsvg-2.36.2:2
-	media-fonts/cantarell
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-2
-	>=sys-power/upower-0.99:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7.3:=
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/libXxf86misc
-	x11-misc/xkeyboard-config
-
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/libgweather-3.9.5:2=
-	>=sci-geosciences/geocode-glib-3.10
-	>=sys-auth/polkit-0.103
-
-	colord? (
-		>=media-libs/lcms-2.2:2
-		>=x11-misc/colord-1.0.2:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/pango-1.20
-		x11-drivers/xf86-input-wacom
-		virtual/libgudev:= )
-	networkmanager? ( >=net-misc/networkmanager-1.0 )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( virtual/libgudev:= )
-	wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/dconf
-	!openrc-force? ( sys-apps/systemd )
-	!<gnome-base/gnome-control-center-2.22
-	!<gnome-extra/gnome-color-manager-3.1.1
-	!<gnome-extra/gnome-power-manager-3.1.3
-"
-# xproto-7.0.15 needed for power plugin
-# FIXME: tests require dbus-mock
-DEPEND="${COMMON_DEPEND}
-	cups? ( sys-apps/sed )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		gnome-base/gnome-session )
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	>=x11-proto/xproto-7.0.15
-"
-
-PATCHES=(
-	# Make colord and wacom optional; requires eautoreconf
-	"${FILESDIR}"/${PN}-3.22.0-optional.patch
-	# Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
-	"${FILESDIR}"/${PV}-udevrulesdir-configure.patch
-)
-
-python_check_deps() {
-	if use test; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-man \
-		--with-udevrulesdir="$(get_udevdir)"/rules.d \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable debug more-warnings) \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable udev gudev) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_test() {
-	virtx emake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow the this guide to migrate:"
-		ewarn "https://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index f4ae6b08f650..17309bd4334d 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,10 +1,8 @@
-AUX 3.22.3-CVE-2017-8288.patch 1501 BLAKE2B 6c41df368d6561303857754f61255f426b62093e8373c769030baa94d11a64cee5f390992a10c153b7d64fffd3ecd48931b31119e5e46149f4355051b52a0875 SHA512 d077946918b5b7aa3e863e017dc71644c2a63220eb21589c0790ff34f35b2545e6fe2a4e19549f0fc1dc0a46104c766826bb3c98fade6e1c54eb7ba67fe33311
 AUX gnome-shell-3.12-bluetooth-flag.patch 1894 BLAKE2B a53360d103faf25aa605cd5c73eeb892ce667f57313fbd90bdcf176151158b1389ba49becd4421d825e5d63d4dcb0a2e99618f3558de87f0afe2b46851a353f0 SHA512 dc18e16e2de667bef09d66acd68fbe0f4d8c0fd1725b352b0f9f4032e43481f2655b1812ffa6f8ae8441b215a372c27f5e1035b7eceeeb22ee18b1a256e79f80
 AUX gnome-shell-3.22.0-defaults.patch 1228 BLAKE2B 9bb49d830c2bbc36123ca8fdddc02d4b750a5ffd174fa653ead26a75dc9478be4b5a39c31a004a3897655aae097c23f511d6bb494b0aede51fea74294be3fcf6 SHA512 f350324af68de8f7ae9dab609fdb81e272f9d545a125f3da85d9f06e4a0de09f857517d6c7a585ff1ea3b56f4d51b049cbeb62c39472d61d45026331104c5af5
 AUX gnome-shell-3.22.0-gir-build-fix.patch 882 BLAKE2B 62a816accf06abd182d1381326ad2059a59b3ff9579475b160d9c6fa715acfcf0f3d9d3544bc435b13fcdd45cf420b761ea6681718e540a39533f615b7aa0214 SHA512 b534134cc76dce49c78621d9245e9c457f4eefc3ac89dc09f036a178524b0ad3608683f43a0920fdb1d36410aebbfdecd701725217b6239f4549ef4ba82b7213
 DIST gnome-shell-3.22.3.tar.xz 1952576 BLAKE2B 26d974bc45b93342db3d23f9a999734b571c6819c1fdddc20e019e282bcfbdf6d9f40850667756046187e0e3a52a57ba60962cc49b7b4b49909ec5f992e518e6 SHA512 47d67910b321a182d3ecd41f20cd923ec433cc93ab04b0b31351ca0229505ecbf343b1307585e557ee757845dc09b2371b0c2197717ed532b71878c186337ee9
 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f SHA512 369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
-EBUILD gnome-shell-3.22.3-r2.ebuild 6637 BLAKE2B 2a911e1af1ad874225a07a64c50a16677fd6f1e4399f1f155e0e9ab4a52ef124cb44b47c2e5369aac3cfa9d20929d588b241174baacc5666f38e8706e86e3d6b SHA512 60914c7e4931a73e174ad470fa8581f519c68bee9cf98bc6fb499f483b52af0efc9ca818d8b0f09fd2500177588ab2f1f05472a27eeee0498ad23f2380dc93c6
-EBUILD gnome-shell-3.22.3.ebuild 6865 BLAKE2B 5c13185446bec0e28a319d0a56dfd05dd087706433f4efaf1fe4aadeb61573f89c333c944be55a24ba444f908f9b2031556a4cf86867701c3f10515f6169d133 SHA512 c454e77fda925908ff497818dc1559217628b0b4830fe8a8d70b3251c888f6d5e7c375e57bb2eacec8a6e25af01cfafc0ec6a7f3944a0cd6eb6853fcea9f06aa
+EBUILD gnome-shell-3.22.3.ebuild 6847 BLAKE2B edb25faf602ece895a316042dd62896d84755f17f26f51a217c748b653e3ca729aae959c8a2fb39d51da654ee9f961855f69f43d15ad9777d1b6b0d22c10b212 SHA512 b0cb683473ec3a3dcffb1dd9fee56a6b9ec4dfe6f311a523c3920cbb690a69d5e4e73643bde1c6eb3faf4f4a6bb8337640d42ce92b2b8fd08b26e39666449ad3
 EBUILD gnome-shell-3.24.3.ebuild 6568 BLAKE2B 6ecdb9b049a67d41d9051bfc606e480419e48e9eb84742901c7e022d7aadfc7ab9d83e82c3a00e49c17a3b4c52efd4f61180717035eb6819d2df1924443f0b84 SHA512 b7fa60c65c9c642d4da55803ad0d730ce5be3e5934cca34c83e076f4517e5b252f959b9bf40757ca8eaba434d48ed2bde7460bc72b7a1f250bdafc62706bc4ab
 MISC metadata.xml 738 BLAKE2B f379ab17d70d0241fffcef221940031cf797d3393c903fcc75c847e4bd985242c124b598e61ae50bce7e58ababe8595533bf3fb52fea47d75712eaa2af291492 SHA512 02db87e2ac6c43ed104ae911de8caf78632b861c4efd3bbf5b0cf7dfab1d4d79e023b724b140ca86e72961c06454479f4d814ad1ae5dfd481bfbc7a45af0c18b
diff --git a/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch b/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch
deleted file mode 100644
index f9c74d62fddd..000000000000
--- a/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 560e976ee9c59d75907b5ef6ed2bc336719e37d3 Mon Sep 17 00:00:00 2001
-From: Emilio Pozuelo Monfort <pochu27@gmail.com>
-Date: Tue, 25 Apr 2017 17:27:42 +0200
-Subject: [PATCH] extensionSystem: handle reloading broken extensions
-
-Some extensions out there may fail to reload. When that happens,
-we need to catch any exceptions so that we don't leave things in
-a broken state that could lead to leaving extensions enabled in
-the screen shield.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=781728
----
- js/ui/extensionSystem.js | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
-index ba33222..1feaa2f 100644
---- a/js/ui/extensionSystem.js
-+++ b/js/ui/extensionSystem.js
-@@ -276,12 +276,20 @@ function _onVersionValidationChanged() {
-     // temporarily disable them all
-     enabledExtensions = [];
-     for (let uuid in ExtensionUtils.extensions)
--        reloadExtension(ExtensionUtils.extensions[uuid]);
-+        try {
-+            reloadExtension(ExtensionUtils.extensions[uuid]);
-+        } catch(e) {
-+            logExtensionError(uuid, e);
-+        }
-     enabledExtensions = getEnabledExtensions();
- 
-     if (Main.sessionMode.allowExtensions) {
-         enabledExtensions.forEach(function(uuid) {
--            enableExtension(uuid);
-+            try {
-+                enableExtension(uuid);
-+            } catch(e) {
-+                logExtensionError(uuid, e);
-+            }
-         });
-     }
- }
--- 
-2.10.1
-
diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild
deleted file mode 100644
index 66d73e5efc0e..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit gnome2 multilib pax-utils python-r1 systemd
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~ia64 x86"
-
-# libXfixes-5.0 needed for pointer barriers
-# FIXME:
-#  * gstreamer support is currently automagic
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.5.3
-	>=dev-libs/atk-2[introspection]
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.45.3:2[dbus]
-	>=dev-libs/gjs-1.39
-	>=dev-libs/gobject-introspection-1.49.1:=
-	dev-libs/libical:=
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=dev-libs/libcroco-0.6.8:0.6
-	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.21.3
-	>=gnome-extra/evolution-data-server-3.17.2:=
-	>=media-libs/gstreamer-0.11.92:1.0
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	>=net-libs/telepathy-glib-0.19[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-libs/libXfixes-5.0
-	x11-libs/libXtst
-	>=x11-wm/mutter-3.22.1[introspection]
-	>=x11-libs/startup-notification-0.11
-
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	media-libs/libcanberra[gtk3]
-	media-libs/mesa
-	>=media-sound/pulseaudio-2
-	>=net-libs/libsoup-2.40:2.4[introspection]
-	x11-libs/libX11
-	x11-libs/gdk-pixbuf:2[introspection]
-
-	x11-apps/mesa-progs
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	networkmanager? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.8
-		>=net-misc/networkmanager-0.9.8:=[introspection] )
-	nsplugin? ( >=dev-libs/json-glib-0.13.2 )
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session is needed for gnome-session-quit
-# 3. Control shell settings
-# 4. Systemd needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme and dejavu font neeed for various icons & arrows
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-# 8. IBus is needed for nls integration
-RDEPEND="${COMMON_DEPEND}
-	app-accessibility/at-spi2-core:2[introspection]
-	>=app-accessibility/caribou-0.4.8
-	dev-libs/libgweather:2[introspection]
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	x11-libs/pango[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	!openrc-force? ( >=sys-apps/systemd-31 )
-
-	x11-misc/xdg-utils
-
-	media-fonts/dejavu
-	>=x11-themes/adwaita-icon-theme-3.19.90
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	>=dev-util/gtk-doc-am-1.17
-	gnome-base/gnome-common
-	sys-devel/autoconf-archive
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/${PN}-3.22.0-defaults.patch
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch
-	# Add missing path to libmutter-clutter when building .gir, bug #597842
-	"${FILESDIR}"/${PN}-3.22.0-gir-build-fix.patch
-	# Little bug when user has toggled version validation in the session, bug #616698
-	"${FILESDIR}"/${PV}-CVE-2017-8288.patch
-)
-
-src_configure() {
-	# Do not error out on warnings
-	gnome2_src_configure \
-		--enable-man \
-		$(use_enable !openrc-force systemd) \
-		$(use_with bluetooth) \
-		$(use_enable networkmanager) \
-		$(use_enable nsplugin browser-plugin) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
-}
-
-src_install() {
-	gnome2_src_install
-	python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
-	python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
-	if has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	# Required for gnome-shell on hardened/PaX #457146 and #457194
-	# PaX EMUTRAMP need to be on
-	elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
-		pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	else
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow this guide to migrate:"
-		ewarn "https://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild
index f4a7da3a7451..9d87933477f9 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="+bluetooth +ibus +networkmanager nsplugin -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~arm ~ia64 ~ppc ~ppc64"
+KEYWORDS="~alpha ~arm"
 
 # libXfixes-5.0 needed for pointer barriers
 # FIXME:
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index 2c29a6fc09c3..2f11f92b5e37 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,5 +1,3 @@
 EBUILD gnome-3.20.0.ebuild 1456 BLAKE2B 9acd17a4f24ff1220bcb3caf32bebf2b625150e02175c60b30390d5577b000de8f97f33ec88ca690afdaad20ba921f11d0b48ae4211f825f713c7eed5a634a6f SHA512 db4545199d2f9b4e4bf0b0991ec6f21040d7191644bb1929fbe16151899c07e30d452e50c8e2732eb02674f7141fa845bfb604642c491597c452d13c4403d57f
-EBUILD gnome-3.22.2.ebuild 1399 BLAKE2B 47d213fa95e659599b6538ea598a2afe598a001abaff560927ab5b75e55bb5d4c08fa203e581f6e53c9ebdd2445c69dccae6c46b04ac720360783e8400db8d6e SHA512 2abf56bbadce04382eeabe6cac07027df60e9308d3de2d2d6a2089b8629cc257cecd24ea68b8646a105b33743558efb102270280544cd32e78ae5d674fc26842
-EBUILD gnome-3.24.0.ebuild 1400 BLAKE2B e0329908ea4bc3db4ee0a5ecea0da1cfe00030dd5a1b7ab83e0ef7d944c4e204b0ed5fdbc286c8f5273f83e8ab3351d44d0d43b0e749ed6f3dd7bb65835a3d9a SHA512 280e8de05c613e31cd33066f1f0745ad114ec1d627a02143a418464a87de43243a94f9348cd4d9b24954910950fc38b81acf231e907eac2d52810bc608e61681
 EBUILD gnome-3.24.2.ebuild 1404 BLAKE2B 2a83d561ded9713019c9e7360eeff82bcd01c4405fcae85202c6fc736fc7fff9ed5d31a1afedf224e756fb43c30d6784911e0fafd4e74f716bc44b4a7fb6595f SHA512 698c330c27fe7ecdbf8aead2d5e32ccb9e983ac2428c8f383654e057742f649bb0e543a24a723a36961a20e9d637d1bf8fbd7456c39c76bc9f4b0e968cab8ea2
 MISC metadata.xml 452 BLAKE2B 94890a098fcc359b62b9176f57baa243301ab562c549395f6307789987a668c095a1d571be9b7a5325ffdcbd51efaff100c1098ae0e2c337be11c54b3b703529 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a
diff --git a/gnome-base/gnome/gnome-3.22.2.ebuild b/gnome-base/gnome/gnome-3.22.2.ebuild
deleted file mode 100644
index 80e2e88c30f6..000000000000
--- a/gnome-base/gnome/gnome-3.22.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Meta package for GNOME 3, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="metapackage"
-SLOT="2.0" # Cannot be installed at the same time as gnome-2
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-IUSE="accessibility +bluetooth +classic +cdr cups +extras"
-
-S=${WORKDIR}
-
-# TODO: check accessibility completeness
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?]
-
-	>=gnome-base/gdm-${PV}
-
-	>=x11-wm/mutter-${PV}
-	>=gnome-base/gnome-shell-${PV}[bluetooth?]
-
-	>=x11-themes/gnome-backgrounds-3.22.1
-	x11-themes/sound-theme-freedesktop
-
-	accessibility? (
-		>=app-accessibility/at-spi2-atk-2.22
-		>=app-accessibility/at-spi2-core-2.22
-		>=app-accessibility/caribou-0.4.21
-		>=app-accessibility/orca-${PV}
-		>=gnome-extra/mousetweaks-3.12.0 )
-	classic? ( >=gnome-extra/gnome-shell-extensions-${PV} )
-	extras? ( >=gnome-base/gnome-extra-apps-${PV} )
-"
-
-DEPEND=""
-
-PDEPEND=">=gnome-base/gvfs-1.30.2[udisks]"
-
-pkg_postinst() {
-	# Remember people where to find our project information
-	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
-	elog "for information about the project and documentation."
-}
diff --git a/gnome-base/gnome/gnome-3.24.0.ebuild b/gnome-base/gnome/gnome-3.24.0.ebuild
deleted file mode 100644
index a02534c8d1ab..000000000000
--- a/gnome-base/gnome/gnome-3.24.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Meta package for GNOME 3, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="metapackage"
-SLOT="2.0" # Cannot be installed at the same time as gnome-2
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="accessibility +bluetooth +classic +cdr cups +extras"
-
-S=${WORKDIR}
-
-# TODO: check accessibility completeness
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?]
-
-	>=gnome-base/gdm-${PV}
-
-	>=x11-wm/mutter-${PV}
-	>=gnome-base/gnome-shell-${PV}[bluetooth?]
-
-	>=x11-themes/gnome-backgrounds-${PV}
-	x11-themes/sound-theme-freedesktop
-
-	accessibility? (
-		>=app-accessibility/at-spi2-atk-2.24
-		>=app-accessibility/at-spi2-core-2.24
-		>=app-accessibility/caribou-0.4.21
-		>=app-accessibility/orca-${PV}
-		>=gnome-extra/mousetweaks-3.12.0 )
-	classic? ( >=gnome-extra/gnome-shell-extensions-${PV} )
-	extras? ( >=gnome-base/gnome-extra-apps-${PV} )
-"
-
-DEPEND=""
-
-PDEPEND=">=gnome-base/gvfs-1.30.2[udisks]"
-
-pkg_postinst() {
-	# Remember people where to find our project information
-	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
-	elog "for information about the project and documentation."
-}
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 134eb0aefd70..ae4f6f934439 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,7 +1,5 @@
 DIST gsettings-desktop-schemas-3.22.0.tar.xz 598412 BLAKE2B 0249dfbdc7d574824ad6c34cdbafc7859eba4d78494c80d42b9b5a739cfaa8bb6d43e13093148253dedd0ae2762261750f791d809ba8058a78098fc7f8dad510 SHA512 653198f78f8108222e84c0e94b6b914e03597234a627f1c205fc58a7bf54fdde073ff98cfdce1dccec7da1d8a7cbf648004cd392382d4ff617245cc3e581dfd1
-DIST gsettings-desktop-schemas-3.24.0.tar.xz 620780 BLAKE2B 0d1585c394d3c08e20eea763c14a3453e37a9a3d7706d27fa1f41f9ecea926734783421a7e68a6333bc37905ce5c1caa025b21c872cc6985a8e64a6875d0c25c SHA512 b19fb29da29a3fa114536c0ce94b160f9c589568b626e487b5eca008791e539de9a89a81c69e41f8070b0369e6cfc800fe8b70247ecbab1bc32f24db759037c1
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
 EBUILD gsettings-desktop-schemas-3.22.0.ebuild 762 BLAKE2B e0502aa9126fc0808e90ecf18ec028d00edbaf9a813db4d4230f5c4572dadf4b5dc26afda75cb76902022341a4b3a55e541f14a84b1a52da0ed0ba57821f48f6 SHA512 66a5ff681cec7c66941ce08292117c26d2314499f55daea0f87c95d3f4d73ae4c3e0ac166717bc793c9d4f9a03593c317b5c0ddbd065146b35992334a1c8e209
-EBUILD gsettings-desktop-schemas-3.24.0.ebuild 771 BLAKE2B 4ecee752265adaa2257e31458a154a9bd1201b3aa899d6f493db57566ef7b8a651e1f5eab46f0507fe133e705f0da43f3c186cc3f49d7aed07bed8af582ea8c7 SHA512 60ea82cc84d4574941718a501a4cc9e116f1612d33e27a650ac1f36059c4ede5826ec25b936f3d0559be6ad50105bc299e6099b0b94e080f68e1b750ba96b15d
 EBUILD gsettings-desktop-schemas-3.24.1.ebuild 768 BLAKE2B 3c928ad01fc820f2a73b512744fe6fb21aae6040406c25e1da393ac75df7dfda0fefd2f3b965da73db3f9c211dde66c17f0c05e68ac6c7db1754b5c6698a5ccd SHA512 154a85cb25b1b6b284739c82b68175816aa87a408569e89bc84c536ad997175556e61bcd87be7f1138ae81c1d62b07884344cd1cc65824638b2361c8ea3253d4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.0.ebuild
deleted file mode 100644
index a22fd1f8239a..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.31:2
-	introspection? ( >=dev-libs/gobject-introspection-1.31.0:= )
-	!<gnome-base/gdm-3.8
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure $(use_enable introspection)
-}
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 68130753358a..bee165c1c92b 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -4,5 +4,4 @@ DIST gvfs-1.32.1-patches.tar.xz 53288 BLAKE2B 2394f0931927069b4aeab69769df74c823
 DIST gvfs-1.32.1.tar.xz 1813212 BLAKE2B 4b349e968eaab75d75ac9e7b66087298754ad81668e415812c4db74e2e393ac2cddea1b55771656dcd67ffdca23e4cf1642afef101498d309c643519fcefcca3 SHA512 7bd4d137437c1704faf6a9c2712bddcc327284e752c552c2cc18c64beb5e6d291af321e92d02d4f09b619762121129cee82c13ec2a4ca39d045196ebeeb28dd8
 EBUILD gvfs-1.30.4.ebuild 3682 BLAKE2B 2d3d1ef263069a971b730ca70ca5719a67279b393381e14ea385fc677be382d7e81d68a81e89a1a8cfd288e56fb2cf52577cc55568a666aba89b64e247cc47d1 SHA512 e5698ae16fad71377b69a981ab420754be4303f36b8b18bd1687b2377469a215ae2a6eb75df5682c80dca4b682a7e9f48840247616d431b1b11a2b56048110ad
 EBUILD gvfs-1.32.1-r1.ebuild 3832 BLAKE2B 955d8c66cd0277c972f0178335b3d5f0440315502fa24e045adf46f7dde459a2ffa508653294612234e2273ca6f138e42576fca0d8fd587e9e3e917e973ca9eb SHA512 0dcb98cbc2ac85c087b7860de06fd34e0c234300f92f985963f8d2bb3979e182b179ea1989b614dcf8fd0842b999f3bcde8811a802fd65de4ed26f6d6970ac57
-EBUILD gvfs-1.32.1.ebuild 3621 BLAKE2B 2364de0783d0a1a5d3a4de00f9528ebed53a40aea3056211ad5349c726921304682314bf3c6b040edd41f4fc726415a25cf05a49074885c1dfff28d289a1b52a SHA512 00057451a01ede2cc50c271bc14bfd53c50f3d56a2d386c0106b3550c0d577e7aca11e39568d02a3821e6695602b74e6c094d5798a809f3b1aa60005c46c989e
 MISC metadata.xml 1625 BLAKE2B 931da927a3cef58e8d768454cdda485acf3b8b42a87d9d4be0faa495e7b49b16e780815a0a959b91b116b078cb333c69873374e0f95e8aadb074ce836df3149d SHA512 4a3815b41763def19356793e36bafbd8a87359c9501f526465a6d8b62394c1605909b70ba4b8679b2dca89bb2660ea573a0e97611facf2d23c878fcdf51e7bfc
diff --git a/gnome-base/gvfs/gvfs-1.32.1.ebuild b/gnome-base/gvfs/gvfs-1.32.1.ebuild
deleted file mode 100644
index a105e360978f..000000000000
--- a/gnome-base/gvfs/gvfs-1.32.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2 systemd
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
-REQUIRED_USE="
-	cdda? ( udev )
-	google? ( gnome-online-accounts )
-	mtp? ( udev )
-	udisks? ( udev )
-	systemd? ( udisks )
-"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	app-crypt/gcr:=
-	>=dev-libs/glib-2.51:2
-	dev-libs/libxml2:2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	archive? ( app-arch/libarchive:= )
-	bluray? ( media-libs/libbluray:= )
-	fuse? ( >=sys-fs/fuse-2.8.0:0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= )
-	google? (
-		>=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts]
-		>=net-libs/gnome-online-accounts-3.17.1:= )
-	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( >=net-libs/libsoup-2.42:2.4 )
-	ios? (
-		>=app-pda/libimobiledevice-1.2:=
-		>=app-pda/libplist-1:= )
-	mtp? (
-		>=dev-libs/libusb-1.0.21
-		>=media-libs/libmtp-1.1.12 )
-	nfs? ( >=net-fs/libnfs-1.9.8 )
-	policykit? (
-		sys-auth/polkit
-		sys-libs/libcap )
-	samba? ( >=net-fs/samba-4[client] )
-	systemd? ( >=sys-apps/systemd-206:0= )
-	udev? (
-		cdda? ( dev-libs/libcdio-paranoia )
-		>=virtual/libgudev-147:=
-		virtual/libudev:= )
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	zeroconf? ( >=net-dns/avahi-0.6 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	test? (
-		>=dev-python/twisted-core-12.3.0
-		|| (
-			net-analyzer/netcat
-			net-analyzer/netcat6 ) )
-	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234
-)
-
-src_prepare() {
-	if ! use udev; then
-		sed -e 's/gvfsd-burn/ /' \
-			-e 's/burn.mount.in/ /' \
-			-e 's/burn.mount/ /' \
-			-i daemon/Makefile.am || die
-
-		# Uncomment when eautoreconf stops being needed always
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-documentation installs man pages
-	# --disable-obexftp, upstream bug #729945
-	gnome2_src_configure \
-		--disable-gdu \
-		--enable-documentation \
-		--enable-gcr \
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(use_enable afp) \
-		$(use_enable archive) \
-		$(use_enable bluray) \
-		$(use_enable cdda) \
-		$(use_enable fuse) \
-		$(use_enable gnome-keyring keyring) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable google) \
-		$(use_enable gphoto2) \
-		$(use_enable gtk) \
-		$(use_enable http) \
-		$(use_enable ios afc) \
-		$(use_enable mtp libmtp) \
-		$(use_enable mtp libusb) \
-		$(use_enable nfs) \
-		$(use_enable policykit admin) \
-		$(use_enable samba) \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable udev gudev) \
-		$(use_enable udev) \
-		$(use_enable udisks udisks2) \
-		$(use_enable zeroconf avahi)
-}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 04f8953e80dc..5b35f7c42e18 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,7 +1,5 @@
 DIST nautilus-3.20.4.tar.xz 3453376 BLAKE2B 47e09f45909f6abd735c976ea6ab0b90c918490193a931b186472d9be1d22f5c7314647ec14e36a88b9f8013f3784f7788b4d9ef136e139e1b1cb41b0167c378 SHA512 01bee5c70067c508ca918948afe0b400680eb68518ae69803e2971a215b0eaf54c9251566c6c44835a1c0b9b20248450539a47936c6aba5c9accc9ef3cbe8a8e
-DIST nautilus-3.22.3.tar.xz 5104800 BLAKE2B f8eaa735f9c7398de038e428acffef74c4dde2254fd9e7868823a93ef835817b907a4079b58f3e121959da730a8ca171709cc2716759ad1376aa9c5a98a2025e SHA512 abad02d2b36230348cec04bcc2650cc352e232008c4e628096880a93b647a0da86b43b9df6cbd621334e7292e2d00f68010783858dbfa38061ab7eafd3c4c912
 DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07
 EBUILD nautilus-3.20.4.ebuild 2842 BLAKE2B 4988a1517e443a73e86d915d6d4db7f76d0422887b8ec76f65d00bf5d1e0e044fd773df619344476e23d4a95fcd281b12cd4c6d181e85e69550e1529cb03fdb6 SHA512 82e8360fffd669cdc4d31c1af637b7e557d4f0f59b582890a0d842c2924c711c653fa4d7d3faaa6cc48def59b7ad59ea3da80705189ffb2c34cd60f9b62f58df
-EBUILD nautilus-3.22.3.ebuild 2865 BLAKE2B 795785efc37c3b4a2dfb3c915b843eb95e3293eaecefe9b4f8682f3321fdefaffda4197f2717fe66bea91e6b87ab7bfa6d3e8d9f47f678670da61a032a6a3e10 SHA512 c646ecb222c89e6a3f151b741b7c4444b5b4f0a9ee895601dffc0cf53b640c1ca3d12b249888a8b9c9c6039eced09e88c535afbc0bb2c181046d32376ac377cb
 EBUILD nautilus-3.24.2.1.ebuild 2864 BLAKE2B 66e72d848e05218740554e9c924149d3e0d5e38e0894e1e21e8eee2296516e25f0d185bd7e30de499c35a9209397327b0c142241a39379d6d96a1cad1de621e5 SHA512 8b46aa27923ace87256aa0aeb2848f6621e0c048c3c7c59bcdaf1d4dc2ad4810c6ccb5c6784837ed05b1648c7c4625a91ea291aaf8d19564496a5125214e2e71
 MISC metadata.xml 795 BLAKE2B 5932c49c4317d89bb5bbc9754909397129147647a203cb5ee6e2d984850fbe87fa567f7e77b8b8afb329b4ea8d1c29413d1e51afa24d8f9ad8ada9efec1e21e5 SHA512 22363d80a08d2422ca7e454caf87dceb0ec7cfa6461467f3857c28e53cab914466c85a9fbabfa7d811009cbd3be2243cfb07462f49c434f345bf4c1999de1668
diff --git a/gnome-base/nautilus/nautilus-3.22.3.ebuild b/gnome-base/nautilus/nautilus-3.22.3.ebuild
deleted file mode 100644
index c45db7515f0c..000000000000
--- a/gnome-base/nautilus/nautilus-3.22.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-
-inherit gnome2 readme.gentoo-r1 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
-
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-# need org.gnome.SessionManager service (aka gnome-session) but cannot find it
-RESTRICT="test"
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
-	>=app-arch/gnome-autoar-0.1
-	>=dev-libs/glib-2.49.1:2[dbus]
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.21.6:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3:3=
-
-	gnome-base/dconf
-	>=gnome-base/gsettings-desktop-schemas-3.8.0
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	selinux? ( >=sys-libs/libselinux-2 )
-	tracker? ( >=app-misc/tracker-0.16:= )
-	xmp? ( >=media-libs/exempi-2.1.0:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.33
-	>=dev-util/gtk-doc-am-1.10
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="
-	gnome? ( x11-themes/adwaita-icon-theme )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk]
-"
-# Need gvfs[gtk] for recent:/// support
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-desktop \
-		--disable-profiling \
-		--disable-update-mimedb \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable sendto nst-extension) \
-		$(use_enable selinux) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 8bca478abe03..24f7c58c2df9 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 5e3c10bfd0fb..b32dd7c69df4 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -2,9 +2,7 @@ AUX 3.24.7-DESTDIR-honoring.patch 1122 BLAKE2B 73d95683bd162f0e93de3b005787b2aa7
 AUX 3.24.7-libical3-compat.patch 5323 BLAKE2B 5a2392751b009d6726490cbd11227d1d4c5ed5e61c8d0b6acdf282182dffcdeb31a2ed6395626231dc729dd9ee7b1ca26a3ce9148b3cca1fbdc83376e58baca7 SHA512 0b29c1d86eedf778d489a4a4c78bfc292898ceba2d90ac4c81aae2a0c65ac132e71de767f7a74ef839977c2fbdcc38da50579735e1775cfb5b2414fa304d19b5
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.22.7.tar.xz 5564924 BLAKE2B 8107a13ef46a4457e122c5d719c0d29ccbf5ec61424fb6b4810b1e165bb68cb8c1c87ec9ab34446458321c0c56ba5a5408f45ae9fc95bcee965c21caaad6a230 SHA512 53648c0b893982b3577008aeae57e213e084aa5ba4663ca109f200b268635fd1544408c1ace065e91e5eaf48a20f59609c8e895a1907501ea5e64119d1590d44
-DIST evolution-data-server-3.24.6.tar.xz 4252940 BLAKE2B 42a0a39a8248628964cfd026e4b8bc3794e897f447aadb73e0e7870865314c47d6de11a1aa85d6e7fcb0a414a3552a74cb3012c8a6d4908b280ae7440e1154d7 SHA512 01eece83217e66ce7e08e333ceaf38bae226800dd8a015dda29583b0155b9f1fbef4f18d95a7127d08421cd27b3203d2b7cc6a3bc0b5adba1b06197c85be96e6
 DIST evolution-data-server-3.24.7.tar.xz 4253252 BLAKE2B ca435a4e6c3a003c5166bd06f0308766686cc9e02f1eb6a15a521c58805bafdfd39cbc7ee058339ba383329ab34a11ed2b0eeebd9b545219c4b3d8f51de8df60 SHA512 3e83cb0e87ec822ebf6c81963693e7c701d20266e0811bd261a78073c75724e2c24ac5d5561e997ed8567e9e519c175b3104fa6e2e28158854c8c3ec39a8e9df
 EBUILD evolution-data-server-3.22.7.ebuild 3689 BLAKE2B 4b37c74e6b0d27d4cd1061049f27e5044cd0319367fae2d521cd0a861076de52a52c736e009ee55ea93fae46fb38a7d1e63b3988d5d188dd35f0e034c85174a1 SHA512 ec236fda93b156d8ee5ada17f83ba66fee61807c44979d6f9301711e088bca1135abc367f2959cbc95c2e7be5c2976844418decb82e8eda362bb2af059adf1cb
-EBUILD evolution-data-server-3.24.6.ebuild 4047 BLAKE2B efaa725a8ca0c725bbbf5a45d50380a3cc08b164d7683af8cb63e5f3ecd790906cd0af3457d2ed306fc3bcac82737c800cc9be452c8d0694a8c549f49a626db5 SHA512 961f124186d8ade010b8c77ad34f07b2aabb16ffbbaaa93db1ec564a9fce8ef8de171b6890fc2685030f64f06781208f283caba45c29ce56688b5b43b4e826d1
 EBUILD evolution-data-server-3.24.7.ebuild 4145 BLAKE2B 57e6f7f7908806fa50aa131648aaae3e6a2a835826bd0184f0cc89a631e876e8c2bbca68442fb134855f4b86513b13c8fbc2f5e573ace476ee3f8e82b739f5f7 SHA512 3091dac9ea3d6ccc827b84d68fb6e08d1a8dc0579f2aa7e08f320628d58e1641f65186e104b1e6f15759261813cd7857bba2334335f849c4f69dbece01b89e35
 MISC metadata.xml 894 BLAKE2B 2b37b8e2f6a027c64cf3fa2e93dda6270d6d73291213c956aabd91d3cdbeed7b7f40d7738f22566059304c13cb4471d6a344b564d28c4d11e86ac159dd789ebb SHA512 26ebc7b28f82f5d0d048bb699ad3663f8cb26cecccff86bb77543412a8faaf54c9cfbf3f526a6d3e113ec5b573fb97cc60eb56343d3a79d9d6162922cfddab52
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.24.6.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.24.6.ebuild
deleted file mode 100644
index 082f7b928c0c..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.24.6.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-VALA_USE_DEPEND="vapigen"
-
-inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/60" # subslot = libcamel-1.2 soname version
-
-IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# sys-libs/db is only required for migrating from <3.13 versions
-# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
-# berkdb needed only for migrating old calendar data, bug #519512
-gdata_depend=">=dev-libs/libgdata-0.17.7:="
-RDEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.7.17:=
-	>=dev-libs/glib-2.46:2
-	>=dev-libs/libical-0.43:=
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=net-libs/libsoup-2.42:2.4
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	berkdb? ( >=sys-libs/db-4:= )
-	gtk? (
-		>=app-crypt/gcr-3.4[gtk]
-		>=x11-libs/gtk+-3.10:3
-	)
-	google? (
-		>=dev-libs/json-glib-1.0.4
-		>=net-libs/webkit-gtk-2.11.91:4
-		${gdata_depend}
-	)
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.8:=
-		${gdata_depend} )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	dev-util/gperf
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-# Some tests fail due to missings locales.
-# Also, dbus tests are flacky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	# Make CMakeLists versioned vala enabled
-	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
-	    -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
-		-i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	local google_auth_enable
-	if use google || use gnome-online-accounts; then
-		google_auth_enable="ON"
-	else
-		google_auth_enable="OFF"
-	fi
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DENABLE_GTK_DOC=$(usex api-doc-extras)
-		-DWITH_PRIVATE_DOCS=$(usex api-doc-extras)
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DWITH_KRB5=$(usex kerberos)
-		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
-		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PHONENUMBER=OFF
-		-DENABLE_SMIME=ON
-		-DENABLE_GTK=$(usex gtk)
-		-DENABLE_GOOGLE_AUTH=${google_auth_enable}
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DENABLE_UOA=OFF
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_GOOGLE=$(usex google)
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_VALA_BINDINGS=$(usex vala)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index dfc8639e2bae..cb0d6aac1b26 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,9 +1,5 @@
 AUX 3.24.6-DESTDIR-honoring.patch 1196 BLAKE2B e6996ff088f5e5f3b1e4db6b1f85524d61ba35798d76cf46f07c9efe8587dadeab08b78f3a8d0ad8602ebe6899c72e0d0804e2835ba634afddf610ec0ff54488 SHA512 dc837d7150a42e9e03856b36a1f417ac1b850722f1475efacfa00bf724d45fddc03eb61d3f8f4c7e74884c672dd1f18bed86987cd3f22bbefa6ad7f514368a07
 AUX 3.24.6-libical3-compat.patch 1623 BLAKE2B f8fc567f2c86cbe6392de5750e8a01155d49a9bb79912d1e3f066be0b03eae90be4d39b72d3fa2eb92129d378d5647a697c3813d253f26980bed5a51e838a811 SHA512 2f1a607cf44d69bdd7a14551f0b95cc01c34a86f92741fce848b3d90e6e4bc8c35e9bf02426c742da3ab8bb4bc01c4533bac8c95894f11bb57290da19dec95bb
-DIST evolution-ews-3.22.6.tar.xz 715320 BLAKE2B abd68ffce9a2b723a72e26d5c0991060c377f930c3f34e2f9244dfb53c449bc92d8e0bca60b64993369fe00370fb60920e405355c3fbe63b846e279de785045c SHA512 6b93faa67a6f546142b023086bf54ac34d6c7c4320ee136f58cc0ea5a018811af2080d5945c4dc68c89555a35a4194b2f92bd839b2142ae63690e94ed895b40e
-DIST evolution-ews-3.24.5.tar.xz 488116 BLAKE2B 8144f1eae7440993c2bedd76e5cdfb3354b32bb1b1093bf24f23c12ca8a36e076950dc015f89966532d6c5ee491262a979cc9bff47cba5146c08989becd2fb95 SHA512 eaa5096c09686dade6f1efddea2b706a73c292b06b473b0f2ef1ba15eb5a3d685678416a0f1de40296beaa893d5dc91b944a440440dba489df67a944342f2f17
 DIST evolution-ews-3.24.6.tar.xz 488668 BLAKE2B 3ec507b654042882158d2d8dfdbaae0372cc67d515501e45e327ef006cd8674f7b6e48de63f8930add9f29536d3428604f21666cfac98a764cb2eb0c20353ef3 SHA512 24bcaf9755b9d45d4848624b42f2b41bf1532aa836cdd26f8ab57b4dd5ac83d4375c340e0cac6f7f1b830c3ab998597893bce0fdd471ed7b0758a69367edfac1
-EBUILD evolution-ews-3.22.6.ebuild 797 BLAKE2B 364b2955e3d909feb216050230cb1c4b5cfe86b5e6e7ee934959913f4cfbc29314be5a68ce6f30ee2200a1f2dfef1a34ee299ae736acab8673453343348efae0 SHA512 0baa303346cd26bfc417cf8ee7fd2bdcaeb62980d6cda234b131b55cf7d3fb7638a9b127684bb2762453b37e1938ace02dabfa5bdb82027e99a7d8c30ceead93
-EBUILD evolution-ews-3.24.5.ebuild 1076 BLAKE2B 5c71eb434a6c91b53a20450960d8c89d19297c5f0af7661a3465c0201303b4af1b456387e6e18338bc927e4350883adb5c2c4119f5282401aab24340f80ed971 SHA512 9343a952f6c3d9b58a8b9bf6522107311de6c01f16715cb548cfff63d316873db07f05d1e61d4719dea6bad034b4998a8d65ed71ac1cf46a2e076d2c810c0be8
 EBUILD evolution-ews-3.24.6.ebuild 1306 BLAKE2B f82629ba467605d6c359c1b2c0db19a912332e6c1c32126a70919131d15b639bac496004c344a9078932fe262c5c84ff669aa2a3e30cdc5fd76ae969e9bd0675 SHA512 b270f0ec8019b39bd49157c393be0ba1bf305fe4dba9bb7a0e18e89c6095b6c0b5af662b21b9f4cb87c9f4ea629ebe36e339125976977afbc31601f516df2a7d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.22.6.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.22.6.ebuild
deleted file mode 100644
index 27b947f59e1e..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.22.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.40:2
-	dev-libs/libical:0=
-	>=dev-libs/libmspack-0.4
-	>=dev-libs/libxml2-2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/gtk+-3:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-	test? ( net-libs/uhttpmock )
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable test tests)
-}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.24.5.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.24.5.ebuild
deleted file mode 100644
index 87e553e77c4e..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.24.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit cmake-utils gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.46:2
-	dev-libs/libical:0=
-	>=dev-libs/libmspack-0.4
-	>=dev-libs/libxml2-2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( net-libs/uhttpmock )
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 2e3d4c4f2f88..da67e59af4aa 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-boxes-3.22.4.tar.xz 1704964 BLAKE2B 92409820ec7f0fd414d894c7721abeaf9a3d5cb44dee25dcbf54a880155cfc7b0f8605b54d8bcb1bc776b3399d498cf3ab183564da5b3dbc09053f25a98bd3f5 SHA512 98e923c67d116ad5411734415b96ced5cd5f9f2a03335c8b00835a2eae47ea46dfe72f0aa5819d6ac9310cb80b5c6504a9ef7c8e4d8ef4c35495aa8fa74ee848
 DIST gnome-boxes-3.24.0.tar.xz 1710652 BLAKE2B 0b574fcb54c9a6ab2323f08caabd8aa3d201bcd0f83fcaf6b5dc15aef0da8fc6718128f28cfa0d50c02ad341d699c1cbadec89dbc50c1a4bea08865bd8e3f0d4 SHA512 979d5c0f2cef052e2713508fc2fd46d64a3a325edd38dd0aa99f2e9700efd3f84916847b35487f9d7eb5e5e1c5f3b4b712b649fecf1523821c3488fa6b250026
-EBUILD gnome-boxes-3.22.4.ebuild 2651 BLAKE2B 1309d3a5d73d3c44cdf4f06e8ca7dacf8672082a40d650280b8d849933d0bd209f03c5a70577f5390f490631f092584751ac24f2e3f2fe73794677fd405b6388 SHA512 81a9fa766fd43e1888a013164f25a7135a3c25bad562b97afbfd7e6f466a0c08aeec3696e979116b4850c5c3e2e660fda82802b56908a8a238c1c38b7c6bd00c
 EBUILD gnome-boxes-3.24.0.ebuild 2651 BLAKE2B 1e7e96893c782328e4c58473318b017086688eb130cac63ad9c79f5009416c6455b9f1dced682226a83edee865895f9dcb02a1e0fb1e06483952a48bdbc34c27 SHA512 5eb8b4850f4eec7a193a2b13578d9c80bda0880ba8fa469b3c0f882b2c105493e308abcd3a333831e0d7e10874e90b1c7bf86557234187004b7afe7ffea1ad99
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.22.4.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.22.4.ebuild
deleted file mode 100644
index feba37477a4b..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.22.4.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 linux-info readme.gentoo-r1 vala
-
-DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2"
-SLOT="0"
-
-# We force 'bindist' due to licenses from gnome-boxes-nonfree
-IUSE="" #bindist
-
-KEYWORDS="amd64" # qemu-kvm[spice] is 64bit-only
-
-# NOTE: sys-fs/* stuff is called via exec()
-# FIXME: ovirt is not available in tree
-# FIXME: use vala.eclass but only because of libgd not being able
-#        to use its pre-generated files so do not copy all the
-#        vala deps like live ebuild has.
-# FIXME: qemu probably needs to depend on spice[smartcard]
-#        directly with USE=spice
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.9.6:=
-	>=dev-libs/libxml2-2.7.8:2
-	>=sys-libs/libosinfo-0.2.12
-	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/libvirt-glib-0.2.3
-	>=x11-libs/gtk+-3.19.4:3
-	>=net-libs/gtk-vnc-0.4.4[gtk3]
-	app-crypt/libsecret
-	app-emulation/spice[smartcard]
-	>=net-misc/spice-gtk-0.27[gtk3,smartcard,usbredir]
-	virtual/libusb:1
-
-	>=app-misc/tracker-0.16:0=[iso]
-
-	>=sys-apps/util-linux-2.20
-	>=net-libs/libsoup-2.38:2.4
-
-	sys-fs/mtools
-	>=virtual/libgudev-165:=
-"
-#	!bindist? ( gnome-extra/gnome-boxes-nonfree )
-
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Do not change CFLAGS, wondering about VALA ones but appears to be
-	# needed as noted in configure comments below
-	sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure{.ac,} || die
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# debug needed for splitdebug proper behavior (cardoe), bug #????
-	gnome2_src_configure \
-		--enable-debug \
-		--disable-strict-cc \
-		--disable-ovirt
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 8ec9364e23c6..a5280d866dae 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-calculator-3.22.3.tar.xz 1324432 BLAKE2B da308ea5b781a55e50df459b914d2bf508577a9a0175ec93bd8e63d37607b261f9d3d72abcf838d7c555303cb0a30b9750712c1336a9f071793df7b53cd50101 SHA512 e11731a3b0d16067e98d7f5d6657c879dde22563c4ac7cf8e4323c6d959f7b4e95e1d28cb2c937b1bbc72256fa1e6e2cf3a1bdc77f72f38766605e482b63ce78
 DIST gnome-calculator-3.24.0.tar.xz 1358368 BLAKE2B 81ad42598418b11f2436ebf482bbf93547460990cdb464efb3107e93010081f3d687bf99c80d35d9a6576b5d838218c7ea07e81256abfa358ce78031d80b346d SHA512 55968f3a307748050089652394a3652b8e199be9abf87d43e732874526dc2f08c4521e302a69afd2c09705ffa67a890fc2217503dd31ef51959df9189364c22f
-EBUILD gnome-calculator-3.22.3.ebuild 817 BLAKE2B 24ffd92b21eb54911aa9c5d49cda3aa20c7642fabc731527d68ae908bee82e88bc8e2c1d4fff23bfc8f4a68fe12b79b9d2e913551a13e3d1ae78fabfbc7ca8b7 SHA512 2219acb5b62e3b8eb2b263cde34a008053997da93cb02d40833555d3e635d4f3146c31961c301ed88ae88bcb3eab087c28ec5173f82430dc76f1c59b2f0a8959
 EBUILD gnome-calculator-3.24.0.ebuild 831 BLAKE2B fe40aff436455bc94177f54c7b55d5b96a262cde479c0c5cc7f9751756fbff16fa060aaf826ba671fd546e3f5228ca125ba67c9671eb549171e7ba377d57b42e SHA512 2aa97c1e4701f088c6489786141706914f0db3578cd66c14df96463490f9ecebbc8f8584854fc00755563d93f9eca0c4108b3ce1eb01e579cfbe72860131847b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.22.3.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.22.3.ebuild
deleted file mode 100644
index 08b9733fc622..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.22.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libxml2:2
-	dev-libs/mpfr:0
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/gtk+-3.11.6:3
-	>=x11-libs/gtksourceview-3.15.1:3.0
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-2.3
-	!gnome-extra/gcalctool
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		VALAC=$(type -P true)
-}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 3a3af8cc9dff..d9d55423a975 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,7 +1,5 @@
 AUX 3.24.3-libical3-compat.patch 1429 BLAKE2B ff22e520aeded89b65db02b511c869b8b76c1be1978b9be750565a6d813c0bdf8054a346849de4e2a8c840506d8fb72d34cf08148878b25839f5454d727a2a64 SHA512 72541436fc604ebb923e4d1d9bd033b22972c7f3305b81a2c4b3b77a9c56513654f382de433112e8327250d901e108b899baed437d871125f1709c21cbcfb370
 AUX 3.24.3-week-grid-fixes.patch 4124 BLAKE2B 99fca623889b10356defd0da2ab2672123dadf98ca0eb4ede729c0a586caf5677249ce541ba2a2a7cc440e5fc209a3a93fd4dd0e92607010f1320f988f3977c6 SHA512 9a4095c13470a1dcd7fef6d1d5e9ce12b54acde103029983ca7bb581efbc2502f74ef1fc53b6c7dfb40cc25d1778a1b5d82852dc674038217d2777e9e5a1d0a0
-DIST gnome-calendar-3.22.5.tar.xz 2376792 BLAKE2B b36ba91a0c8202bf1419450656b8abd75913a83ecb7780ac73204e0e52dd938069c364fc106860d3ef7ae14bb3545ddab54db9889207d0568e0fb6bb055eeba7 SHA512 113a77c64fce8317f12d1704bf4076b48abb0f42e4d6e474a7912bc948295bf71e8b9ea00e50301464fa9726cdbfe453af92a24acd3c9ac76a6f40e92062e335
 DIST gnome-calendar-3.24.3.tar.xz 2425292 BLAKE2B cb859e229b040dd1ef34643e7aac5ddc1d0368d0bc6912effd73bd2c95ecab458294fef866f5718e108ef36f03bfc0dcb5a1140a571b3dc35128125ea8ff8e19 SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67
-EBUILD gnome-calendar-3.22.5.ebuild 748 BLAKE2B ef9d8db79696ae99c9cbe392fc0413f595f78debc7cbe1ab467b7d2777ad55539acd3a6b885b2f62e7d5a73f27336c97b86c3ffff05f4548433080db3b8eb0a4 SHA512 70cf17138a1f4d5f14076c9f330228a1f82007bfbaf121b4ccb2a6d36a3b83e257e7e9aa2f5c601e7fd11ddc05399babb5a0ee98d3bc632c08af8fd27e3db266
 EBUILD gnome-calendar-3.24.3.ebuild 1136 BLAKE2B e265e44c1601c312823afa579b13e2821d948b2cd3cf3982351eca7e9d3bf15c9e34f0aac46ecdd920b9d9c28d3366adb891806777644177fe7b5358470f6640 SHA512 de38681c39092192c46a5239f01af054b7d56d436d56747da1ee5829ff74f86b078488614a2c6d5a5efe1438610548c15000ca94efacf3efca1620dac300e0b6
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.22.5.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.22.5.ebuild
deleted file mode 100644
index c6ae37760e46..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.22.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-RDEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.21.6:3
-	>=gnome-extra/evolution-data-server-3.17.1:=
-	>=dev-libs/libical-1.0.1:0=
-	>=net-libs/gnome-online-accounts-3.2.0:=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index 459aab22eb32..2ea63ff59958 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-characters-3.22.0.tar.xz 1481416 BLAKE2B 4a61951c427d5ca7f36a0d221ca9b39053998329d936e16e0cbf080fe3300450776280bd31be0ff4de2c18c638243d34c4a6813763ffb7f4bfabd618baa90748 SHA512 c04d79f9b31601e127ae6103b2f473e2e4733facebf504189a8d5721a78b430883a0f790b58537eb7772c5a4ce72013183d037909f30a237cd1482c31144905f
 DIST gnome-characters-3.24.0.tar.xz 1490304 BLAKE2B b7bea411ae623a29469fa82d8a9a220a718134776c0973431f4f16f6753bcedd34a8886f3cecc8af59b178f93c051310fa988aef198618b2c4d0be9001cb7ad8 SHA512 28531676e3ed89cea574f800a1f0e19106eb4ccb0edc62ea493bb6680fdbe3b1ed45c3cd865a637c059a89df63b980cd4a9d69d73049778c52725b1d38fdad9d
-EBUILD gnome-characters-3.22.0.ebuild 1087 BLAKE2B 3c1a5508a639dcc0b5a30c0a8b3637750d419dde6996f65995fd00d4485ac8d49f79cfa181d9ff9f168e0bfc75b52ec112a9b7d6e3e9852b3d07b46380f81975 SHA512 d5b33399bd0042e66f5ca0ee15d15693893ce20e7318d14f3ddff7f813232ebb697cc6dbd76fdbdb463ff2956b0ae970f75a53965c09db0620ba8d1cd17365d3
 EBUILD gnome-characters-3.24.0.ebuild 1168 BLAKE2B 17e378c2397c5f9c02242ce840ba6c5f9626086e62287d00ded178f09a9d3f7a6797155b3946a39742006c9a80b032bea78466757c093c1142657dda1415fe29 SHA512 5dd6ce8d5cdb738fa247a2e97ac7703cfcccd9bf4bf7a2493e4443422de620665a34303ffba1005ea886ea0685ffd833c35aa617facdd95d756ded751570263c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.22.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.22.0.ebuild
deleted file mode 100644
index 2d624b5bdb32..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-3.22.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/gjs-1.43.3
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libunistring-0.9.5
-	>=x11-libs/gtk+-3.20:3[introspection]
-	>=x11-libs/pango-1.36[introspection]
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index d6f1b133346b..1b011df00fda 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-clocks-3.22.1.tar.xz 954416 BLAKE2B 52a59c0514cb05a9216997d1ebb985952be2c81b8105db02e5e3d11c1f6a6a13ee15ae86c35c97d985bde3763c8eed51fbcca1b8809c701db4e8102ca7e28d69 SHA512 76c4b9c493d6897a3d5bab4679f834bc515861bf6030d7fac2b59f5584b2a5278385dd4f5747adbe04df92c3af822ded669490d680daf3b9bc46ce09786f602f
 DIST gnome-clocks-3.24.0.tar.xz 954576 BLAKE2B 848303243391bfbc5ae2fcd8bfb4f3320ccb8465098d95379aaecf856341f05171964eda1a0a8637e04b5330cee6343003ec25063157f6d8ba0abcc22aa3f6ef SHA512 f29a61ac9634008fa918f9f08c6e24c93816c0077687bd2feff3ef2c62c0db475076de5dbc1e223027627e985c4e4362f0cdf1a47821356c0a9ef9c4cd672de1
-EBUILD gnome-clocks-3.22.1.ebuild 700 BLAKE2B a39f9de9f253146017112d1b110c01263023698462c6deaa9acb19505d078812d2bd28a5a887665995d5caf6564c8eb843563f506f5d8bb725019cbd63d5bab4 SHA512 6c443dbcce5358c79cdee75f5b98251d058c23719e04ef9cc7d5f34013e0137d5b885be7ea9f04282b6a6d3f30534bcf14c4bcdc6b6dea8c364536bac5703c5d
 EBUILD gnome-clocks-3.24.0.ebuild 700 BLAKE2B 6eb7773cd6c818eed081337668cdd1a83cab80e946f8fc94635b895eff454f55d410297a113b58223ce8df2510418eeb188ac02fdcb4c38d6e049b8a6bf4aba7 SHA512 a108464748a745e78c230d635d1085fcbbc2b2a96b9a01a6fec6b63e7384b38377bd6e4fe40fd7a1784f0b970f6b772d36b08760e4812e160f9b7481d2bbb192
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.22.1.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.22.1.ebuild
deleted file mode 100644
index ee81f0dec157..000000000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.22.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Clocks application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/libgweather-3.13.91:2=
-	>=gnome-base/gnome-desktop-3.7.90:3=
-	>=media-libs/gsound-0.98
-	>=sci-geosciences/geocode-glib-0.99.4
-	>=x11-libs/gtk+-3.19.8:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index ac52fad44eae..97ee856ff8b5 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-color-manager-3.22.2.tar.xz 2671864 BLAKE2B 0560a234d66fd55f28d59b373e0f52a9b06610ff925e7cf8c959233883a039dfa61c0595bb97f1ad5e415d07a2baa24d8df5240ad5ca41dd5ad8a682639a8369 SHA512 dd50cff841fc8e70554c0c998494e363b709d1a8d4084dfc8daca6297d9491c1b797c4f3f106284e0f8ef133ac77704ad805b5519566c2f49e311f30a1e8397f
 DIST gnome-color-manager-3.24.0.tar.xz 2857120 BLAKE2B c73c3718f77517a41fc74c12347101c57b9939101b2c816cc6390185fb0b21f87d16ed30b17a94f7bd03e28abb4bd5f5d411c086d350659f6686cfffb7e88cf2 SHA512 e145caf4e885ea6e9c4ee5a5b4d800d70af338e26d3bfcda81e20c6144e36d0581638d07099302d30787d6d30e9d58f2b8373f6585ae3788df825d6d24f5b003
-EBUILD gnome-color-manager-3.22.2.ebuild 1532 BLAKE2B 0a31c6c73129fa838121fe80b6c6a1b1afa1526085a557c153450bf5165832c0ebf543eaec3309f3df19475db9b56e883b1580116afca6c2b24f8cc7b14a8aaf SHA512 75aac8de5f1a1425948107ab943f73eaadf1d735f236ce586950e606bd6eaf8cd0d80a8957d8f6e74848e2d4bc46c36367655c1e27a360424f089864e9766896
 EBUILD gnome-color-manager-3.24.0.ebuild 1537 BLAKE2B 084f0e787a17f17923e8996d81b8e01151abe110045e6fb5f7d2a229b96559d4dc25167a0f5dd738bc6d9ac78c9327748f303364f80f921c9fa33fffb62cc9ba SHA512 bf6667a55b0e63a9c5797e6cdfa13534be558f6ece1aa4ed15be39915ea203051e51f5e6c2a1a98933d115a35134b29d3fd95f107224d0a2a64ede099497a3f8
 MISC metadata.xml 394 BLAKE2B 1a38f315a074ea0d45493f48b8de54baccea3378a2c8e4a07aa097750487e8b32f10b6c1e7ccadbefd52762e4723a842fe20a58f3e7b3d044eec9a9bdcac04f3 SHA512 628edb4565daf3f3591c8306916b0271b7647c3cbad1476414c368be1cec2bb790da5cd8f29a660b04dde649b21f2271660ce84cc87079e753709f1d3394f48d
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.2.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.2.ebuild
deleted file mode 100644
index 2933fb386a91..000000000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="Color profile manager for the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="packagekit raw"
-
-# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
-RDEPEND="
-	>=dev-libs/glib-2.31.10:2
-	>=media-libs/lcms-2.2:2
-	>=media-libs/libcanberra-0.10[gtk3]
-	media-libs/libexif
-	media-libs/tiff:0=
-
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/vte-0.25.1:2.91
-	>=x11-misc/colord-1.3.1:0=
-	>=x11-libs/colord-gtk-0.1.20
-
-	packagekit? ( app-admin/packagekit-base )
-	raw? ( media-gfx/exiv2 )
-"
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Always enable tests since they are check_PROGRAMS anyway
-	# appstream does not want to be relax by default !
-	gnome2_src_configure \
-		--disable-static \
-		--enable-tests \
-		$(use_enable packagekit) \
-		$(use_enable raw exiv)
-#		APPSTREAM_UTIL=$(type -P true)
-}
-
-src_test() {
-	virtx emake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version media-gfx/argyllcms ; then
-		elog "If you want to do display or scanner calibration, you will need to"
-		elog "install media-gfx/argyllcms"
-	fi
-}
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
index c1ef7dbbaecf..c0d0556f6c32 100644
--- a/gnome-extra/gnome-documents/Manifest
+++ b/gnome-extra/gnome-documents/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-documents-3.22.5.tar.xz 2312164 BLAKE2B 09ccc89de43b81a2a9f5d0b85e616089896149559a34507463ac698362ffc72ea135fd660215d29fbc6d9e09df9745b38aff4b3d5ae9d62692de05262bdf3b60 SHA512 b074c5f5a5d7a698f3e571005a523f48928eca4081df7cfba6c97a0178b59ef3071920e5622e6200c8f59125fee934baaa2f07b8c011f8a4c2338c8488d0c516
 DIST gnome-documents-3.24.3.tar.xz 2313680 BLAKE2B 920e18b0ca43cfa95945268613f15f2f417de74c8992aefe414205d3463c0cdaac81fcabb9453ac93a76ae7b221da73379d86902b483fe2f3d12063ac27acdf7 SHA512 c5b59ba4a2eb83d7c61e6e50f6af2d0b310c7b9709ea7c8a02da707cc7e335589e4bef7b6f6618bbcca729fdaed531647f7f839aa3538830a226b837d0f0118a
-EBUILD gnome-documents-3.22.5.ebuild 1244 BLAKE2B 41dd0a635aef79cc1e76f6509b615de814558f3dc9dc3b8b1da6ad90fcc3fc55cf05d0ff2ca1067e9efc92e677d1e73717c7f36806374366f5fd209e91e5f080 SHA512 6d8f0c736487f0e3811523229c69b649f9bb5f583458cd0da81182211de94c00f9c23c7e8fabcc55b53066d01058844d82c2eedabc078cbc7d72a137dc65a1f3
 EBUILD gnome-documents-3.24.3.ebuild 1245 BLAKE2B 33bc45540e828e4045b47930b3e4627fd40aa0e15de115b3b8516c93ca8a76941bf62089a434b824da3788e3098660ca937e1c00dc1b68c790dd8796b2a6dd18 SHA512 acd279ff281474d3654f2f49f9783a84226971caacdeae4b21b5dadd6e47520dd69fffc383d3259d401c96542e2eb1f45b3e325c60174eff447c375ea1707dda
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.22.5.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.22.5.ebuild
deleted file mode 100644
index 97bf5c01a4ec..000000000000
--- a/gnome-extra/gnome-documents/gnome-documents-3.22.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A document manager application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-# cairo-1.14 for cairo_surface_set_device_scale check and usage
-COMMON_DEPEND="
-	>=app-text/evince-3.13.3[introspection]
-	>=net-libs/webkit-gtk-2.6:4[introspection]
-	dev-libs/gjs
-	>=dev-libs/glib-2.39.3:2
-	>=dev-libs/gobject-introspection-1.31.6:=
-	>=x11-libs/gtk+-3.19.1:3[introspection]
-	>=net-libs/libsoup-2.41.3:2.4
-	gnome-base/gnome-desktop:3=[introspection]
-	>=app-misc/tracker-1:=[miner-fs]
-	>=x11-libs/cairo-1.14
-	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=net-libs/gnome-online-accounts-3.2.0[introspection]
-	x11-libs/pango[introspection]
-	>=net-libs/libzapojit-0.0.2[introspection]
-	>=app-text/libgepub-0.4[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/gnome-online-miners
-	sys-apps/dbus
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	virtual/pkgconfig
-"
-# eautoreconf requires yelp-tools
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index 9b8c4ff12ab0..f729bad898d3 100644
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-getting-started-docs-3.22.0.tar.xz 119100024 BLAKE2B 9d6daaa565b92b5b27d621c1e3450a576105297c221da33169a9de2d51823250267464855b31024ad84f05272a365347a6a10f5eb171b199331cac9dfa47d744 SHA512 8eeebe70054a5fe68bd19c81b0725d3f2084c92aa91c925653bb2e53d4cb66c592d78af1e5446bc8063e9f0bf19f684d8b22c01b8300886ff32dca228f45cb6f
 DIST gnome-getting-started-docs-3.24.1.tar.xz 119137908 BLAKE2B 628dab2c9a938f3b265855443e794c1575586d0579692e1a21bae77dd497989cd061cff4dd97090f11719916f24742eedfc81bacb4fdf31536eca78cdd221d6f SHA512 7d44ac4030c3459014f391d10699b48f9be789c196900e29a56574e98698ffe494d3344a7c99f04291c49093827385093877b9047549cc5ff4d352d39297387d
-EBUILD gnome-getting-started-docs-3.22.0.ebuild 424 BLAKE2B abcb6723c0e89b6b166621bd6f7be96b37989692155742adb7d3b16c5895b3991b0c63de4d691eed8fa417209e4cd58e59742ca82b82e733a7af034c4792c3ac SHA512 4cec7d1bdd1f8a95a0e001bb6fa2e613c4fd8ccf937d17cf6b09a910dcc96553ae9a485b3bd5ea2e3459077342675b93cd62538a55c00f08871d5b2d812e7cf3
 EBUILD gnome-getting-started-docs-3.24.1.ebuild 424 BLAKE2B 64093399bab07a9e68c313ab3084eb774543e336106b9f46517fcd27ec476c5cae4cc36091a1234c386374953ef0cce20c046a4db7942112b850cacdb84aab26 SHA512 adfea1597f4471168fed28f8de0f9002c83b95c47f5cfc254044252deac204bff92e29ef4514c66d35e6c043935afe0f9e3c249df8388a3bc501e2bda1fe45ff
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild
deleted file mode 100644
index 234c965d2348..000000000000
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Help a new user get started in GNOME"
-HOMEPAGE="https://help.gnome.org/"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="gnome-extra/gnome-user-docs"
-DEPEND="app-text/yelp-tools"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
index c6040c4b02b7..98520620014f 100644
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-logs-3.22.1.tar.xz 968664 BLAKE2B 02376b0b4e47298f9921bdb2d306eb7a3678a98df16815c9b46135171edbfc69813e8d34bce18c33f1bb061c67d78119b7bc7b84f17779f93f1c9fe7cfbfa93f SHA512 0836f326407bcfa66b57f10218ccb557356baaed53867c96f4a8fa12eea547fe4bc8a4f5aea894852c4de31d19c4e2374ecfe78bcfcceda93d2884cefdef90be
 DIST gnome-logs-3.24.2.tar.xz 1000552 BLAKE2B da237fbce0b1ced77c52ffab1965f6e1209df8fa1f224274b3dddd30bea106fed6449e37e0ad654b579ce1128fb6b554ffd521faa5362db9ef8f8f2a54a1685f SHA512 6f7dabb0b0093b860198344373eb1feae244ed23c3a65494499c09a83c687ba68ff023ec5ce34846be51fd74293fdb4b575cf3a748a22fae183e89086eba1db9
-EBUILD gnome-logs-3.22.1.ebuild 995 BLAKE2B 9708932255d64ee1e92e56e78b043b67b28b93d85509dd9912ee6c70c03a80c4250ab410d806ce732ec99d2d3b68d437f567bcf88c354be3ee283b067c022a03 SHA512 7059edb371700bef17a64bcd021b8e82eae59d10d2bc7b78b7c146fa69c81cc5ab09f9877b6a4fbb63da26dff95b06f4b3ec861107e59e9d102e7c533f3e0ffe
 EBUILD gnome-logs-3.24.2.ebuild 995 BLAKE2B a84cd13c043754c4ef9e377ee4033cd8a018d9d5b46c6dbc1d2c97029d685c47ad00394fb129e710effe65030a765d9cb4d99088d54648a71493a6ccb937ffab SHA512 634cd794549eea11f7cf675f2e8404af952cc51f756fa8ea439776e8ab0f2b0fef4ec9045cde019fa9f78a88706df1ca79b31a30836f2476170924af8d98b47e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.22.1.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.22.1.ebuild
deleted file mode 100644
index 57a1a38ee30e..000000000000
--- a/gnome-extra/gnome-logs/gnome-logs-3.22.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Log messages and event viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.43.90:2
-	gnome-base/gsettings-desktop-schemas
-	sys-apps/systemd:=
-	>=x11-libs/gtk+-3.19.3:3
-"
-DEPEND="${RDEPEND}
-	~app-text/docbook-xml-dtd-4.3
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50
-	gnome-base/gnome-common
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-man \
-		$(use_enable test tests)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 9acbee4813e5..0981fafd4631 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-power-manager-3.22.2.tar.xz 453204 BLAKE2B 3b0213481bdba4fdbcc25987660cd358271355a1d259b848399e8dde4e093dd4d8020277e44eafe0cf448e6fccf0abdc68fd8e28d1a654ea45c1ea46f4f2ca41 SHA512 a8039404bf9850422d385281b6572485b39b5fd63c7eec1b41df14f4d551898a90c8d943683517744d0dc2d851a7fd1f7697655af91a0d17a3df476828a763aa
 DIST gnome-power-manager-3.24.0.tar.xz 554616 BLAKE2B f39ce93943426fe8e833b48b5e7e4a02645eb3ffd28aa9e3e8c515d159950409ae9904b2683419d0087b3ced8e30f1c42b4dd9c511100041952449aef0b18e0f SHA512 fbbac0f5176382ccd13497cd80792d10ca4bc39fa4cc0585543f5458ba0f256ffb66b7ebd82667e482ba33cf2b6f3ef6a64bf2f55ac224e1d9ab2e2b7491e4e0
-EBUILD gnome-power-manager-3.22.2.ebuild 1325 BLAKE2B 01a147f9b88eef2137bc3b3029babe37d18bb92dba14417ccd7de7f3277a08ab88bebf59ed241fd412a3076735ccaf2f2ff9eee3b8f683fb66581bc31d960132 SHA512 c5469e6c05c96901ba3993c948dc291981c281331779af3956a2337f87e1d74566ad738d231b8f1f6e3d9189c87150a9ca5cb68b7e2dd85e97879a97f4b1ad77
 EBUILD gnome-power-manager-3.24.0.ebuild 1308 BLAKE2B 078e603ad3abdefe5eacbe16d8651f1c9d28c571f204e6327af747b447e74d9afab91a77aeceb77eba66ac4c01e04601a55da88177d0c1e4b6264ee49f9cecd6 SHA512 b86ad47dad5536a8f307462a91852e11272463a312cd0ec69413cd4f53de6fcbbb9f93adf2ae2917f1263cfb91bca3cf2d40188321199e56287a8f3ddc36368d
 MISC metadata.xml 421 BLAKE2B db2e0d7210e04256add24c9bfa054291ffcd6cf8b52107c184b61b27859589ed17bc3ef2037cf3eaf1fe7a8ceb3ac381c67f6c3557f0d960ff0f1aaf67e9bb99 SHA512 3734560a015221b467a58c968ebd60272e14fc37bd93d07dfecc15e68dd403ed82e1724d62ba88ce3ee07b5c0e179adc1fc67d68d2c119458901e609a740b43a
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.2.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.2.ebuild
deleted file mode 100644
index a095427215ab..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="GNOME power management service"
-HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.45.8:2
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/cairo-1
-	>=sys-power/upower-0.99:=
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	x11-proto/randrproto
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
-
-src_prepare() {
-	# Drop debugger CFLAGS from configure
-	# Touch configure.ac only if running eautoreconf, otherwise
-	# maintainer mode gets triggered -- even if the order is correct
-	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
-		-i configure || die "debugger sed failed"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable test tests)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index fd75aeb4d028..ca6b5f2340b1 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-extensions-3.22.2.tar.xz 339444 BLAKE2B 4d25481db952efb0433e8b55d2345b6a9fb8b6ee7fb0f84a53aec2e4ff0dfa560b0b8848095926ed707b5523a9dba6a14484035550e21dddaa657576dc181fdb SHA512 7cd045f2df885f50f5e7e41b818aad01c65bd503d656793d64bc9e283fe715f588215a894ac856da0c4c2759c549a1ce2dcb91af64081f40c664c9d28edc2d1c
 DIST gnome-shell-extensions-3.24.3.tar.xz 346420 BLAKE2B 3b6f6686656ca6f395bd69fea905c4f28264db81ac0f207bc2e0d6c82410328be2bc4c98faa659d9ac551cabb73e0576c4e28def9c14e5c7710a9785528909db SHA512 7948a9cb6f5cb8d760bc42ea2865823ee60bd164b491d944edb0413e362f38ed90d39ead44ac57872a83c43c4050f5448936e739626b89a2b486a22f41d61e20
-EBUILD gnome-shell-extensions-3.22.2.ebuild 2052 BLAKE2B ec08a847c5872d418c4af2441228204bb89c79a8301f74c410a49e92190a1566b96a53d4840f4e1681390722ac1bde204f00256caba3a068b65713d02ad1ba14 SHA512 b718a6171594590c37c6695ddde1cde5d62193faaf4a1122c7645ba9a3850e3434bc2996b08be02813330789e85e4e52972d07bf192b258ae0da404269d88d31
 EBUILD gnome-shell-extensions-3.24.3.ebuild 2052 BLAKE2B a1be0802d71c34de0baf77b088badb0ef0f492c30ce738e85fcc52f921f2156f11715dfa2f3a7309cb1e3fe804ef80bd3d3c37a95b8dc49aecb7ea801fcceec7 SHA512 2aa74c3f079d1fe228e12fed8f984f80be3f0bdbc904499555e80d2a0931bc9003f652ba5aacb49563eef5bc86495c6f8552c2b1136fe0179b078a1004e45cba
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.2.ebuild
deleted file mode 100644
index a7f2f222872c..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="JavaScript extensions for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	>=gnome-base/libgtop-2.28.3[introspection]
-	>=app-eselect/eselect-gnome-shell-extensions-20111211
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection:=
-	dev-libs/atk[introspection]
-	gnome-base/gnome-menus:3[introspection]
-	>=gnome-base/gnome-shell-3.14.2
-	media-libs/clutter:1.0[introspection]
-	net-libs/telepathy-glib[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-themes/adwaita-icon-theme
-	x11-wm/mutter[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-"
-# eautoreconf needs gnome-base/gnome-common
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Installed extensions installed are initially disabled by default.
-To change the system default and enable some extensions, you can use
-# eselect gnome-shell-extensions
-
-Alternatively, to enable/disable extensions on a per-user basis,
-you can use the https://extensions.gnome.org/ web interface, the
-gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell
-enabled-extensions gsettings key from the command line or a script."
-
-src_configure() {
-	gnome2_src_configure --enable-extensions=all
-}
-
-src_install() {
-	gnome2_src_install
-
-	local example="example@gnome-shell-extensions.gcampax.github.com"
-	if use examples; then
-		mv "${ED}usr/share/gnome-shell/extensions/${example}" \
-			"${ED}usr/share/doc/${PF}/" || die
-	else
-		rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index d1821d6f8158..0a0dc8c611e4 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-system-monitor-3.22.2.tar.xz 907524 BLAKE2B 81a1efd150439b84f471f7836d79da13d848c234372f41f67cd09d17b4ae6dfe36e3f9f9b8b769f611715513bd5c2624a058c24bf511a8aa46f85b0a6487fccd SHA512 ff713efc63a8b5f247c27358f69fcb8b27d631fb242bddc6a819b453996f7c49ba8a883bd3dc38437dccd227cbf393e473226d597af0994f25f4ca3246707d13
 DIST gnome-system-monitor-3.24.0.tar.xz 930956 BLAKE2B f08b6da2ee9d45d232f1d1f019b6844f6fcf50baf85944d240611fbc0794cce6755d6b7daf275f4d97686558fc0f2525a8700fda473b576f8d5d41f66f118275 SHA512 4155d9f130cc1e38d32b76d10ca91056d82b90ca555f9ded26acfd1ef018b92163b0cc2256861b8e166b3bfa7eadc6c900aa9c79fd0c859045197ab2eaf3dc9f
-EBUILD gnome-system-monitor-3.22.2.ebuild 967 BLAKE2B 6c03bca17f8767aa89bad5e71c6cb5e5a0ccf7f34ecb91c4845045084b3bac7666daf3794eb23f0dfde0fcc48b4572fcd334746cc950171982e6e28a343e5812 SHA512 5faf503b26e4a3dbd0d8dd0de2570d75533e5b9b1c78a7c2c8bc92922c3c86e2a70b4c8a3f76c41b919dae224d9f4112d29f9bbeb03123b9b627917648b20da0
 EBUILD gnome-system-monitor-3.24.0.ebuild 974 BLAKE2B 2ff42e344500a9c746eb1d89dc9b8c9c742625d09d967806847f01001ce44a412c364a86be6b0c9106c83d7908ada98414c40de98ba177bba3a4cf9a696d93ae SHA512 faa193df18b0b1317500364a2d371c7bcbc56dc7d25bf3e82581f73f63a3cc0f68e1e9944949dc481c145132ee5df31a202ee2ac25676f021c09a702eeb403bb
 MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.2.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.2.ebuild
deleted file mode 100644
index 62a944fda1f1..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="systemd X"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=gnome-base/libgtop-2.28.2:2=
-	>=x11-libs/gtk+-3.12:3[X(+)]
-	>=dev-cpp/gtkmm-3.3.18:3.0
-	>=dev-cpp/glibmm-2.34:2
-	>=dev-libs/libxml2-2.0:2
-	>=gnome-base/librsvg-2.35:2
-	systemd? ( >=sys-apps/systemd-44:0= )
-	X? ( >=x11-libs/libwnck-2.91.0:3 )
-"
-# eautoreconf requires gnome-base/gnome-common
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.41.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# XXX: appdata is deprecated by appstream-glib, upstream must upgrade
-	gnome2_src_configure \
-		$(use_enable systemd) \
-		$(use_enable X wnck) \
-		APPDATA_VALIDATE="$(type -P true)"
-}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 005cbfc76961..0c79626008fe 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-user-docs-3.22.0.tar.xz 14148700 BLAKE2B 5a7d7b36b0854f937cc3389024eb5bf2f068d0d9874449d0589336aef6573fd3d21b1343025de5729483031b716482c485395c803bee352a966d59568e6a0d7c SHA512 d81768b1c2bb5e32fa6d81358dc8fce24d1a6af4a01553c30879a73afb86bde8ece513f5bd08df9fd1bd4e8cc545ee49f2f072391eed13703d804f73c71c696e
 DIST gnome-user-docs-3.24.2.tar.xz 14167700 BLAKE2B deec09954a9c3bf915c86030d13df70efec81090c74744fb98192a1e9727cab2bd54ee608f1f3bddcf8707f6a3a6e1ddaeffdc5175e0d0f2ad4ab2e890036330 SHA512 7725ceb6d079d244f9f764c54b2d374588a808c8f1b2e70f655e1d3e3dc957cab3a8edcfe3d000c5d4520e9d9da031585a20ade978b66753ef3b2c912230a87d
-EBUILD gnome-user-docs-3.22.0.ebuild 936 BLAKE2B 8c38734bfdcd009f20a98bd69bb2b6cefb6345ec1383e47c14d6ce6d24058fd3635df576279877ded14bac4079a57638a72bc06a4ac3187fda2a7159d8eb7994 SHA512 c551a2e2598aad54bb3a6b99c1aceeae23013a432ea5e1d5c3fa0eda39eb53e9177056ba426263b45bd6cc9337cc160046bb74b7eb5b4fd9d4ad07a25bcb787a
 EBUILD gnome-user-docs-3.24.2.ebuild 936 BLAKE2B c73905e25c9a419e3c8999f7a09ae702becd42b1a526d90342bc3b3436e63af99631f00875526940f387a98ed39d42b5383f39a55990bacb313f15113385f5f4 SHA512 1b63ecd8d58c1110c79134c3679a715a3fcb09e075fe045ce512d5a83ad82051d691da674bc7880f5a6ed7a0183957e172ee69764a020d5313061b42ad0c66cb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild
deleted file mode 100644
index 64d032ba5168..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	test? ( dev-libs/libxml2 )
-"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 5f82580fab13..c319c4b148bb 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-weather-3.20.2.tar.xz 5360264 BLAKE2B 3863f105ef2db4d367c9f431a7be447d59d32fd44621e89fe4c83682637da4aa00df7da85e9c28bcb58d20e3a9d3d614f569886ca50d3ed8ff647b42e7430714 SHA512 3c592726949251d4deae6412592975d6439dccf3415df1ac2bff75ee97ef9fb927167ceee0835ef4d1d3205038340c20d9e9b2261205412341baeb4098c9fdff
 DIST gnome-weather-3.24.0.tar.xz 5358924 BLAKE2B 89091c0dd2e69109621450621a03231da9fc6032cfdc44386e632ab3e8e478fc9a02efff86417277fbdbd2c39d730efd76df1a787e14112dd0447b53715b5aff SHA512 c286c97dc1cbb4991e56ed49e8c788c6a58f0f0dcd5534812ee3e06a0570fd1bb0b45f7e35bdc11443f62dc3a2cd262db4f3d2b1f238cfc24236de88de4a4bce
-EBUILD gnome-weather-3.20.2.ebuild 1081 BLAKE2B beb358e0b30eef8bf88d264e81d8d504db0e9b539fe0296beb627cf360efaf7e195cee4f960cfd02da09a4bb17077d43ff090fbfebf769ac61aaa564d145ca3b SHA512 69ef257d0b5329843e87cc09260f25b8b9453c3cff34d83be05aa4799be34f994cef75b7cf974365766d5e0acdaf8c7b0f125d758a0bf7f89da34cdf2a162f3f
 EBUILD gnome-weather-3.24.0.ebuild 1085 BLAKE2B 23e877012247c7bacf65e616bb5ba59ce5eaf1b460b79950f684ca083f0b6af164a39fdba803d3a22bdae898d455cc3618f0ba930e377dfd07633123cd5e6b58 SHA512 1c3bd5d93d8809c2f6322577ff950a4387806880fcc733b927c37deb174a1a45a9b2fb7ab0f68d568df222f077e61e46d0432b404b41c2da57804b1597868d30
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.20.2.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.20.2.ebuild
deleted file mode 100644
index bcd6d19ffa36..000000000000
--- a/gnome-extra/gnome-weather/gnome-weather-3.20.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A weather application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/gjs-1.43.3
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libgweather-3.17.2:=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.11.4:3
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.26
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
-}
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index 698a08e4142d..1fabd78322e8 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,5 +1,3 @@
-DIST zenity-3.22.0.tar.xz 1082088 BLAKE2B ec9d7a82a5086c1eec6fbc278fce6de3fb02e56cab2cf2f75458fe978ef80b110d02872b32716421b69125f0bac3c8abf85ea8cadf68e033d404a0bdbced9702 SHA512 0131e854ffb8093e6c36787ffc831af8d1adbb663931b09b86a477c28c3b456ad2c9bb59cdc00a2d6505a1cf645df6fc9ebdd3c46c1a666c69d607e79b4364a3
 DIST zenity-3.24.0.tar.xz 1085124 BLAKE2B 2be50461c8575b5322319e3b35a9c833ae87f2e35abfdb27bed61dbead1b31dc31d551c8973634a7a0f0abc178ee6c7a4bb24377632df7d7fcaf77780f7fd4d6 SHA512 b24291166221cc2dabeabfeab7ca00ca63ff21c12a4eb327cd35ac43f485b8d4a858dd717df1b35b8bd3fd89d0bb235609855c6d349b76879b0f77b4fedd4dd9
-EBUILD zenity-3.22.0.ebuild 1101 BLAKE2B d2af9709a129354108822ad977eaecb7a282cc25680a91573873d235e389ff74cc8cad1adcf51c2ec94bc6d764228799ee7bcc2fa44dd3f85af73c570317c108 SHA512 6b050763a6e6d06e66000f0d0792735858ffc46739e3dffc534df8213eb03d095a71caf16e3b0c399709c8b6cc67fef1c425eda57081d11dde90bb0dc945ca33
 EBUILD zenity-3.24.0.ebuild 1108 BLAKE2B 32be4a94db30a9b9f4ed49607c096b9375041b360a10972a23b8441b4685082326375b3835cb8321367ddfde751fd2cc6fcebf8e6649618793da946603f35f3b SHA512 dafbd0107b9135b22a575d235dd6921928d2bdbde5dacd500798151255500343892978226b14a4c05359c52a55ed2b2ad67b3d8b948debfa49a06bebeaa3c47c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/zenity/zenity-3.22.0.ebuild b/gnome-extra/zenity/zenity-3.22.0.ebuild
deleted file mode 100644
index fc4fc7f301b8..000000000000
--- a/gnome-extra/zenity/zenity-3.22.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug libnotify webkit"
-
-# TODO: X11 dependency is automagically enabled
-RDEPEND="
-	>=dev-libs/glib-2.8:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3[X]
-	x11-libs/libX11
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
-	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable libnotify) \
-		$(use_enable webkit webkitgtk) \
-		PERL=$(type -P false)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Not really needed and prevent us from needing perl
-	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
-}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 2f9ab6ff8e59..03cf609a0926 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/katepart/Manifest b/kde-apps/katepart/Manifest
deleted file mode 100644
index aa7ab5c9901a..000000000000
--- a/kde-apps/katepart/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kate-4.14.3.tar.xz 2766880 BLAKE2B 8cf5211af315989b73eaa9f25f229105e726ca47d0e40bc3bcd52f61b7d15296b7bf9f1899bc48d7e7af358ad89647ca0d231937c1a2dfb181644f478c039934 SHA512 0d197bb00fb9a56572e140dd3c50338c90a0cb3bb8ebc78cc0e6d6ab04d6c129537a2ab8076ff9b844e159687c0a73cbacbe678e006b2d86b57285068158e38e
-EBUILD katepart-4.14.3.ebuild 372 BLAKE2B 6ec3240e8bf51feb226a0db5df2ccf81f1d789c63d1dcafdd563fb3da03e7b74398e7be3f66f6a6906ec2ddbaf2550440ec46e279a612ed6568af047aa999628 SHA512 6b9f0e56d37fe00ad6834b305f60b1f2176fdc39446dfa3767af80bdc218b4d4eba3d981df7719dd54b409b001274a96dbb950ceb9dfebfcf168a78fa723fc1a
-MISC metadata.xml 245 BLAKE2B 7d8aa6c42d332c65c417fb557b95907322f61713c6ee71b25af3944be1f2c693e2110598f877c28fe2bbef4a9fd064fe97c24a92092599d1c2df69e3e3676a60 SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e
diff --git a/kde-apps/katepart/katepart-4.14.3.ebuild b/kde-apps/katepart/katepart-4.14.3.ebuild
deleted file mode 100644
index bd97a743e789..000000000000
--- a/kde-apps/katepart/katepart-4.14.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kate"
-KMMODULE="part"
-inherit kde4-meta
-
-DESCRIPTION="Editor KPart by KDE"
-HOMEPAGE+=" http://kate-editor.org/about-katepart/"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RESTRICT="test"
-# bug 392993
-
-KMEXTRA="
-	addons/ktexteditor
-"
diff --git a/kde-apps/katepart/metadata.xml b/kde-apps/katepart/metadata.xml
deleted file mode 100644
index 0cf59224b009..000000000000
--- a/kde-apps/katepart/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/kde-apps/kdebase-data/Manifest b/kde-apps/kdebase-data/Manifest
deleted file mode 100644
index d7138a217510..000000000000
--- a/kde-apps/kdebase-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kde-runtime-16.04.3.tar.xz 7903920 BLAKE2B d09512c73dcd830c54678d4c41b6711c72b920af6bb7308e547b2b02fead679ba640372be590821edfad0b632e1e10166bbb041d7de063e4d33f65240d618ea3 SHA512 df52cd4c423030d3457bb907eb0bef0cdd3c8bce283d9f181b7ae6b7b4ce9c59a34f874f9ac6d2bd59597647a3c6315d772b2551c739423378186d4debbb53ae
-EBUILD kdebase-data-16.04.3.ebuild 756 BLAKE2B 38b51b2dcb57be030726a4431aab49e9abdfb605f4b42e902672820cc40fede0c4ee739979ca3c0152fd27fa12ad40dbcf5581dc7232664cac50b588b6a39520 SHA512 fa4af99f7ecf44d393ab13cdc8a5cf1c28d93d341db76b32c65183bd50f7541a986c0fd38ae501af5fa58f8cc57f37dff3f90fb790347e316c6931c8d795157d
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebase-data/kdebase-data-16.04.3.ebuild b/kde-apps/kdebase-data/kdebase-data-16.04.3.ebuild
deleted file mode 100644
index 077c741bc04c..000000000000
--- a/kde-apps/kdebase-data/kdebase-data-16.04.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kde-runtime"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="Icons, localization data and various .desktop files from kdebase"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	x11-themes/hicolor-icon-theme
-"
-
-KMEXTRA="
-	l10n/
-	localization/
-	pics/
-"
-# Note that the eclass doesn't do this for us, because of KMNOMODULE="true".
-KMEXTRACTONLY="
-	config-runtime.h.cmake
-	kde4
-"
-
-src_configure() {
-	# Remove remnants of hicolor-icon-theme
-	sed -e "s:add_subdirectory[[:space:]]*([[:space:]]*hicolor[[:space:]]*):#donotwant:g" \
-		-i pics/CMakeLists.txt \
-		|| die "failed to remove remnants of hicolor-icon-theme"
-
-	kde4-meta_src_configure
-}
diff --git a/kde-apps/konsolepart/Manifest b/kde-apps/konsolepart/Manifest
deleted file mode 100644
index 8cfb684f4cf9..000000000000
--- a/kde-apps/konsolepart/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST konsole-4.14.3.tar.xz 455216 BLAKE2B 755c400a5f3aee83e9e71fd7305c3589ca3a534a82085c114fbc1d3a9c44aef3ce573f0ad359e972a8e82897a1a16133e23b93d8837a5cb73bef7e81d66d33ad SHA512 88a919ea7230ae96518a347b80dbf08d641c60557f24cff02421f22cc99da5b2daf306d8e7b820cd701983fcd3ee46171cc97e231591ad2c334574777fbdb135
-EBUILD konsolepart-4.14.3.ebuild 1227 BLAKE2B 06d06db31f8c1e1fa93b81d36cc7102d3a0aa7bcf0ca37f83f2773e0983833ffb8f7793d3cbeff3b00aa593ea5875a16c2f4f358f0f40e546530665c737c7b70 SHA512 365959446126e43976e52365aa2d1f82d8892502f44d53061e2c1f1b03efe1386129641ae065f25573d57c895709febf103febfdd47a44049ddf234e65b647f2
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
deleted file mode 100644
index 5e62afdfe679..000000000000
--- a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="konsole"
-KDE_HANDBOOK="never"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-base
-
-DESCRIPTION="X terminal kpart for use by konsole and other KDE applications"
-HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-COMMONDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/libxklavier-3.2
-	x11-libs/libXrender
-	x11-libs/libXtst
-"
-DEPEND="${COMMONDEPEND}
-	x11-apps/bdftopcf
-	x11-proto/kbproto
-	x11-proto/renderproto
-"
-RDEPEND="${COMMONDEPEND}
-	!<kde-apps/konsole-4.14.3-r2
-"
-
-# can't connect to a kded instance, fails to connect to dbus
-RESTRICT="test"
-
-S="${WORKDIR}/${KMNAME}-${PV}"
-
-src_prepare() {
-	comment_add_subdirectory doc/manual
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_LibKonq=OFF
-	)
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-
-	rm -r "${ED}"usr/bin || die
-	rm -r "${ED}"usr/share/applications || die
-	rm "${ED}"usr/share/kde4/services/ServiceMenus/konsolehere.desktop || die
-	rm "${ED}"usr/share/kde4/services/ServiceMenus/konsolerun.desktop || die
-}
diff --git a/kde-apps/konsolepart/metadata.xml b/kde-apps/konsolepart/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/kde-apps/konsolepart/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index c66e5d80bf36..af3cd46047a1 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 925ec018972c..a0a50f03fc8b 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,6 +1,5 @@
 AUX kwin-5.10.95-test-optional.patch 1023 BLAKE2B 9e3f9e831a7164ad4041732785f771c4557c65f68dfe8cd5e6dcb55f6f65d5e1d0b220cde0901f56baeb8ffd194c604115f64c6d6496b19be6e9254cf37f567d SHA512 e564dc6c0e28762917713d37aec099d1ff522f64e26aabc906ffbb7dd4056316bbab43b1b3c71e1f55659471e270f17afe8673a76dcd75efa1a5c8e399bdd7f5
 AUX kwin-5.11.5-cmake-3.10.patch 1547 BLAKE2B 581f27ce23adfa92353b61bf0a58e1c945e56e27f3cf5dddc0ab558f8bddc3d81045711c24077f9da2821bfba17d1ca841f3aad9989d55f4211344f28e158983 SHA512 adf58db9d06ebefd66e0af20eee67c11ecb9e6ff8dabd848021bf8587d1e7fa7924561fbed39308c0ab214d5a4c4e130166ad008e8d30590b697cd4fb33454d7
-AUX kwin-5.8.7-glibc-sysmacros.patch 1016 BLAKE2B db65f2af7eb305398649e3f73445a3e658725fca426fa4d3785e3a1aae669005b776499c21237ecfb834e1b4b95664dce754e367452ac33a346084453f7eae1b SHA512 9b8d8754a4e0c8a9421bc7bf04932b5dabfd9c0c7f56fc1ebe6562afcdbb2d3495c009f4cbfa0a8a665e363ffeb9ac9bf3c7a5fbba7f7d1da7571f7cab6908a7
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
 DIST kwin-5.11.5.tar.xz 4965516 BLAKE2B 1e9fcc3c97f1a714925b9f33c5741cffd91ffd080698def2693b94c2b8a07d7526566637aeffdbc54b19136144d29327e5a9dad3165f099e95e79e4bd41262ff SHA512 fb1355a33998c5b5ddb0bac59d65862fecfa8bab8bda234bf60c75800f04fb7b96b8069d3fcdd5f2647c06ca7673ed6ef6b7fa49b160b57dcbcb65dc1a853cd2
 EBUILD kwin-5.11.5.ebuild 2413 BLAKE2B 3cc059fee6f94872050cf63e5d15998de7a25f9b2f22cfe31a11cd8f4b632f43d6b7b77902ed3207620b5755389a102d10902e8b7cf464d7b110f3f718a9c575 SHA512 93e83dfd948e22611a514b084bf964eacdeea645b49330e57df71d522438a4766836e71d60742e53890022d4e5a4cd9b3130fd026c6738a00ea70c0dda3f263a
diff --git a/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch b/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch
deleted file mode 100644
index 61c07feaee35..000000000000
--- a/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 8efef12eeb377e9087551e333d65631968c80e5f
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Sat Jun 10 17:00:25 2017 +0200
-
-    Fix build with future glibc (major/minor macros), BSD compatible
-    
-    Summary:
-    Also adding sys/types.h which is not implicitly included from all over.
-    
-    Thanks-to: [ade] in #kde-devel
-    
-    See also:
-    https://sourceware.org/ml/libc-alpha/2015-11/msg00452.html
-    https://git.reviewboard.kde.org/r/127662/
-    
-    Reviewers: #plasma
-    
-    Subscribers: plasma-devel, kwin, #kwin, adridg
-    
-    Tags: #kwin
-    
-    Differential Revision: https://phabricator.kde.org/D6175
-
-diff --git a/logind.cpp b/logind.cpp
-index fee0f2ff4..bb84af4f9 100644
---- a/logind.cpp
-+++ b/logind.cpp
-@@ -29,6 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include <QDBusMetaType>
- 
- #include <sys/stat.h>
-+#include <sys/types.h>
-+#ifndef major
-+#include <sys/sysmacros.h>
-+#endif
- #include <unistd.h>
- #include "utils.h"
- 
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 05f678347d22..1c126f6314b5 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index d2d8d8062c9d..dbafcf81d9bd 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,11 +1,7 @@
 AUX 3.24.6-DESTDIR-honoring.patch 1948 BLAKE2B a8f90d369e3428c29ce9eaaf7e4043cfdba8bc5bc4160a83a2d53a1a46ced571dd809f59f176927b75dc21728c8bd37e9d9751ecb3b9cae66bebaae37a2efc0d SHA512 251cfc15c6dfc54235560cdf206c93038023f12dd505d94432b2a2a71fc0a119dab4485a05a15b51867028369386d79e08926563adba567ada1e2a0f4ead119d
 AUX 3.24.6-libical3-compat.patch 10788 BLAKE2B 414a007abf354309bf3c29b7df4dcc7c93ca47c4ffa41dc4d311390a64688b86f8f228502efb3b6999e3df0885af30be4b141ed12efb250364cc9c442f711e6e SHA512 02145b859ab4e559728c5437e0d584fb57273264fb812ce4cfe65eb16b4c7c444b1db96c7ad0c9dcb817a7e71928a3dec3583d08cf3d59df2d3d12f310867231
 DIST evolution-3.22.4.tar.xz 12272488 BLAKE2B 7740d1d6e734fb7212d2b36f0a64dca03360ab059f0ca716522312c490f2b071a8fc6b383c98b429a6cb22ea5afec0e7e6c05dcb63b3908053ee891aa4129cdb SHA512 dd73a11d4d7903be6a99bf0d937f5a217a26f0dffb9dc0cea2ca81142d5783c42f889a8b913d565678e9f55b7f2f2a1d42f06c30e3cb004926c19f44dae3b70f
-DIST evolution-3.22.6.tar.xz 12288232 BLAKE2B d9412ee86621fd87bbfdb5799de64a148c766642e62b6781a7a9111819ea9b3cd1aa94d95f71df2e46fdb347aedc8b28488a7ca6f7940f08644b00cdfc9f190d SHA512 c699adae640d05558b583b05eda5c5ad3de99aa1d1bbfa24af6110be41251f715ff4b16ff0efb96c8de7faa8c895d82460b504c2704974d4c9731f1bc3e7739f
-DIST evolution-3.24.5.tar.xz 12140736 BLAKE2B e144307693f6ae1824aafd3444b38e435414aa1e7900b3622b5f36098d1c8d073ff565896bea07ad9eca076482d98c3bcea70e7d08d37c5fdcd68226d8bc4588 SHA512 daba1ebd9407219b3abe959b27adb32eb0038a9c1653c360a19cf28f8849004a8cd4a652562d696045311c13d19030f93d3578e09d06fff01534ada28f883f2c
 DIST evolution-3.24.6.tar.xz 12153692 BLAKE2B ced20d9e08f6b9aac65be6f5ecd5beb861feec40dddc4411b1bdc6519e249de8db8b3319450808d7a31b80386f9830f351b7edacb3c6fcd28fe5fdfe343329f7 SHA512 da5c9062791996735e52575894763597cc957cb17bc0abe46a966f0e3e6706550ce534ae03b2c444d142547119f3a59aec6ee17e0302a002d8437da166ef7178
 EBUILD evolution-3.22.4.ebuild 4086 BLAKE2B 43e3c62a5c89f72a4539e92f4695db1fa8e890d4638c81045bf359f53d64d969fc958e20c1bb47885f4ea77895f651e2d023b613ca8ba2f45914947094531303 SHA512 6b419b6eba9a57551b889ca94fc18770789a24a7e8aeba1aa6c49186aa656b27d3045f571f05781aada1bcb18dfecaeff557fa28404a0e5380cbf1eb7b03e744
-EBUILD evolution-3.22.6.ebuild 4069 BLAKE2B 3b8cbaf03bfbe4883d67ff982481d6abb85f3edab97e9ec3ffee30ea4fe822e5803ac37e28310cb6da6b0a170f6de378a8b44044de254daa1958600c5420e074 SHA512 bf276e7f5c0d6936b5166e739ac7d5b1f3349684cbd940a629baf37b505a78ebbcaa1f79a5eb634db8d903db8e881dcf9f4bd14f94402e3904d3c9f074a6230d
-EBUILD evolution-3.24.5.ebuild 4374 BLAKE2B 9793bdc3cf4eb793a88b42bb3935fc0674182f88d8535c0f631654fb35301a3804654db620cb322cbb1c3d198a31a2d9b227f0626b6827511a37f01e0102d85c SHA512 18020872e0c355671307098d4dc36b2c800a253cbc51392494f9190fe45c4c5d17e4fdb7ccec4a70d1c04e76b1822d9d4897a02fbc7b33d4784540460012160b
 EBUILD evolution-3.24.6.ebuild 4536 BLAKE2B 6a533b93d2a912fb5b78a5e52f25b76625fd4ba78eacf6d73db7ba9a20ef98961714ea344a5d6dd38ae06ad69697ec388dce3b8fb92dd8c8e3aff04b586982fe SHA512 5bf391f8ddbc6dc82585224f9b5ff2c7f61a7892f2f42ac7f40124f61a64c01b5952a3441ce0d8b7462b14bb984fc4b72e461aeb4ad1b3fb3b7f13fc026dd3a3
 MISC metadata.xml 1205 BLAKE2B 66e8fe4cec38cecf66a4a781c5d3498d8f11d72f1298a1df615a1b178b53cfd435bbbbcfbb6805662027be17be00082f429cc1e3c93fd5ce54cd2b88c873df8c SHA512 8713d5f9cbc7efdc7245cb7b18d30132c96095e396a1c8559e8f942c87157b6b5f3de03daade3b6d2ad9fc53067bc938b7af4369beeec70ca01291c198e438bd
diff --git a/mail-client/evolution/evolution-3.22.6.ebuild b/mail-client/evolution/evolution-3.22.6.ebuild
deleted file mode 100644
index a4d426c68304..000000000000
--- a/mail-client/evolution/evolution-3.22.6.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-
-IUSE="archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather"
-
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 x86"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitely needed for backup plugin
-# gnome-desktop support is optional with --enable-gnome-desktop
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.4:=[gtk]
-	>=app-text/enchant-1.1.7
-	>=dev-libs/glib-2.46:2[dbus]
-	>=dev-libs/libxml2-2.7.3:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/libsoup-2.42:2.4
-	>=net-libs/webkit-gtk-2.13.90:4
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=x11-libs/gtk+-3.10:3
-	>=x11-libs/libnotify-0.7:=
-	>=x11-misc/shared-mime-info-0.22
-
-	>=app-text/iso-codes-0.49
-	dev-libs/atk
-	gnome-base/dconf
-	dev-libs/libical:=
-	x11-libs/libSM
-	x11-libs/libICE
-
-	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
-	crypt? (
-		>=app-crypt/gnupg-1.4
-		${PINENTRY_DEPEND}
-		x11-libs/libcryptui )
-	geolocation? (
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.10.0
-		x11-libs/mx:1.0 )
-	ldap? ( >=net-nds/openldap-2:= )
-	spell? ( app-text/gtkspell:3 )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.0
-	>=gnome-base/gnome-common-2.12
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
-	!gnome-extra/evolution-exchange
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	gnome2_src_configure \
-		--without-glade-catalog \
-		--disable-code-coverage \
-		--disable-installed-tests \
-		--disable-pst-import \
-		--enable-canberra \
-		$(use_enable archive autoar) \
-		$(use_enable crypt libcryptui) \
-		$(use_enable highlight text-highlight) \
-		$(use_enable geolocation contact-maps) \
-		$(use_enable spell gtkspell) \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_with bogofilter) \
-		$(use_with ldap openldap) \
-		$(use_with spamassassin) \
-		$(usex ssl --enable-nss=yes "--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes") \
-		$(use_enable weather)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Problems with prelink:
-	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
-	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
-	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
-	doenvd "${T}"/99${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/evolution-3.24.5.ebuild b/mail-client/evolution/evolution-3.24.5.ebuild
deleted file mode 100644
index bc07cd120c04..000000000000
--- a/mail-client/evolution/evolution-3.24.5.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-
-IUSE="archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitely needed for backup plugin
-# gnome-desktop support is optional with --enable-gnome-desktop
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.4:=[gtk]
-	>=app-text/enchant-1.1.7
-	>=dev-libs/glib-2.46:2[dbus]
-	>=dev-libs/libxml2-2.7.3:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/libsoup-2.42:2.4
-	>=net-libs/webkit-gtk-2.13.90:4
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=x11-libs/gtk+-3.10:3
-	>=x11-libs/libnotify-0.7:=
-	>=x11-misc/shared-mime-info-0.22
-
-	>=app-text/iso-codes-0.49
-	dev-libs/atk
-	gnome-base/dconf
-	dev-libs/libical:=
-	x11-libs/libSM
-	x11-libs/libICE
-
-	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
-	crypt? (
-		>=app-crypt/gnupg-1.4
-		${PINENTRY_DEPEND}
-		x11-libs/libcryptui )
-	geolocation? (
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.10.0
-		x11-libs/mx:1.0 )
-	ldap? ( >=net-nds/openldap-2:= )
-	spell? ( app-text/gtkspell:3 )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
-	!gnome-extra/evolution-exchange
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-src_prepare() {
-	# Leave post-install actions to eclass
-	sed -e "s;\(find_program(GTK_UPDATE_ICON_CACHE\).*;\1 $(type -P true));" \
-		-i "${S}"/cmake/modules/IconCache.cmake || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	local mycmakeargs=(
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_GTK_DOC=OFF
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DENABLE_SMIME=$(usex ssl)
-		-DENABLE_GNOME_DESKTOP=ON
-		-DENABLE_CANBERRA=ON
-		-DENABLE_AUTOAR=$(usex archive)
-		-DWITH_HELP=ON
-		-DENABLE_LIBCRYPTUI=$(usex crypt)
-		-DENABLE_YTNEF=OFF
-		-DWITH_BOGOFILTER=$(usex bogofilter)
-		-DWITH_SPAMASSASSIN=$(usex spamassassin)
-		-DENABLE_GTKSPELL=$(usex spell)
-		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_CONTACT_MAPS=$(usex geolocation)
-		-DENABLE_PST_IMPORT=OFF
-		-DWITH_GLADE_CATALOG=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Problems with prelink:
-	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
-	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
-	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
-	doenvd "${T}"/99${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index f1aa16d6a3f2..903490ee20b0 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,8 +1,3 @@
-AUX geary-0.5.3-vapigen.patch 1210 BLAKE2B 7bc7d864a78af7605495c489735b7b23282dc46cd7d6c561481007adb1470f08b590ec5fe249bac33012d470dfd50d6ba5523ee023903d874215f94e35812d6d SHA512 16cb96080230390aa645faeae015cb996c6f48822c817b5540e65eea83a40738f18e5690b54140646800e494f1dd58b862708efe9566ef076ae51fb5dba5ac3f
-AUX geary-0.6.0-desktopfile.patch 291 BLAKE2B c6d62351f4e93dd3be061c53d28a70cdc865c7b4d64ca07757914be081f6f887d43ab7abb9452c56b440c3379bc0df2149fe0e6f40d9ffda7ddf88a87b65b54c SHA512 d7454a32822e2b19878bede717e707373646dc87ba5ed2fb0c972607f907b1ae57fecc7803e4eefeed1921fae3733fe73f593b6c0afec46e7da7efe561878b7c
-AUX geary-0.7.2-cflags.patch 659 BLAKE2B 09f34b7e3afc9edb9d11bb0d83671cf635a19976cf8315ee508743e72e836feb90d912803527e05b5b4c933fe4039bc1a055e6620c4465615e8404171eccf2e4 SHA512 b227930bc9977f126d15f78fcc1ce77bec4b7155e5b6af87af14bf3fb09f7f00c01ad9d860475ac56b1227b554deac0e8da41f3911ff06f1e54c46ae2d740ff7
-DIST geary-0.11.3.tar.xz 964024 BLAKE2B daf30b11f045741b4f5ec00d245afdcc04763f25526f3c5d12b0408fec9b0ce96a5ef53f01b622b4aed4bb43e879903385a545430d1e0e1bca14a80bce159f8b SHA512 dee389384b6bab25f939f0f40525670c27e3687cdfdfbc0c5632ccb2e9e189be3902aedb4fb37affb67c8b149e40ff78e41efbf8a754d76dcd405c8295be0d4b
 DIST geary-0.12.0.tar.xz 1064064 BLAKE2B c4021a784f7704494dfcf9013e4b108d9f921d553e47f55878de30c9878852ac2c023e679c33660cfe2fb190fac56dea4976eccb15bc1a512914442564a24e48 SHA512 caaf49065181f84234bbdb3dc20808f68cb7339e7ef3e992bd83789d3a474b5f59a210d54db2b4fe5f44539a2d52ad7f328087580748c74a513cca7be31c2e52
-EBUILD geary-0.11.3.ebuild 1892 BLAKE2B 6705d7e5003647847799bf56a73cca2de0ec3be6de6789cbbaae9e8cf20fe54d8d1be85aba2a6ff43bf990fadd0fa8cc0b10ef8d2d33ba94f7c50a7f9c013de3 SHA512 3693ccd3b21d527f76f440dc546fab9e04b0e3b444816fa39ff73ae170b6dc6ba127894d4c07998f140cad442a3a54390eaec1220fc3d2aeb356d36d7c768c05
 EBUILD geary-0.12.0.ebuild 1696 BLAKE2B e09db7ec9f677f5cd287be3a5a14852e443db1679c29e32c88cd72efefa911978e22fd4fd23c2c09dad6947746b4e2799eb2ec0d1b41094ec3cd091dd9c775cd SHA512 c70ced94dd34b205bf1ecd86b642856582cb4c44a14bfb83d316e1c816f520e5fdd4929afc14a23a1e08d982b2e6f52286f8be1c1da8b53a78372377adb17011
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/mail-client/geary/files/geary-0.5.3-vapigen.patch b/mail-client/geary/files/geary-0.5.3-vapigen.patch
deleted file mode 100644
index 18b3c8049b4b..000000000000
--- a/mail-client/geary/files/geary-0.5.3-vapigen.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Feb  2 00:17:18 UTC 2014
-Subject: gentoo specific
-
---- geary-0.5.1.tar.xz/src/CMakeLists.txt
-+++ geary-0.5.1.tar.xz/src/CMakeLists.txt
-@@ -399,12 +399,7 @@
- include(ValaPrecompile)
- 
- # Vapigen
--find_program(VAPIGEN vapigen)
--if (VAPIGEN STREQUAL "VAPIGEN-NOTFOUND")
--    message(FATAL_ERROR "vapigen must be installed to build Geary.")
--else ()
--    message(STATUS "Found vapigen: " ${VAPIGEN})
--endif ()
-+set(VAPIGEN $ENV{VAPIGEN})
- 
- # Packages
- if (LIBMESSAGINGMENU_FOUND)
-@@ -615,7 +610,7 @@
-     WORKING_DIRECTORY
-         ${CMAKE_SOURCE_DIR}/bindings/metadata
-     COMMAND
--        vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
-+	$ENV{VAPIGEN} --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
- )
- 
- # Geary client app
diff --git a/mail-client/geary/files/geary-0.6.0-desktopfile.patch b/mail-client/geary/files/geary-0.6.0-desktopfile.patch
deleted file mode 100644
index 3ba892f0bb3d..000000000000
--- a/mail-client/geary/files/geary-0.6.0-desktopfile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Mar 23 22:56:46 UTC 2014
-Subject: fix desktop file
-
---- a/desktop/geary.desktop.in
-+++ b/desktop/geary.desktop.in
-@@ -17,5 +17,3 @@
- [Desktop Action Compose]
- _Name=Compose Message
- Exec=geary mailto:
--OnlyShowIn=X-Messaging Menu;Unity;
--
diff --git a/mail-client/geary/files/geary-0.7.2-cflags.patch b/mail-client/geary/files/geary-0.7.2-cflags.patch
deleted file mode 100644
index 959ae4b1f34d..000000000000
--- a/mail-client/geary/files/geary-0.7.2-cflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit e41cf68206eb16be678eeaa1dc998d94d2f93d57
-Author: hasufell <hasufell@gentoo.org>
-Date:   Tue Aug 27 01:40:58 2013 +0200
-
-    respect system CFLAGS
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5202b99..949d494 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -471,16 +471,8 @@ set(CFLAGS
-     -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"
-     -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\"
-     -DGCR_API_SUBJECT_TO_CHANGE
--    -g
- )
- 
--if (NOT DEBUG)
--    set(CFLAGS
--        ${CFLAGS}
--        -O2
--    )    
--endif ()
--
- if (REF_TRACKING)
-     message(STATUS "Reference tracking: ON")
-     set(EXTRA_VALA_OPTIONS
diff --git a/mail-client/geary/geary-0.11.3.ebuild b/mail-client/geary/geary-0.11.3.ebuild
deleted file mode 100644
index 3a15736c9595..000000000000
--- a/mail-client/geary/geary-0.11.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# Keep cmake-utils at the end
-inherit gnome2 vala cmake-utils
-
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DEPEND="
-	>=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
-	app-crypt/libsecret
-	dev-db/sqlite:3
-	dev-libs/glib:2[dbus]
-	>=dev-libs/libgee-0.8.5:0.8=
-	dev-libs/libxml2:2
-	dev-libs/gmime:2.6
-	media-libs/libcanberra
-	>=net-libs/webkit-gtk-1.10.0:3=[introspection]
-	>=x11-libs/gtk+-3.10.0:3[introspection]
-	x11-libs/libnotify
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	nls? ( virtual/libintl )
-"
-DEPEND="${DEPEND}
-	app-text/gnome-doc-utils
-	dev-util/desktop-file-utils
-	nls? ( sys-devel/gettext )
-	$(vala_depend)
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751556
-	# https://bugzilla.gnome.org/show_bug.cgi?id=772879 (recheck in
-	# 0.12)
-	eapply "${FILESDIR}"/${PN}-0.7.2-cflags.patch
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751557
-	eapply "${FILESDIR}"/${PN}-0.5.3-vapigen.patch
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751558
-	eapply "${FILESDIR}"/${PN}-0.6.0-desktopfile.patch
-
-	local i
-	if use nls ; then
-		if [[ -n "${LINGUAS+x}" ]] ; then
-			for i in $(cd po ; echo *.po) ; do
-				if ! has ${i%.po} ${LINGUAS} ; then
-					sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
-				fi
-			done
-		fi
-	else
-		sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die
-	fi
-
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDESKTOP_UPDATE=OFF
-		-DNO_FATAL_WARNINGS=ON
-		-DGSETTINGS_COMPILE=OFF
-		-DICON_UPDATE=OFF
-		-DVALA_EXECUTABLE="${VALAC}"
-		-DWITH_UNITY=OFF
-		-DDESKTOP_VALIDATE=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 5496406b67d0..7ddb80283a41 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 0fecd1b1423e..2477f3ddbb43 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,3 @@
-DIST eog-3.20.5.tar.xz 4622880 BLAKE2B c70e9bd8c93b3443910803b6c65d49ac3e4cc67767cc7cf1632034294ecb3be5a983c8fa58583d3438cd894dbe2132c5794cbfb2d47f51c0c3c0732a8e0e3bb2 SHA512 b4256cfe5f42921efd58d7ce09fa2a82d0328e1fe4cd94e953cc161c23b5079d05b89106ec78c670079d0b6ff0f31eeff25d67c259a600dbb4a0afe25b5d93a1
 DIST eog-3.24.1.tar.xz 4632496 BLAKE2B 24d6957285d5dae7fa2299165b1bac236e75dfa77938132c1d3f8f7312ed4a07d5d3a770fdbdbcf5ee1966a43b4443d331fbedec47575836e2170fa3022e657f SHA512 c007b6f2cd2b59747db72a5b86ecb34ac87fe0910a2d33df466eb05ebe5ff638fb9e57b15f2ea9328c95037334a2fd9010895241ff285628b7ed7b6d65912fb0
-EBUILD eog-3.20.5.ebuild 1344 BLAKE2B 30b10f0b5059ec6c6d5a6f13b53cf9ab6b9cb116ff7507ad5d5aef71cd7cd70827ea29c14043abedbec9e858fcd62722e6326894158d9cbdb3fdea591a1931fe SHA512 78730d2cc6f2edfff39ec0b1ad20acaedd9e0b01f4da4834f6ce554570e716af4e8e184f13432ded774dad0e654e2710e59a2d91e4a784d1edb4f429dad80552
 EBUILD eog-3.24.1.ebuild 1343 BLAKE2B 63fa0d9614a37e9f3d40b2de61560a7642df4b14bb8196ff6de563b6afb5d0195f0832c27d41516659efbacadc977876b2ec09d736434d3026ddee8d913da0c2 SHA512 460f0f6c1e435cd970b0a67197d1885137c69d673eecd0e00dd5e7f9ebb8d52b2d22771b234786d3c31d175fcc24aad72314d0f0b14b11eea921b814fc725c50
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.20.5.ebuild b/media-gfx/eog/eog-3.20.5.ebuild
deleted file mode 100644
index 24b66cdb2308..000000000000
--- a/media-gfx/eog/eog-3.20.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
-
-LICENSE="GPL-2+"
-SLOT="1"
-
-IUSE="debug +exif +introspection +jpeg lcms +svg tiff xmp"
-REQUIRED_USE="exif? ( jpeg )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.42.0:2[dbus]
-	>=dev-libs/libpeas-0.7.4:=[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-libs/gtk+-3.19.11:3[introspection,X]
-	>=x11-misc/shared-mime-info-0.20
-
-	>=x11-libs/gdk-pixbuf-2.30.0:2[jpeg?,tiff?]
-	x11-libs/libX11
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( media-libs/exempi:2 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.16
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif libexif) \
-		$(use_with lcms cms) \
-		$(use_with xmp) \
-		$(use_with svg librsvg)
-}
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index a04984ecc653..3aff301b0e62 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -5,6 +5,7 @@ DIST feh-2.20.tar.bz2 2129466 BLAKE2B 4b0ff29b8c5859f18f01337409290e85f46dd7f924
 DIST feh-2.21.tar.bz2 2129718 BLAKE2B 6d0e60ba5f51aef6dec6df59ce3cff24f9947e2359e839f8f3c49dadc51ee6dae15db8fbfd60e63a0bdf6df4482f88c8b3bb4d5a8a37725ca0b07030251eb1ac SHA512 f869d6588976973fca55714829478293bbd89fe03c7575c48847d23caec09353dc54eddf6fa41dc7f560c92eaee49ee23008258d72f4d55a49a5166625560a43
 DIST feh-2.22.2.tar.bz2 2129840 BLAKE2B a770c535746f7e9c2163cedc1a540c7a2c691c94d6ac77f70e4054aff42eef2d45bf870cdbcf7997872fb399e5b0e0d9e74971a872ae6714521c7f59e72a5ed2 SHA512 85c5f779fecb2be7457fed0675f25860ed4f41db9ecd1fdb8d4b1e553a7a337d5af243aafbd3fae4ac42fc943d207a264756d92cd15c62e95cec1f28fde46219
 DIST feh-2.22.tar.bz2 2129914 BLAKE2B 592b26a4874bbaebe4826b53c6957ee25a95baca19da3ddeeafba81627538d53dcfbe9f54c932e1319fc9160680caf599e965976e733a7d07fa0dc0bd046ba3a SHA512 403b1e760e2b3e177768b47de5bb7bd45c11152f04a21f6788afcaec12357a085f7c9944000f78a8df41a3d60a67985622d36effd543216153ab04e539b5b85f
+DIST feh-2.23.1.tar.bz2 2130373 BLAKE2B 5233cfbad018b9fd07a983d1956683ffc188ffe57e27123f82e8ea74cb9ff2df674b2178ba298b898913d0c6f902fc5c520460f4f333f9ac5b1f089f11fcd271 SHA512 dda2fa0905dab9ea8d607224d75bda008638da35c5ee181f4b37ccbc9a76cd65269d5ab052fff77628afd7b8041654362f47ec5e8db569677cdbb19b87745614
 DIST feh-2.23.tar.bz2 2130344 BLAKE2B 730670fa38b909c26412b24d076732c9f8ec0a91c52e836dfd9a764fed35489085537073ece869e664cd8baeb1ee2fff47cc0bc69a6138e641b0a6a2be57331c SHA512 4b75f0053c3a4b1fb51251536896fd48470117ca3d59de1ac5a87f8071f37f886542e7d82730eec4579a1ebf507e4bc8a00fc45cf1364d2445b1aa82c5664ee7
 EBUILD feh-2.18.3.ebuild 1191 BLAKE2B 65a725d14fe77144ff3cc9c545e46b3a7a8df4ec71c981422a8029f9e7f61a83629a11ce687fc0d98045e935521dd59677be43b8649231c16008c11ca604028c SHA512 cfdb2067a02a31747129abe3833a2999c15e02abbabb7a389380b6351f0d87aaa0b74b29e4253a33dcf12ede43f8964fb5b099a80c438cbe7523e91de45b172a
 EBUILD feh-2.19.3.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
@@ -12,5 +13,6 @@ EBUILD feh-2.20.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d82461833
 EBUILD feh-2.21.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
 EBUILD feh-2.22.2.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
 EBUILD feh-2.22.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
+EBUILD feh-2.23.1.ebuild 1195 BLAKE2B 538e485f0814564a45e6af555ae6b0437ec3ab5c03b28b393eadad8a3af5fea0b18ba81e7576a34680db9a99a56d43a44a2e936b55e95730350da3bc99c5c4cd SHA512 2919509a7c8ca99f4d0fbdcdbeb817a01877b07b0352f1a336b6e2c53932d0aa037a3eedf154ba1850d02fa3cf14ad7bfcaf59a4590ef888839dd5b28136e0cc
 EBUILD feh-2.23.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
 MISC metadata.xml 465 BLAKE2B 8f1b9aeb152fc8941e9cf72cf562b46d4b7b93677713b99cc7ba01cffba527cfc818e5b0dfb8d5d3878dd31f2488277036f876c01d2d85a5422b285275819eb3 SHA512 7156b24a140c6b586af743cc670b588eaba3c255fd356f689c26c737195ebcb9d36bcf7cc6291c668d8ae6a4da3d4914a0830d80d86e3831e966bc38708607c8
diff --git a/media-gfx/feh/feh-2.23.1.ebuild b/media-gfx/feh/feh-2.23.1.ebuild
new file mode 100644
index 000000000000..97faff3af810
--- /dev/null
+++ b/media-gfx/feh/feh-2.23.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXt
+	x11-proto/xproto
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 1e6a5a9476e6..3e111fffc196 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -11,7 +11,7 @@ AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f0
 AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
-EBUILD gimp-2.8.22-r1.ebuild 5182 BLAKE2B 704517425aff464a288684914df254eeac81ea06c8ec5ef7919371b0a10572f8746acf1099e01734fc394e72bf9349899f7b496a431c8df3456aa3764e0ef375 SHA512 3f47849a5b72548b9e547fa4066603c607e10743463e84c06ac1e5735f8fc2d2779c775f98a193d7b3d1eaba937b47ee78707aba787cbee6d8954d8bbbf5d9c3
+EBUILD gimp-2.8.22-r1.ebuild 5181 BLAKE2B 3173e56c35d450f388da9330cc5bea95cbfa2adc26594f8e4c5f92c01b5e658c63b852fe4c52439cb110c42634e0bad37dc07e81f9105b4c50ece2efcdc0fcad SHA512 a4b7dd45bbe6e21179d08ed97a83b9a9e72e53534a8221b0c37195efd676950ffffbe4c78079209517a635cb3b05cacfe9d4fad43f71c4644f367ef47d963db3
 EBUILD gimp-2.8.22.ebuild 4739 BLAKE2B 1f9f5b643fa9c061a1b8bb982df80261c481b362ea7140f4f6921419fa6fa23487df7547976dfbdae9a61eed461199ed0059ab68ce6748f1169b637750638dd4 SHA512 6c6e4c124eb106a22d6a3149e190cb0e3acaad34948e46c3de6be581641667e5841e844f3f79ecd05d67706de5a96d33b098baf8ca9066040200288e3d627e9d
 EBUILD gimp-2.9.8-r1.ebuild 5766 BLAKE2B f526bca4ce58c5ee9e1e5f4015a0a7894c36357005294058163715f9b9ffc1d6eb0db0afcb2c2ff20c8ca488f99a80d8cc82cc31f744580df2e55b7e02820f65 SHA512 4c51668d0dcb82af5e4ef2811504fc744e5be32901c6a40abe706833a4cd5a1623019a8c1eac7fee682fd62c90f7eb879abed5558f6011769b698fb1bbdf8305
 EBUILD gimp-9999.ebuild 5375 BLAKE2B 1a33e0b4106e98872afaf1c664b72a8b88c813575121d1538fd63fa3b52b6915868f1b432d85e51cf0800bc12aff6adaa8ad84015015e25616ef325703faeace SHA512 b9c0c738acebae699385af18cfdfd9f200a616cb48e565b40768f96d5bbce80914a81a1066de5116ba750d46a2ad3c3b51dc04604dd8e3eaf77aab3084dfd2e5
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
index a8ea175628a9..1a3fccc66aea 100644
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 55d267ebd0e9..e98f2e28fc2f 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-font-viewer-3.22.0.tar.xz 320680 BLAKE2B d1324c1316d1f43727a5fd38164a9f114d84f20bb73207adf4e6799dbde52cd8151d246f0452334bc1211c11d944b1471ba3b1e10031ee2e55855bcb74a4721b SHA512 deea5dce759fa7134701f5edddf4838a0221ef776777fabd071982fddc8d3a6c535a55035d4457d262db54760c3616335d9ef89e29f846a648c1d9d522018978
 DIST gnome-font-viewer-3.24.0.tar.xz 321600 BLAKE2B 85fbd170ccf3b9464f51b6c6d556fa8d9fce155581b37d2db0ff37abb703b4fefad3b2f5db7ed09edd033bc36aacd4a574b84fefdac4cb516c43f1255d9c0d8a SHA512 b951e98161dde808aaea0666c0266a3381c82a264dc7280fcd4e4debcf07bd44c940e738a2dd5134276625e404f87323f57930764ed2faeedad831ba6a8bb591
-EBUILD gnome-font-viewer-3.22.0.ebuild 603 BLAKE2B bd5ec7cd690de2baa911ca8f78719ec0146d4f53d730ff24a41a4c08e00e1fcd2c0110f81be6b9b1c94aa7843a1b5098f9e185dbf773973cedf1f7ce3e5a6284 SHA512 0f831db3a3dff5c49953f884bdb073a5b61636b3252c6600b9c0281426c3c5b3267155118595a286cfdd71565e89f609761debf4fc5dd37d144b5f7b1326620c
 EBUILD gnome-font-viewer-3.24.0.ebuild 603 BLAKE2B 2559d1e1155e5f877fbf7b74d662879b3deb7f4ffb65e58f214c86b8f62bba7537cfcb02e36e4974b88d56f249dcb7bb837ecad3b86a7708af874119fc85c7a4 SHA512 fed65120155408b85413622b6bdd607e0806cc32a2b769964119da41625a2c928a0f212ddf8738207e8e5b6a9541f167ae95606c4cf41b6d10a33161b88a1d77
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.22.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.22.0.ebuild
deleted file mode 100644
index 9b22738513c7..000000000000
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.22.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Font viewer for GNOME"
-HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.35.1:2
-	gnome-base/gnome-desktop:3=
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.9
-	>=x11-libs/gtk+-3.20:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index e747379e857c..09def641b932 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-photos-3.22.6.tar.xz 962468 BLAKE2B ceb0e54801f42a681b26e95d670a7fbb0f62d9965e38452f8d5aab045c85bb0ee57558e90caa6a8090f978c5a02b6f327692460dfe5de92bf88079dd86fc8ba9 SHA512 4fb2a67b5acdbd63cf6f252d0116a4b759e0e6daae48d638ce96ec35f24deee44720c45cb0720a26b6a380e66bbde1619173de340375828bc2f4ef943606fe26
 DIST gnome-photos-3.24.5.tar.xz 985864 BLAKE2B d5e7dd48a6f81c9ca6efa7dcb2b17fdeb781070d1789514098b8cf30bcd12eba145e57e584f42f66286579ad40ef31f370c471abaab30ba684bada9878afc3c4 SHA512 8dcdb9962a55d6e2e9aa28ef86dcc9100f80fa9739763cea1475052379050a23428e09e8416ed75b9a9b1c85a9bc27d94a75faeefde3d546195c21f04f85379d
-EBUILD gnome-photos-3.22.6.ebuild 1735 BLAKE2B 95e990724288f0fe43926fd43431f860f3cad59ad28d3e6812c5c86a6d1e35bce895113243a708a536c49eef31c753be761904975f1a93b30b6340d36355dcaf SHA512 fe73b9b9a9cf368b41a06c8f4a33625a5684c9e41b376145c55aa51e990be34e8ef5066017d4d38ce7e0666fe587b3d90ec340f73837a6e0703978e94ff1a34a
 EBUILD gnome-photos-3.24.5.ebuild 1776 BLAKE2B c4868a2dfe4d4dbbfa7a396ffaf2667844ac63f767162fa4fff975de27aa81cb86b3736f0b9461663a8a311e5e5f9fcce28934cf9e4da9fc8b74f2025810e2c8 SHA512 469751ff495f9a15ada2a680cc6191e5aef9a5e51770075a69578dfbfb1253a2d7e04e0cb5da850f0968e8d3224686f5f354683cd7718262f6f3b3caaee1bc24
 MISC metadata.xml 320 BLAKE2B b66fb85cefaafccf9575d4f85c017cc07cb55b75d377e8a95bf482b6cb7817f902c5fd3987e08c3d77b604f10710cb6f9820f5e4451e402b186e7714444abf4a SHA512 86c99b12ed97b3f09e9469dcb093e18f844f5b3efb3a3169e62e10fe446075c7839ba7ca00e3537744d3c839522cf5ed2ee33215cd5988466e35d0f4dd739b11
diff --git a/media-gfx/gnome-photos/gnome-photos-3.22.6.ebuild b/media-gfx/gnome-photos/gnome-photos-3.22.6.ebuild
deleted file mode 100644
index 5a11fd322e72..000000000000
--- a/media-gfx/gnome-photos/gnome-photos-3.22.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Access, organize and share your photos on GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flickr test upnp-av"
-
-COMMON_DEPEND="
-	>=app-misc/tracker-1:=[miner-fs]
-	>=dev-libs/glib-2.44:2
-	gnome-base/gnome-desktop:3=
-	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
-	media-libs/babl
-	>=media-libs/gegl-0.3.5:0.3[cairo,jpeg2k,raw]
-	media-libs/gexiv2
-	>=media-libs/grilo-0.3.0:0.3=
-	>=media-libs/libpng-1.6:0=
-	>=net-libs/gnome-online-accounts-3.8:=
-	>=net-libs/libgfbgraph-0.2.1:0.2
-	>=x11-libs/cairo-1.14
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.19.1:3
-"
-# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
-# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
-# so don't pull it always, but only if either USE flag is enabled
-RDEPEND="${COMMON_DEPEND}
-	net-misc/gnome-online-miners[flickr?]
-	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# XXX: how to deal with rdtscp support, x86intrin
-	gnome2_src_configure \
-		$(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 1f7674e36235..fac6e00c9f00 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,8 +1,8 @@
 DIST hugin-2016.2.0.tar.bz2 10386216 BLAKE2B 8437a360880903fac33be7dc12fcdff7fbd16b15153de32e127bdc2b5fe5a47e9ebefe8bc4fb088ba2b818743b8bee9348560aaeb53781bfd0eeb57ec1adbe0b SHA512 9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510
 DIST hugin-2017.0.tar.bz2 9803272 BLAKE2B fa7475347f6b1b561132d5370172fee410afd4f8b15c2c5d7d356023716d15cdcc5ecb8a13d743ce13f3c15ebb7f4b42f0e9653b9f94e752d5e6dea3ecef05b7 SHA512 bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969
-DIST hugin-2018.0rc2.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
+DIST hugin-2018.0.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
 EBUILD hugin-2016.2.0.ebuild 1953 BLAKE2B 86adc5c3744ec3f8ceb7a66747b3adb8143c00a5da07d6eb7935ba545d124e7dcbc7ad9d216188f280b84ec130c82510e4c33c215efe03f5431b0df9758b1a2a SHA512 3ac14ba4ce23e0081be124aeb750fcbd61f6e66f3a510680bee999a73e2d1d6a4ce96cb0f5acd1ce930583c3f295ea241d018731255c22d8ac8f8d5d10eda539
 EBUILD hugin-2017.0.ebuild 1929 BLAKE2B 6403a6bdd33ee0ccefecac86eeba844f71f22f4eead5872a0499c015e71acc95c916d062d473d78f1923952ab927ff9af3a1f4f4564c006f7cdb1e30bd2368db SHA512 2c4769e87d57cb9c7f4a287384ae7468a60985488882d9f882a71457b4ef898646206562466eed6485b379a747f460ee7828dfaee5a3acadf1912fd8c83e3258
-EBUILD hugin-2018.0_rc2.ebuild 1973 BLAKE2B eb8148bea08769a3991bbddca21fd5154a03503d06dfd60e8ef15c2f0a60d975e34ea06aa2dab01a9aa52603fe696a9c3f86cc7b731c212cbee3e444c6e72725 SHA512 d947ca49bf2d0b203ebbf39df1c19c7e193e624ed73729c9d6ffe02a3f57abdcf568ecfdbd2d7b6d638cce50cedcc14ceab9969ead1e4ec2772220adda867713
+EBUILD hugin-2018.0.ebuild 1973 BLAKE2B eb8148bea08769a3991bbddca21fd5154a03503d06dfd60e8ef15c2f0a60d975e34ea06aa2dab01a9aa52603fe696a9c3f86cc7b731c212cbee3e444c6e72725 SHA512 d947ca49bf2d0b203ebbf39df1c19c7e193e624ed73729c9d6ffe02a3f57abdcf568ecfdbd2d7b6d638cce50cedcc14ceab9969ead1e4ec2772220adda867713
 EBUILD hugin-9999.ebuild 1984 BLAKE2B e7a4f4e7a7531b9b766bb7ade9087b11a74e9022a0b9d6aeea41c131d70ee2d2d6869b71e91c14403e5076071ba94afe7c888560a9f9b08d78cf7b18256647e6 SHA512 0b186e5a80fa23b4cf34a1438eacc9b01c22941d0305df391ac3188814cefcf36ac01ecda00707b590e520565127e99fe0f8d7e1e344e267dca912d599122209
 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/hugin-2018.0_rc2.ebuild b/media-gfx/hugin/hugin-2018.0.ebuild
index 33d44b9ffacf..33d44b9ffacf 100644
--- a/media-gfx/hugin/hugin-2018.0_rc2.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.ebuild
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index ee378fdcb792..f6bf69efdc45 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,6 +1,8 @@
 AUX kxstitch-2.0.0-imagemagick-7.patch 3642 BLAKE2B ba3de142cb1dae23a31b9125cbd1da736d30ffd804cd8f68b1f9179a35ebf167e898eeafd73943f062aeac12bae3aa2ec8531a423f22a8d959d8bd65e1cc6ea6 SHA512 f47a5872e2d5da00db3f3f0dd37ce567f7001073b9f273973d4b2ce615e18d8f306dcc4dd38185d65b1b065a569f376bfb3e49e977cc9d72da253268405ec2b8
 DIST kxstitch-2.0.0.tar.xz 1681648 BLAKE2B 669eda3060244636b4ad8bb6e7e7899eb183d7a0f3b264bc40c3bda7146be2a6e10b165165889b7d0043dc5921ff8153775dfa5436546e3cd7be99a4cc144434 SHA512 0ce9ec517659fd9a3163671cdb32d451487aa812355c9abb38cf143192ed49e3e32afc003a0064e9a63303b5de40d8859f92066d886dc06c6d1fe03c8790122f
 DIST kxstitch-2.1.0.tar.xz 1727616 BLAKE2B 34e362b37ef94ed9657254fc4887eb77b0937c4ebdc2b76b09ae9ebbbe6dc490fdafa4c189a87177c26bc1d24fa0b150436a547c3b82dbf74b269fd87f674928 SHA512 c31b8f4c33a86967b02ad2d6c9be84931e607644c8683c41b3160c86fee8714d77a10f770d94ae3905c81261dfdaf13957783a83d2235594656bf2884f944608
+DIST kxstitch-2.1.1.tar.xz 1726364 BLAKE2B 47257408f31ca7db4bddf984150baac6cd850206cedb95c73b0d62ee9f966028afd97bb3653b385104a1c679512c35f41aa25c5b703c715e565d48cfda59da36 SHA512 d5a6b6d06bfb894dd7404cb81350389f1ebf5c8a463eb792358abd67f362d1e1f578d06319461a006625864f1c4a69ebb4ccd0db422870c3eae0516c9132a3b3
 EBUILD kxstitch-2.0.0.ebuild 966 BLAKE2B cecfadc5596ba0b2f89fb501e8d7826b650ecb63790f43ad9809577ff52d04001d7658ebffb34ce5251297c50860536ac62e83cc3391037d075625449c3fe18f SHA512 cc2c291f040c49c5a15e4cc8c5b057121539940a68f6649fad0d6bc895c3dcef774a16fefa2d806985ea6b723ea39c72471d975e9b09ec02aa58885e4f2fe24e
 EBUILD kxstitch-2.1.0.ebuild 950 BLAKE2B b736baf0b1c971d9ad3e65334442a0fd7aa4a32937d544a52005031e682ac34a4e115c310cb68c38640769b3df07872893a0e872345335a28c2cc3f2b9d093b8 SHA512 8ed768f44f342c9d45875fe6045c51d4ab934d6d3c6bb3eef8d73e8d585eac80804d13f751972834319b097fc7046d7fb5df2fad7d928749bf6920d2d3522cd7
+EBUILD kxstitch-2.1.1.ebuild 950 BLAKE2B b736baf0b1c971d9ad3e65334442a0fd7aa4a32937d544a52005031e682ac34a4e115c310cb68c38640769b3df07872893a0e872345335a28c2cc3f2b9d093b8 SHA512 8ed768f44f342c9d45875fe6045c51d4ab934d6d3c6bb3eef8d73e8d585eac80804d13f751972834319b097fc7046d7fb5df2fad7d928749bf6920d2d3522cd7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
new file mode 100644
index 000000000000..3e24a1c98c3e
--- /dev/null
+++ b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program to create cross stitch patterns"
+HOMEPAGE="https://userbase.kde.org/KXStitch"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-gfx/imagemagick[cxx]
+	x11-libs/libX11
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!media-gfx/kxstitch:4
+"
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 4f3c3d299cce..f4a6ca209c02 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,5 +1,4 @@
 AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a225450e03663e7c1ca69dd40fc58e3de9d994fde6a66635d6a3ca20d2886fe7cbc6a7ed3202f8f3a8c7e3d9ea4072b4418a7a43048427a06c3 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24
-AUX sane-backends-1.0.25-disable-usb-tests.patch 428 BLAKE2B 8f88ce8320331cb21a74374ea0ad6fcec59aa9fe8a86a99df99bc86ab32b478016b7d1cc022dc2fb798506f1e321f0dc7af9c6da099df2ce494760c0325e38bb SHA512 05e3d33f127211c2dd12e174083fa307a057a207bd3112045f3d6b6a5948643e0f450ebb473dabba3536a48b42393a63e8309d8bb788b80d18c42c9531aeb6f6
 AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515f5b6641c86e6d9035a588a776aaec26eaa4e10beebf0a9fd97da991646b7964a867c422da2bc1cf93560d1ba326f0086675036338ff00 SHA512 64cce489e87de31e1a865b86d5829ae4914a30f47e27b07fba68629261cefcd617b8eed272c94b7554545e4802283c5bd5b53f79f54403d875726b38378ae74d
 AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910
 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch b/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch
deleted file mode 100644
index 217a4408e2ff..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-do not let the tests try reading/locking usb hardware.  we also disable
-this because the test will abort() if no usb support is found at all.
-
---- a/testsuite/sanei/sanei_usb_test.c
-+++ b/testsuite/sanei/sanei_usb_test.c
-@@ -832,6 +832,8 @@ main (int argc, char **argv)
-   int detected, opened, i;
-   SANE_Int dn[MAX_DEVICES];
- 
-+  return 77;
-+
- #ifdef HAVE_LIBUSB
-   printf ("\n%s built with old libusb\n\n", argv[0]);
- #endif
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 7a68dd9f1ed4..fa6698357d57 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,5 +1,3 @@
-DIST simple-scan-3.22.0.1.tar.xz 659564 BLAKE2B 6001f03b6dbdec8b84ac3098f86b131df8784cd65a6a557ecda6465e1fdeac49ad8efb43fd1ea93aa933efc1c7edb6753ede103fee35d7074da191a2bb114c03 SHA512 2513887546c1e6764cffeac26638646b03eaf2f2e5d8013d9c29dfd4fbe200b347f7ee8a94e402497d1e8bdc3ba55d2fb2a740eecc8663c692f75fda2b1607c0
 DIST simple-scan-3.24.1.tar.xz 669452 BLAKE2B 927c3479a96525e2996aab7c8d37b585f93fb07315a4f5cb0292b29befb0417df6e6afb059158d9840903d7474bf0d4fb97e634c585ca7654581b82a264e80f0 SHA512 9f0ced644b13dcaad4f1e23a6520b1cbe3c36d995fca4791383f959986cd396f123638a23dbd02a9511ef7e1c9c915b3a025e9b7e4de4542a4c180c4fe29e2b9
-EBUILD simple-scan-3.22.0.1.ebuild 1303 BLAKE2B c19801e07528697e62e756a45647474481456701ce56b76bb0576e3adc63175b08d2322e287792747f37f8d069a3e1cb76081a4dc0e02ba4c66a9673ed9c29bc SHA512 07e3f1c580eeb17e11fa287b95a729f25819bdaaa6d85b9f1c7fb814ac2c1324c5a0b567b111e0713cc259c83611b9b6a9d8de48d593105157616ee3f3c83355
 EBUILD simple-scan-3.24.1.ebuild 1303 BLAKE2B 86538dcf27e462ebc43f598d32c584235409e91610be9e03216b7384d7b296c81b050cb9f0d0d785a08afbdc4f1b7bb705fdc1654363342530d049e09a31f14e SHA512 04a4cddaf9711c7ca99bf6446c1578b955755bd8885ba405ab2f13f84b59112d8657a03b58e2d9016b506064825fd8ca43797199911dac75280514f48a168646
 MISC metadata.xml 718 BLAKE2B 46e5929721e967a667f32a8993903b635599ae06c5b5179edf0579070b2b393f750a044bc280519b820f336843d1b98a795f73ef9500a27951a64b61794901e5 SHA512 82244c0dc32c4ded72048a387cee5f350a66148ecaa12a941e4a86d9d9079f1769f1f240ee564c7f991f9d53c050e9fd3e9113024fc8831a6766ec3d88b665ca
diff --git a/media-gfx/simple-scan/simple-scan-3.22.0.1.ebuild b/media-gfx/simple-scan/simple-scan-3.22.0.1.ebuild
deleted file mode 100644
index a51727d20142..000000000000
--- a/media-gfx/simple-scan/simple-scan-3.22.0.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 vala versionator
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://launchpad.net/simple-scan"
-
-MY_PV=$(get_version_component_range 1-2)
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="colord" # packagekit
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/libgusb[vala]
-	>=media-gfx/sane-backends-1.0.20:=
-	>=sys-libs/zlib-1.2.3.1:=
-	virtual/jpeg:0=
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3:3
-	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
-"
-# packagekit? ( app-admin/packagekit-base )
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Force build from vala sources due to mismatch between generated
-	# C files and configure switches
-	# https://bugs.launchpad.net/simple-scan/+bug/1462769
-	rm -f src/simple_scan_vala.stamp || die
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-packagekit \
-		$(use_enable colord)
-		# $(use_enable packagekit)
-}
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index db9619591c86..85105bdf6713 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,6 +1,4 @@
-DIST sxiv-1.3.2.tar.gz 46560 BLAKE2B bdbd8bfac7cf4575347923657f8637d2cefbb5c8345b65937e410301e9e37c70b99323734d3469959548d1d6fc74dea2aec4ec5e1de1612ec6b0ce462785f0b1 SHA512 3bcf67a778a3e40cb6ae6b6fcc685cd57e303265df34c8a56d6ebb8ad0237e7136e738c44fee5c5504c73e4722d017f1e746691fac482568b2a960931f1ecdd5
 DIST sxiv-24.tar.gz 47148 BLAKE2B 69d70d64ea6cf6ae7a044d06df78a2e1e53941ef281d6445f54a28c4368112674461bc4e71a0226946588e604de33dd0972960cb072a00efd64512e5273cef09 SHA512 e4c9d4e18b4f1999b6441256b4c0d4683a105f1f64d4f754d6f9bc4f467ee1ccc6b6996cec8a210276c5fbec59417627fb838cb4f7be37cce32fa2c5d45d347b
-EBUILD sxiv-1.3.2-r2.ebuild 1459 BLAKE2B e9d28513bc507f3a617d436d1c6b78181f0ef56b35c99441a9d1003681dcb0431365b758b0d5c8eb4b34933afbd62ed79e50dc301e1a18304005f03a0bf3cb25 SHA512 51a5493a1e8c5d31b31348f4c7ee30490f4b518e31713c48cae031cd3ecf4f280381ffd548c753450a6f27b092e87314ecf41c5f5f5998a032fdf1a7bcf8f612
-EBUILD sxiv-24.ebuild 1221 BLAKE2B 6d8f507998cb308c26051e953e975380220aecca848a6bafa492a9853186986f8916ccfc43690085aec04904b3ab701b36cac6f1852f1d92186618f07339305a SHA512 50b2442c860d83a39f666913ed497958a01142ec6e685affe8d39dda0246d7e3960a2cc52672e3a9eb8e92974442c4353f07c05d0cef5eebc3dd143873ccbf20
+EBUILD sxiv-24.ebuild 1219 BLAKE2B da05f3f295ee8c8afb247ff3e31609ddf0b8c0fe8fb0db47f7e108b4253aa6565ff9dae5fe8b1c6875d5177705a2260fcf2be2a20e0d56374d31761537f30f65 SHA512 62ba4b36f941fc709a8e83a0be2bd581493041f1f93c21acd43753f8d7d368c9a6d6b8d9d3560dd78c9ebe0c4a15fc09cc48cb8a60fe77c4691b1663d0f8a370
 EBUILD sxiv-9999.ebuild 1221 BLAKE2B 6d8f507998cb308c26051e953e975380220aecca848a6bafa492a9853186986f8916ccfc43690085aec04904b3ab701b36cac6f1852f1d92186618f07339305a SHA512 50b2442c860d83a39f666913ed497958a01142ec6e685affe8d39dda0246d7e3960a2cc52672e3a9eb8e92974442c4353f07c05d0cef5eebc3dd143873ccbf20
 MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515
diff --git a/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild b/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild
deleted file mode 100644
index cbff57e39928..000000000000
--- a/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils xdg-utils gnome2-utils savedconfig toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Simple (or small or suckless) X Image Viewer"
-HOMEPAGE="https://github.com/muennich/sxiv/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="exif gif"
-
-RDEPEND="
-	exif? ( media-libs/libexif )
-	gif? ( media-libs/giflib:0= )
-	media-libs/imlib2[X,gif?]
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i '/^LDFLAGS/d' Makefile || die
-
-	# disable exif support as required
-	if ! use exif; then
-		sed \
-			-e 's/^.* -DHAVE_LIBEXIF/#\0/' \
-			-e 's/^.* -lexif/#\0/' \
-			-i Makefile || die
-	fi
-
-	# disable gif support as required
-	if ! use gif; then
-		sed \
-			-e 's/^.* -DHAVE_GIFLIB/#\0/' \
-			-e 's/^.* -lgif/#\0/' \
-			-i Makefile || die
-	fi
-
-	tc-export CC
-
-	restore_config config.h
-	default
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX=/usr install
-	emake -C icon DESTDIR="${ED}" PREFIX=/usr install
-	dodoc README.md
-	domenu sxiv.desktop
-
-	save_config config.h
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/sxiv/sxiv-24.ebuild b/media-gfx/sxiv/sxiv-24.ebuild
index 778e21dde204..67f72a7ea320 100644
--- a/media-gfx/sxiv/sxiv-24.ebuild
+++ b/media-gfx/sxiv/sxiv-24.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 6df83dc96445..64364969bf1f 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -3,7 +3,9 @@ AUX ufraw-0.22-crashfix.patch 563 BLAKE2B 98dfd70be0cb7ec82b9f87c946a0638d7c0d44
 AUX ufraw-0.22-drop_superfluous_abs.patch 448 BLAKE2B eae5b9f2dd6d12922b5fcd483447bc88a3ba4af249724f7c2dce5110d008934ce6e1601970ad7a42a952c8197b49605c3534c458e87ff804ccb1be861442d029 SHA512 847c5081225236d3728400d2d4f19f25fc971d9ee7b8a87395400f04d4ca82403d6fc10876f4884a3dcee7d1b2ac9a418132fa839d35f370484cc47fb6381a60
 AUX ufraw-0.22-fix-unsigned-char.patch 748 BLAKE2B 30a8dfcfb71f78449838ade5f77074d667fc1e71ca079f8042869a9e82ff8b9422ddbdc892c7458e05ad411d552352b5f530ae2da4a629d449857a1e62be0c78 SHA512 0ea99fe69adeeae1e6c07bcf9d583f6b8247ad0f01ddf3435edb605618b0c24d80c5662442250020b92352ebba12757bb69ad7b107ab8a8f464d5cf2b642664b
 AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a738378788b2ab11665c0c8ab2f3246c821a176dba8b26cea354e8b0d127d2c601c21b0ac94f5264327916d0f8779618165 SHA512 855337bf109ebc0ea7b9bd429bcc429bd9caa561e2a815352c51e860a6e405d500913b70414ded7f47e053332c89b964d1817c8f22627504cf157f1565f3c7a4
+AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c
 DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
 EBUILD ufraw-0.22-r1.ebuild 1942 BLAKE2B d9e275268bacb9820d75e04386f3b5152e93f72e6d06bc9a0cb1dd98ae6b8364d28167ac83cac70994f0b318bd6cfe36fa57dd1ace6f6a287a9fca5b13067ae3 SHA512 1b10bb5090511f5bed94145e7372b7a0b2828170bfceb02ca9cddf979e7327b4dc8bff85b91b9c40f09a36b3c7fbb20d5a9d894d7b323b1010d6ac5f00e97b8d
+EBUILD ufraw-0.22-r2.ebuild 1970 BLAKE2B 169afae7cde2cbdc098115c8f12de0408d0bd0e086b63d434ac58d84701548834dcbb012fb3daff6f896e099d02b87cfba9aeee5f268ba0cc3ce7a8d8c877d57 SHA512 2302b7d3b026dfbad8fb0e7e1d7d4dec4dfc6b6780eb50e6accd7df2e6be11b2f51306c9231140e11128251496c892e0201b9dbeeed3bbc22452adc6e8cf2792
 EBUILD ufraw-0.22.ebuild 1684 BLAKE2B 8af30a9b68373d19ae65485f0c424a73f72fa560030fd2ffcb8bdbc618e8bc8b315316c9afb3040e872bbe2109298a8f62c647e85b5e13da702967cb5fe92e32 SHA512 5c9374c8eaf5ac4cbd5aeedcc72de973b9160fbe0b7022ad86a690407b013c613dba97b2116dd1a54830ecec92b5793d6f21525fb75e62c060ae6be0729ef414
 MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9
diff --git a/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch b/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch
new file mode 100644
index 000000000000..dca3834cbe8e
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch
@@ -0,0 +1,32 @@
+Fix build with >=jpeg-9
+Thanks-to: Moran Z. <o542018138@gmail.com>
+
+--- a/dcraw.cc	2014-09-02 07:50:38.000000000 +0300
++++ b/dcraw.cc	2015-02-21 04:54:13.957561352 +0200
+@@ -2330,7 +2330,7 @@ 
+ #endif
+   cinfo->src->next_input_byte = jpeg_buffer;
+   cinfo->src->bytes_in_buffer = nbytes;
+-  return TRUE;
++  return boolean(TRUE);
+ }
+ 
+ void CLASS kodak_jpeg_load_raw()
+@@ -2346,7 +2346,7 @@ 
+   jpeg_create_decompress (&cinfo);
+   jpeg_stdio_src (&cinfo, ifp);
+   cinfo.src->fill_input_buffer = fill_input_buffer;
+-  jpeg_read_header (&cinfo, TRUE);
++  jpeg_read_header (&cinfo, boolean(TRUE));
+   jpeg_start_decompress (&cinfo);
+   if ((cinfo.output_width      != width  ) ||
+       (cinfo.output_height*2   != height ) ||
+@@ -2419,7 +2419,7 @@ 
+     if (tile_length < INT_MAX)
+       fseek (ifp, get4(), SEEK_SET);
+     jpeg_stdio_src (&cinfo, ifp);
+-    jpeg_read_header (&cinfo, TRUE);
++    jpeg_read_header (&cinfo, boolean(TRUE));
+     jpeg_start_decompress (&cinfo);
+     buf = (*cinfo.mem->alloc_sarray)
+ 	((j_common_ptr) &cinfo, JPOOL_IMAGE, cinfo.output_width*3, 1);
diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
new file mode 100644
index 000000000000..4df5995e5355
--- /dev/null
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="RAW Image format viewer and GIMP plugin"
+HOMEPAGE="http://ufraw.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
+
+REQUIRED_USE="gimp? ( gtk )"
+
+RDEPEND="
+	dev-libs/glib:2=
+	>=media-gfx/exiv2-0.11:0=
+	media-libs/lcms:2=
+	>=media-libs/lensfun-0.2.5:=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	virtual/jpeg:0=
+	fits? ( sci-libs/cfitsio:0= )
+	gimp? ( >=media-gfx/gimp-2 )
+	gnome? ( >=gnome-base/gconf-2 )
+	gtk? (
+		>=media-gfx/gtkimageview-1.5
+		>=x11-libs/gtk+-2.6:2
+	)
+	jpeg2k? ( media-libs/jasper:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
+	"${FILESDIR}"/${P}-jasper-automagic.patch
+	"${FILESDIR}"/${P}-crashfix.patch
+	"${FILESDIR}"/${P}-drop_superfluous_abs.patch
+	"${FILESDIR}"/${P}-fix-unsigned-char.patch
+	"${FILESDIR}"/${P}-jpeg9.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable contrast) \
+		$(use_with fits cfitsio) \
+		$(use_with gimp) \
+		$(use_enable gnome mime) \
+		$(use_with gtk) \
+		$(use_enable jpeg2k jasper) \
+		$(use_enable openmp) \
+		$(use_enable timezone dst-correction)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install
+	einstalldocs
+}
+
+pkg_preinst() {
+	if use gnome; then
+		gnome2_gconf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gnome; then
+		xdg_mimeinfo_database_update
+		xdg_desktop_database_update
+		gnome2_gconf_install
+	fi
+}
+
+pkg_postrm() {
+	if use gnome; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0b3d8ab83c09..da23781d28c8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 8381cc347793..7d9a317470ab 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,5 +1,5 @@
-DIST Image-ExifTool-10.68.tar.gz 4295465 BLAKE2B 5074c7310affda8b21d580d6db5ad67b74bc3e136a115f403e9567e6f667a1f5e600e1f09717b620613f0006b8c2571d365b1942c2f8138f4f122dcf31b47f07 SHA512 8064ada3abbb12d12a1ad89ec4185b25e54c0726f50b8650460280869dd538ec776c15ed1832350be900c4668ba90d4a45bf3b898173c5ac09945cfa473f42c8
 DIST Image-ExifTool-10.72.tar.gz 4312531 BLAKE2B 27782c2b1396f0f20eb40d6848f6ca6ea63a7f81e4d40e394cc08a00303b8208adabc06758eecf48a24ce8e8b61af5a075c16937e0a8ff51152b76ac7f0dffb7 SHA512 a0fa407a8c6ef60b01601aea6b6e83959c63a5bf99e8c88a3cb5581a0c6ae5cbebd2baa70e0fbb972390870f93c19755f1c02e8b3ff7dc2d154ca0f63996d0b3
-EBUILD exiftool-10.68.ebuild 532 BLAKE2B 9082da4d83fc6b5ede514bd0a9fc277a08182500b4980f50de1cc5cbdf16179e7134c42a385bf0082d9ee7f46b279e0f6e757424414734f79ed2947ec5b575d7 SHA512 7bce562b0f55fa1792996a7992e0a7edc211437ba9515c8cf5fd3bed776de1ee1ac1cca452e68c48625b469f2dec05658ac6cc3f572e877ec2c2b28d29507255
-EBUILD exiftool-10.72.ebuild 536 BLAKE2B 447face52dc7db39d6d75196556fa4c369d84e9bd1d83ceb241747839095b457eafa64c094741992f29cf0efc95fadb67263d3dec021cccdff8fc32bb2db9ad0 SHA512 39ad2668ecb03ab6fcacce0b7d0d51d2abf45847c964900ae49ca74c65b57d20f2006b73ca19eedb49eaa92cd9fa01d04c4835dbf3fa52083df566e44f58e86b
+DIST Image-ExifTool-10.78.tar.gz 4345326 BLAKE2B 33ba3721fe573d8d0168ea18e54febb8a5339f276a2cc2c4c38e94e13c2bc82a2470704af9a64412d1158d61d83107454e0a53415cb685bd6b9800df937f1323 SHA512 6447f3bee6d05c95ab01f599e0bc7bc3f22d26ba0faccdd68e94a4b4705b830b41e95c9b59ad2b984a0b2e429e698be9fac8400bcb2ae2e31f1fe1d4661e4508
+EBUILD exiftool-10.72.ebuild 532 BLAKE2B 9082da4d83fc6b5ede514bd0a9fc277a08182500b4980f50de1cc5cbdf16179e7134c42a385bf0082d9ee7f46b279e0f6e757424414734f79ed2947ec5b575d7 SHA512 7bce562b0f55fa1792996a7992e0a7edc211437ba9515c8cf5fd3bed776de1ee1ac1cca452e68c48625b469f2dec05658ac6cc3f572e877ec2c2b28d29507255
+EBUILD exiftool-10.78.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-10.72.ebuild b/media-libs/exiftool/exiftool-10.72.ebuild
index 22e52f948459..a92d9f73adec 100644
--- a/media-libs/exiftool/exiftool-10.72.ebuild
+++ b/media-libs/exiftool/exiftool-10.72.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
 SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-10.68.ebuild b/media-libs/exiftool/exiftool-10.78.ebuild
index a92d9f73adec..ec856d3619aa 100644
--- a/media-libs/exiftool/exiftool-10.68.ebuild
+++ b/media-libs/exiftool/exiftool-10.78.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
 SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index bc384986af90..7846746a6fe5 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -1,8 +1,4 @@
-AUX libkate-0.3.7-libpng14.patch 1087 BLAKE2B 9e149273ff817c89769059679ad41a97bd56e7390867e1c31e9f4f0abe5a2fdfd15a98b8069b22ab7c1574e074b27d27db07964ddfe00485e99ef35e92fa64af SHA512 c70729ecddf9cf662875ec0946c6d50a9dd75cbe112ba9614bb2ee5f9fb78d3b1f58c6937bf12be63f22118902ab3d4f7b8b43322b8067d6cc1310230394dc19
-DIST libkate-0.3.7.tar.gz 728239 BLAKE2B 5b30cde20d8865be88c489bddfa1afdaa2bdfde87d961bd068f261c2638be89338104801fbafaee0331333e4b3d77cdb974176179a7030462412c6c961f65188 SHA512 4a9f123c271ac8e4df12ea0205160418fb9312a428894f18c8219c1f6569de1bd6ef233972ae3d2ee8ed25bb75a3c8868834ed945b308b0dbf469433c384f16b
 DIST libkate-0.4.1.tar.gz 906896 BLAKE2B 99e755a365fcd9983fcce59f38a313b4c0c23c3a274e3b98c8756aafae29d19dc3ed3d200cf2207dd2d4985d8e99ec0d47dcdadc273a78ff84c4be11330b1e0a SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b
-EBUILD libkate-0.3.7-r1.ebuild 1171 BLAKE2B ea3d74963b8788433c822db1e574cbd363fea48e80962d888802abc7af8a52fbb5e4f8448b56afe81d8786196e55776ae68532e6f1badf439319433c540985b0 SHA512 ab8f7fe7707aa90a72b362072dd4096a737811bf5da492cff71211df6006fab80d88a3d0a759e91a3dc7669a1af80e8aaeb27017adb9818a3b309b45a046205f
-EBUILD libkate-0.4.1-r1.ebuild 1170 BLAKE2B e291fb9f87220b55cf9ebae392448fad956dabc1872b3a99fa4bd68dd373065f0d92422c5a7eddb62ae19131a15de1d1786dbcbee7b38968a9f4c9f9a16ac36c SHA512 8a9cc877df61e2dca2425ebb7cc3f63cf15e95a55fc4bb9c0cea0357aca911f3d2f86dbd2a0b0cc2cd8a5b974b347484d71c2b34c5cbc38f6b8562bcf2c3bb6f
 EBUILD libkate-0.4.1-r2.ebuild 1164 BLAKE2B f7f5e938758e94c9cf3726bdb6042e6df47c54a1ac576c12d5c6b26706d1b4f2beff6ab07b8dee237e4d91a72bdff0a3ac44ef574dcb0d7436625b6760ae0091 SHA512 ed50e21d9de360c16151aa3ccb661f021d86f13af6c8c441bb5fe86be3ede6d8236076abfa68bf6dbb480f41527334ba8dacee77271f2cdac391fd504c022fbf
 EBUILD libkate-0.4.1-r3.ebuild 1318 BLAKE2B a1e66db77b3f10d5ef7af43bf2fcb7f30c2f00f617777bf49d9b565ca3233ad36e7bc966f7a82182546636328550277927d05e912793ef5fbe03bcc3cf24160f SHA512 692ef685b3bb8a6b8f7cab63f9884407322d608c8705611cbc6298b2b94f0b4b4850a3a7d828256472da32247a7685c957fe414e7b7c46ef152139e58e779237
 MISC metadata.xml 1066 BLAKE2B 61b532ca7ea79a560df1ea1d4e36a0ff5d00a3c1dc81b520d0c9e1a077206d6c9249711f9d76100ed9394a65ab29bbb74d02f4caa51f8f800c14b24ce9a17b47 SHA512 510dadea430ae39da68a3cd97b4a7717b91fcc26cbb0303155718ba5e46d69d2e52e099b272ffe26f34149ef8fe01df80e332009fc905a4f262ef8030327da29
diff --git a/media-libs/libkate/files/libkate-0.3.7-libpng14.patch b/media-libs/libkate/files/libkate-0.3.7-libpng14.patch
deleted file mode 100644
index cb4e3474a6b5..000000000000
--- a/media-libs/libkate/files/libkate-0.3.7-libpng14.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-http://code.google.com/p/libkate/issues/detail?id=15
-
---- a/tools/kpng.c
-+++ b/tools/kpng.c
-@@ -179,13 +179,13 @@
-     }
-   }
- 
--  png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL);
-+  png_destroy_read_struct(&png_ptr,&info_ptr,NULL);
-   fclose(f);
- 
-   return 0;
- 
- error:
--  if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL);
-+  if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL);
-   if (f) fclose(f);
-   return -1;
- }
-@@ -224,7 +224,7 @@
-   if (w) *w=png_get_image_width(png_ptr,info_ptr);
-   if (h) *h=png_get_image_height(png_ptr,info_ptr);
- 
--  png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL);
-+  png_destroy_read_struct(&png_ptr,&info_ptr,NULL);
- 
-   /* now read the whole file as a binary blob */
-   fseek(f,0,SEEK_END);
-@@ -246,7 +246,7 @@
-   return 0;
- 
- error:
--  if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL);
-+  if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL);
-   if (f) fclose(f);
-   return -1;
- }
diff --git a/media-libs/libkate/libkate-0.3.7-r1.ebuild b/media-libs/libkate/libkate-0.3.7-r1.ebuild
deleted file mode 100644
index 21462527f0de..000000000000
--- a/media-libs/libkate/libkate-0.3.7-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Codec for karaoke and text encapsulation for Ogg"
-HOMEPAGE="https://code.google.com/p/libkate/"
-SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc wxwidgets"
-
-COMMON_DEPEND="media-libs/libogg:=
-	media-libs/libpng:0="
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/bison
-	doc? ( app-doc/doxygen )"
-RDEPEND="${COMMON_DEPEND}
-	wxwidgets? (
-		${PYTHON_DEPS}
-		=dev-python/wxpython-2.8*[${PYTHON_USEDEP}]
-		media-libs/liboggz )"
-
-REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libpng14.patch
-)
-
-pkg_setup() {
-	use wxwidgets && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	if ! use wxwidgets; then
-		sed -i -e "s/HAVE_PYTHON=yes/HAVE_PYTHON=no/" configure || die
-	fi
-
-	econf $(use_enable doc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
-	use wxwidgets && python_fix_shebang "${D}"
-}
diff --git a/media-libs/libkate/libkate-0.4.1-r1.ebuild b/media-libs/libkate/libkate-0.4.1-r1.ebuild
deleted file mode 100644
index 4c932dfa287d..000000000000
--- a/media-libs/libkate/libkate-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Codec for karaoke and text encapsulation for Ogg"
-HOMEPAGE="https://code.google.com/p/libkate/"
-SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug doc wxwidgets"
-
-COMMON_DEPEND="media-libs/libogg:=
-	media-libs/libpng:0="
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/bison
-	doc? ( app-doc/doxygen )"
-RDEPEND="${COMMON_DEPEND}
-	wxwidgets? (
-		${PYTHON_DEPS}
-		=dev-python/wxpython-2.8*[${PYTHON_USEDEP}]
-		media-libs/liboggz )"
-
-REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use wxwidgets && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	if ! use wxwidgets; then
-		sed -i -e "s/HAVE_PYTHON=yes/HAVE_PYTHON=no/" configure || die
-	fi
-
-	econf $(use_enable debug) $(use_enable doc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
-	use wxwidgets && python_fix_shebang "${D}"
-}
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 9eac84105665..bacd7ee2cedd 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,8 +1,4 @@
 AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb
-DIST libmediainfo_0.7.99.tar.xz 1603656 BLAKE2B cd1cf1860e0910da6e818846a8ab8c71682a7fd0bfc3edf2d60e220cdedcefb9940ca2e6d3db2a18722cca0a0bebd2b70ba0ca2cfcb8908f0c5fd31fe41775fd SHA512 a0ceaf142604a98e9415ecfeda29d7c3d57ac755903630c2a5b2782d3bb24a101c46c93c68858dce99299da6375e03b846b5973274168ca8c42315b82a0cfdc0
-DIST libmediainfo_17.10.tar.xz 1606920 BLAKE2B a0419644e65fee120d6f5e828a0ee66b04e026c6bd91ace603d0b5e7a14aff9f9db4a84cfb252ee97a241a38f31cec91138176e91e5783f1d450b5484bce49f4 SHA512 3fe8b7c97c9b916376c090c89f7b5afb732d002d5d112370b977c83d9bea2911ec7cc249fa7df6f4b100600cc2354d6a8832339cf0d3b45262730a477c07fd4d
 DIST libmediainfo_17.12.tar.xz 1612420 BLAKE2B 1e1bd62efe45783d4973bbe0ff264db1ed20b064dc18fe3ab4fa3614c1b41663fe6727e469ef1769b4736827f89940edd959b270ec1c673a190c9078a81f3955 SHA512 c425612ca84f4655c851332a4c13bdd75df094fa5468b2d61db512ff8431b41e94068d2f645b669dbee286ccae3979a38a5f4ebbb5cda8abdbadf0313df5680d
-EBUILD libmediainfo-0.7.99.ebuild 1834 BLAKE2B a54b2a81cef3bb3309c7d5ca6671ca85f0726a9ea28c224b3b3eecb3e45739c7b8bf5653cd69e3cc5f65f795d396dc813412e8c86125d23480893c09708974ba SHA512 92148a20107c2729c2a0e9ac29b3ba708717ed34c5fe64abbeee01ef4adf716af0d4fafbd687e3d4e3e169bf0a05b44525967ab737ade546a26fa78845c2b27e
-EBUILD libmediainfo-17.10.ebuild 1836 BLAKE2B 1847028ad80e0c65c8b046c5c048547c209eb7e3e61e44d6c87298a61b2cc425bcb2bf9a97dce6081c9bc7dea6fb035c46b8e78f50f3f9c4a0d0ea2484148180 SHA512 10cf52d6df0e23d28be0ee4c6d3eff0a3ba8f0ee7f6e5ba7d92ddab90deca01c3bc72081ff9c7d5f9799601d5d213a591dc95a4671fd472104f58c6d915edd97
-EBUILD libmediainfo-17.12.ebuild 1836 BLAKE2B 1847028ad80e0c65c8b046c5c048547c209eb7e3e61e44d6c87298a61b2cc425bcb2bf9a97dce6081c9bc7dea6fb035c46b8e78f50f3f9c4a0d0ea2484148180 SHA512 10cf52d6df0e23d28be0ee4c6d3eff0a3ba8f0ee7f6e5ba7d92ddab90deca01c3bc72081ff9c7d5f9799601d5d213a591dc95a4671fd472104f58c6d915edd97
+EBUILD libmediainfo-17.12.ebuild 1834 BLAKE2B a54b2a81cef3bb3309c7d5ca6671ca85f0726a9ea28c224b3b3eecb3e45739c7b8bf5653cd69e3cc5f65f795d396dc813412e8c86125d23480893c09708974ba SHA512 92148a20107c2729c2a0e9ac29b3ba708717ed34c5fe64abbeee01ef4adf716af0d4fafbd687e3d4e3e169bf0a05b44525967ab737ade546a26fa78845c2b27e
 MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.99.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.99.ebuild
deleted file mode 100644
index c5d85f15c216..000000000000
--- a/media-libs/libmediainfo/libmediainfo-0.7.99.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune flag-o-matic
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2:=
-	>=media-libs/libzen-0.4.37[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# tests try to fetch data from online sources
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
-	eapply_user
-
-	sed -i 's:-O2::' configure.ac || die
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
-	fi
-
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-
-	prune_libtool_files
-}
diff --git a/media-libs/libmediainfo/libmediainfo-17.10.ebuild b/media-libs/libmediainfo/libmediainfo-17.10.ebuild
deleted file mode 100644
index 7be3ed1e7919..000000000000
--- a/media-libs/libmediainfo/libmediainfo-17.10.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune flag-o-matic
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2:=
-	>=media-libs/libzen-0.4.37[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# tests try to fetch data from online sources
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
-	eapply_user
-
-	sed -i 's:-O2::' configure.ac || die
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
-	fi
-
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-
-	prune_libtool_files
-}
diff --git a/media-libs/libmediainfo/libmediainfo-17.12.ebuild b/media-libs/libmediainfo/libmediainfo-17.12.ebuild
index 7be3ed1e7919..c5d85f15c216 100644
--- a/media-libs/libmediainfo/libmediainfo-17.12.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-17.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl doc mms static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index e17bd77d7ddc..dfa3eb9fff02 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -1,7 +1,9 @@
 DIST mutagen-1.35.1.tar.gz 883772 BLAKE2B 933c689bf4e578c1acb6c16af4071e879db4e0e55d9391f63dc778f535e13337f61812b1fd21741552ac3f9dfb2cd53f210d27b3c98ef7b6bf05b4b046d20d8f SHA512 e411b86d50a7689589b7d300317dc2a2c4893efe47b66d07bdf5fe92f1d08fcc00c314e3ae1f97d706fcaae6c83c7569bb22b557af2dfc469b1d3c4f0388a260
 DIST mutagen-1.38.tar.gz 913243 BLAKE2B 08281ed0ea9307a6caa64cc5f66dbea43d09ab6dffba49bab3bea8d3878ae1062b0b7dcb772f0880848adbbd3c3c89a73e0d59b496fb635f7308c66869aa2531 SHA512 1430901539cddc7f58978f59125b793228c611cee9cc19535142e3095a7caaeee7a2431c244054affa33fb6518123b46cd187715d8353fd1b165496bd358a995
 DIST mutagen-1.39.tar.gz 916084 BLAKE2B e67de0f0c2b33283ea276511f5537f5f12a35d336927dff662a5044a05163c7dc5677dc2e5b2696fc62ac3888a9602a566b43ffb511d3eee1c8f07f17bc08302 SHA512 0508c3dfa31a4af29845204664819bc8af8121a785b8e5cc307a12bdf7c151acf4cd72e0820fb9d284c859dd6d63d7d7a6c7ebad8e3ca19db52f0c496ce74736
+DIST mutagen-1.40.0.tar.gz 917874 BLAKE2B 69405942af849a8c82d14424a242e77cd9d554155494976402c3eb5d95dcccbf14de5fd3268cb9cf12e0035dcbf88c3724d1684c21612b2f0b0a87cb48de1ec8 SHA512 ad4accccc3457d1ff7238c2941b20aeb532e9b41bf2bf1cb130e428f9af9a7dd18a0e81a4d45fbc98783d8cf90cd105de09d703c70beea7cba5eca58dab1bb69
 EBUILD mutagen-1.35.1.ebuild 1169 BLAKE2B 4fae41f97f74468c9c0a9c4cb60df6dd923bf13baa68036695557dbdc8b5b726c197b11a254cf185a553401af509d86a1d62bf73ea33ace1e2b5a908a3a344a6 SHA512 6e17ca9217129138a702ac0c72eb02b3dbe103325944d33fc199f5b445e42f9429ff2881eb5acbbf3533b6eef3d6630a605893f6e6475a4f6842f6e6c3a1f37f
 EBUILD mutagen-1.38.ebuild 1041 BLAKE2B 8a5fba2d542cd2096744ec697ba3b55c27ef23de38c5b77ee58f3baa8751dd2e2c04b99959968cea8c4fbad00a7e7bbdfb0b4566e8354ec89389f4cb3ef9a92a SHA512 fd560403332ede11271182f1673a702117adc2281500644cd125b77360974739051da704149fcd325a231768856d524914d1a9397d4302c407a7bc6898d8ea52
 EBUILD mutagen-1.39.ebuild 1086 BLAKE2B 7e2f9e90671bd7ad5602afabb1972420ef1a57526e26545d6ca838349552fae90d4df0de5c735ad70e643031dcb6c4074e89787a609381575288bb4dc87ebc24 SHA512 00209e06095163abdeb2a930f4f0cb396d8fabfbd750f7223012364eb82e7924515439b9f716773a854d57a940234da7df38a309f29463cf3780294c2b6dca2a
+EBUILD mutagen-1.40.0.ebuild 1099 BLAKE2B 2d65edd258083acd1382491c0d9fb9fd0d27fb92a7d627445459f11247fe2adf131a4e49c65abc345dff77170d6d666a1d2d02dc81e9416721a8edae3a9afcd1 SHA512 3f816751b4cc03a2dc08e580307ef67229388346db91c7fee83b44c46e1e00d36b2cabefefa50bcd65e672bf547aa7e585c3ef949bc59bd4de58466fe23e959d
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.40.0.ebuild b/media-libs/mutagen/mutagen-1.40.0.ebuild
new file mode 100644
index 000000000000..ab059849894f
--- /dev/null
+++ b/media-libs/mutagen/mutagen-1.40.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.python.org/pypi/mutagen"
+SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# TODO: Missing support for >=dev-python/eyeD3-0.7 API
+# test? ( >=dev-python/eyeD3-0.7 )
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && emake -C docs
+}
+
+python_test() {
+	esetup.py test --no-quality
+}
+
+python_install_all() {
+	local DOCS=( NEWS README.rst )
+	use doc && local HTML_DOCS=( docs/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ebdc24b8c389..8fe49c9b16db 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 91125d40c593..f2da8371b1e7 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-music-3.22.2.tar.xz 1547556 BLAKE2B 4cd54ca211018a21b744e14fa2b81e7a229e293bd4e4288771969bc75d2845fb05862b679c35218d7c1a85a595def5eeacf6009f3fca6b8e46a08395d7c9d40d SHA512 5f30a943209171f19f344139b40725649a56499ad874be138d8681e0ff81fda7fe85fc1b20c3dcf7fea21dd28a0921a47fe28fe064fa1ea8d51a313ec56e7924
 DIST gnome-music-3.24.2.tar.xz 1557848 BLAKE2B 329d60da4c2c601524e01bddf086ea699bc10ea311d440ae24af0a83829d7ad4c351963e1b08bd30a8538c9b9987d9f2a41f95690ae31e75c06aac0cc9db2dcf SHA512 a922c80f922b9231e9bbe0cbd1fd33c059c719350c250dbb24316224e3306de7576303119fc9ec303f569559c36d6b076b5ec1076b4f9221a8fb133dcd9f040e
-EBUILD gnome-music-3.22.2-r1.ebuild 1547 BLAKE2B d74f1bcd68cdfe50ff1e543008eca81500636e0f88bab6394cf889b81cb4a50b2398991f6320629d07417761e2e83a2d1b1198bb5f89a0b4d219932ad520312d SHA512 913775e5ad8c25b338003346c1349e386dad5ce068efbf4a895f861863f418171e5548f5cf87edf09795463eb0119ddd235c4dc52395d03c4d95be15751159fe
 EBUILD gnome-music-3.24.2.ebuild 1556 BLAKE2B 88a976174405a82f362f57f1bbe0157571a36d1eaa0fe0d0bbf3166660dcae4d1dbb4eda6a485fd922b54eaf1ff948423af0ffd2ef05c2e6b183ab932818d98c SHA512 e1dc5fb96a59d03b902047e0937268a5aac7da6f477ecfb296f15f45577180af8f8363f2e9a53da5abd742afb9ac8e804f09ecbc4c3b4b49134acdddd51b68d4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.22.2-r1.ebuild b/media-sound/gnome-music/gnome-music-3.22.2-r1.ebuild
deleted file mode 100644
index 8c6f870f32a1..000000000000
--- a/media-sound/gnome-music/gnome-music-3.22.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=app-misc/tracker-1.9.0[introspection(+)]
-	>=dev-python/pygobject-3.21.1:3[cairo,${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=media-libs/grilo-0.3.1:0.3[introspection]
-	media-libs/libmediaart:2.0[introspection]
-	>=x11-libs/gtk+-3.19.3:3[introspection]
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		app-misc/tracker[gstreamer]
-		app-misc/tracker[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.26
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${D}"usr/bin/gnome-music
-}
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 54efb3e91e88..f21bc49fd3d8 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-sound-recorder-3.21.92.tar.xz 450092 BLAKE2B ebfd5e671b4c379e294e19f1f17de7f96c3d70fb3b0bfe8becfc919b76d055350603ccc03c8795bb96f64846b4d8b4f875eda73a998932aa2fef1db5ea605daa SHA512 60afa42367f9087e580037213f06c1eab10a4a29fcf3c90f9737e73c9d6a1dbdb990cd010d7e33021c0e25bb33ff673e35bffb74d6fbc33b82047a0516ff31be
 DIST gnome-sound-recorder-3.24.0.1.tar.xz 452240 BLAKE2B 37b2b81255af5aff4de08e92bf7db216b229885b1aeee87d91a1210412634b62641758c6132290b75494f780d304d78dee4c3d5d7e08de46736750c2730b20d0 SHA512 00e190e8d6a1a3961122485742705da4d85ef926453ff8098718566771600690562597f012f7cd9dc61b5910b4e75cc7518e86a092f052c3fc40a96310ab3c3f
-EBUILD gnome-sound-recorder-3.21.92.ebuild 673 BLAKE2B 7edad00d49018f7248060566b5c8c7e7b5bc6bab8508e1ef3e56d8eae1c7fbd4ff183212b1aa1cff6d1f0c25813f1db7c392db5c61c643e69dc76b8c40adab1f SHA512 33cc4fabc1c16aec885f4885c4edc377d2ad2f14a177b33e135256a9e285b5d2424a09392212744bce14fb78ea47936529260c649b24e88b9bcc7ee2861b6d28
 EBUILD gnome-sound-recorder-3.24.0.1.ebuild 1083 BLAKE2B d9df40ebe569a1c0f3edfb91c57ff26b8d6345f56c9d5122c42abeda635df851f679009e21cce1dced73deb7ed7f529df036bc1aa5e2a5a4143200cface68a3e SHA512 499c05e1955bad18123c5a3f994da3034b7df4d0d6816718f39ca43df1da1cde7dc8212ca84193474a832c5d9976b996ab6394009a52420f1a0d96a88c7b2691
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.21.92.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.21.92.ebuild
deleted file mode 100644
index 0197fe572ed9..000000000000
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.21.92.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Simple sound recorder"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# For the list of plugins, see src/audioProfile.js
-COMMON_DEPEND="
-	dev-libs/gjs
-	dev-libs/glib:2
-	>=dev-libs/gobject-introspection-1.0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.26
-	virtual/pkgconfig
-"
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 6928ddc01e78..209ef340c5ac 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,13 +1,9 @@
-AUX grip-3.3.1-implicit-declaration.patch 673 BLAKE2B 7bbaa45fe03fbaacc888ed147c0c9c2bf5644362bb67c92e2f10478b9fd4eb2ca840dbf95fec7a36fbef53e71ab51edaf21c4ff76132c44ad9c2473eda123a1a SHA512 be7ba1b7250ebeffbb4b5e5aa64baed994441030e0af5a2937c9e26e91a718c59ba32782487e5e71df04acf3241ad6ec99d4d1302c44c4ba3abe20472fec107b
-AUX grip-3.3.1-invalid-genre-size.patch 697 BLAKE2B daa0fd81bcee051647fce7ea5b40924791ad03a3fa2f8ce6b55eedaf3ed8f97ec02a8b8b7dda38c52b39ffe49a21b555aac0934682b642a86ae9170cfff5c05c SHA512 80f0df873b4721b0d4c74e5d17a0dcf0f35988041be5f8e30c9fa73fe2e125bde83ab3d943894675a7b2a07d7ecd38a1f2c7c1edf6be81e4a37db302ae05b51f
-DIST grip-3.3.1.tar.gz 812562 BLAKE2B 7aa7cdb0d9c4b60d42e5af108299923466f69df1b14ecbe06b1b56b7a8719e12389c90d1478328c5e05f14cb65f7da23486c8467a7707bee35f33fa51e8e40ea SHA512 380e36cb4e58180e543e1d293d38108f4879842ed63106da875e00747e98c2c06da1e706cfaf4ff26f481bba0ca941eb1201f430de04b0f313b1307ddd7e88d3
 DIST grip-3.4.3.tar.gz 740870 BLAKE2B d6b703d4ba08bf976a53e70772977a6b0fd5cd231fc16bf6a387497ad6db8e0ba2226ebe05d77135e7ec55911af0d3cd6cb7608da1452083335f9f8f46cbc182 SHA512 e7690cfe375de525f7dde7cc4d64ac9577f702a58bbd2cc1aa318dba58b208a8affe9e8e07078d6a16ba1340b0bd17edce1c8cf750631c8d677a3bd2679bb361
 DIST grip-3.5.2.tar.gz 952153 BLAKE2B e82ccb50636e68ab9862d2004a4dbe59399372b76a835b33350e539a186fed516e7b4961fe930b3beb5168554324a5bebeee5ef03d1cb7731d7f9d7c1fd1feb9 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421
-DIST grip-3.6.1.tar.gz 958967 BLAKE2B 2355312f26bb1bf503dedf0bea07e7a0ea1ede1a90cfa215188a4c0396c2b50315ff8e6579c66a5d1284622f80022a5b6681559a169fe2eff21e1f3226466799 SHA512 ebb0945833189b17d814fee9a68acf25786f83fa7d1e47523512b25c1ef9d146d5d218c8422c7b37fbb7cf63558cc093795ef4078639f8e35c9947d76d6d2fcf
 DIST grip-3.6.2.tar.gz 959393 BLAKE2B 09f7c6bbd5e82ada26795f082feb0d35cd21e14bac0e5881502c65d1e64f501eb086d5843b5120408186435ce6a95771bcf94972881fc449d4c4c2130f929066 SHA512 8aba6dbf4cb374dbe76fb5358f4b550187840a1248f9a60d8441a123ad5abe49d6fe4bcd491047d19432dd90a6dbd9060737f9e2ba19fa60e5e4c50ec5fd8cf8
-EBUILD grip-3.3.1-r3.ebuild 1353 BLAKE2B b7b3afd31cfe23537df761d566b221f3f762ff807d5d3fa87b2b4524d15eaa7828d30ee5e80fd14f3e63d719ab777c50241013a6f5423c6b3e578cdc1f237ef7 SHA512 964b99dd264dda5e9309c47a998308ac4b6dc770847d14ae0d60e768ef5038ffd41ea3a0bd87cd5de1130f79d5ceaf5040588724db59516ab1a1e3acf92b9154
+DIST grip-3.6.3.tar.gz 960255 BLAKE2B 9aad33c04e98f60e5f7871e36f2e4bf616a16486482e7363d165ae7d9fc5343a52583e490b9b9757d31b051e6e96165d35931370e2681d727db7abb0854db2d5 SHA512 f94c5dc24a1355a024833992d05a7c05d84367a004607c9d6c7aa6d4bc24dd93b11e0a061689eb521a8abe637472011a1a4c8e968c48ac8447457cffc4d2957d
 EBUILD grip-3.4.3.ebuild 1208 BLAKE2B 02a70b62576c3c42717e1492e3f2592a5e694722c4f527f5a34c39868df1b5307f812905d7c8d7e072cad9a0a2fa1138a198fde7e872394010dbac5d7ed8381f SHA512 7d9b2282e8c4ff9570fe382c2e8e99ae81505007a2da45379fc83682dcec1324efaf34d695effac0486563dad46a3e7cee8e007f2361e9c480a74e8d9fb6b88e
 EBUILD grip-3.5.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
-EBUILD grip-3.6.1.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
 EBUILD grip-3.6.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
+EBUILD grip-3.6.3.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/files/grip-3.3.1-implicit-declaration.patch b/media-sound/grip/files/grip-3.3.1-implicit-declaration.patch
deleted file mode 100644
index 2319b772a9b0..000000000000
--- a/media-sound/grip/files/grip-3.3.1-implicit-declaration.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- grip-3.3.1/src/status_window.c
-+++ grip-3.3.1/src/status_window.c
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
-+#include <string.h>
- #include <fcntl.h>
- #include <vte/vte.h>
- #include "status_window.h"
---- grip-3.3.1/src/tray.c
-+++ grip-3.3.1/src/tray.c
-@@ -20,6 +20,9 @@
-  * USA
-  */
- 
-+#include "cdplay.h"
-+#include "common.h"
-+#include "rip.h"
- #include "tray.h"
- #include "../pixmaps/rip1.xpm"
- #include "../pixmaps/menuplay.xpm"
---- grip-3.3.1/src/cdplay.c
-+++ grip-3.3.1/src/cdplay.c
-@@ -28,6 +28,7 @@
- #include "cddev.h"
- #include "discedit.h"
- #include "dialog.h"
-+#include "tray.h"
- #include "rip.h"
- #include "grip_id3.h"
- 
diff --git a/media-sound/grip/files/grip-3.3.1-invalid-genre-size.patch b/media-sound/grip/files/grip-3.3.1-invalid-genre-size.patch
deleted file mode 100644
index c826fc6e2e80..000000000000
--- a/media-sound/grip/files/grip-3.3.1-invalid-genre-size.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://bugs.gentoo.org/285105
-
---- grip-3.3.1/src/id3.c
-+++ grip-3.3.1/src/id3.c
-@@ -252,8 +252,8 @@
-       
-       if ( frames[ i ] ) {
- 	char *c_data = NULL;
--	char gen[ 5 ] = "(   )";
--	char trk[ 4 ] = "   ";
-+	char gen[ 6 ] = "(   )"; /* max unsigned char: 255 */
-+	char trk[ 3 ] = "  "; /* max CDDA tracks: 99 */
- 	
- 	switch( frameids[ i ] ) {
- 	case ID3FID_TITLE:
-@@ -278,12 +278,12 @@
- 	  
- 	case ID3FID_CONTENTTYPE:
- 	  c_data = gen;
--	  sprintf( gen, "(%d)", genre ); /* XXX */
-+	  snprintf( gen, 6, "(%d)", genre );
- 	  break;
- 	  
- 	case ID3FID_TRACKNUM:
- 	  c_data = trk;
--	  sprintf( trk, "%d", tracknum ); /* XXX */
-+	  snprintf( trk, 3, "%d", tracknum );
- 	  break;
- 	  
- 	default:
diff --git a/media-sound/grip/grip-3.3.1-r3.ebuild b/media-sound/grip/grip-3.3.1-r3.ebuild
deleted file mode 100644
index 9c72bbab7740..000000000000
--- a/media-sound/grip/grip-3.3.1-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="nls vorbis"
-
-RDEPEND=">=x11-libs/gtk+-2.2:2
-	x11-libs/vte:0
-	media-sound/lame
-	media-sound/cdparanoia
-	>=media-libs/id3lib-3.8.3
-	>=gnome-base/libgnomeui-2.2.0
-	>=gnome-base/orbit-2
-	net-misc/curl
-	vorbis? ( media-sound/vorbis-tools )"
-# gnome-extra/yelp, see bug 416843
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-implicit-declaration.patch
-	epatch "${FILESDIR}"/${P}-invalid-genre-size.patch #285105
-	# fix include syntax for newer versions of bash
-	sed -i '/[.] conftest[.]id3/s: c: ./c:' configure || die
-	elibtoolize
-}
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nl pl_PL pt_BR ru zh_CN zh_HK zh_TW
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS CREDITS ChangeLog README TODO
-}
diff --git a/media-sound/grip/grip-3.6.1.ebuild b/media-sound/grip/grip-3.6.3.ebuild
index 5f7555472651..b664cc4ecb4e 100644
--- a/media-sound/grip/grip-3.6.1.ebuild
+++ b/media-sound/grip/grip-3.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index 291268d83238..b8967d2f9f09 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,5 +1,3 @@
-DIST sound-juicer-3.22.1.tar.xz 1015520 BLAKE2B 20bf45a7b5acc11eef53e03011b66bb0054746973acf30940185c45608fce2a521a9ee60b7662f2be20ab1e27af567176c869718096cdff298a676d313e23511 SHA512 023bc24006930edc9c224e0d437d2c3dbd513af9c56737cca800e38e8f56d76686e5fdff13e9cdb81f27fe3dd87b274611484a8beb0f8705d4cde5d56a23f7a2
 DIST sound-juicer-3.24.0.tar.xz 1019588 BLAKE2B 04ba81aaa2e02fa0f6d7bfc1304be3dd1eb750c324c577b4a12809fbf43fc5ff74339750af3d99e91dc66bb0f0e4e6c33144177421f34258fb13c949a3fd5b63 SHA512 7bd158a4e3a7c3072513fc508f59cd70b6d9371cde142fdb58597e72b3687790b9368fc7e1a35fd8c7b49cb28703f8b2da4a789854f96cdc0af076278818a91f
-EBUILD sound-juicer-3.22.1.ebuild 1519 BLAKE2B 8b4fe482268894749cae76917790689c7b682b8edc8cf66d3b21c44e23101e8945f8cdd9c60881ac57a4d9a98694dcefd9fd9b9a0486625f128e595af8d27aa7 SHA512 122dac4f24e52c2ff263adf82c964248a2e94bfb0beacd96f66025ce42fea14b5fc6cd1853260d22f36f6df322dfb151cbd652a2d522a20f2ad4a69a157b3356
 EBUILD sound-juicer-3.24.0.ebuild 1494 BLAKE2B cf3b299bce2123b2397591f3ce9b850f2ba7240d350f43122f9020e30b91c3e304d96567be3f2ed97803491a40430e225671529d65955d9cb2e382b57f21adf0 SHA512 9ce32d6895e70b0be5d0c10fabbc3afcea6f3a70c97f7169c29016138fc025fde410494c30c3b5eaf80a1e0ca3a74e48f2fcba0d91b991229b54cfa42edad067
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/sound-juicer/sound-juicer-3.22.1.ebuild b/media-sound/sound-juicer/sound-juicer-3.22.1.ebuild
deleted file mode 100644
index 408ea9179672..000000000000
--- a/media-sound/sound-juicer/sound-juicer-3.22.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="CD ripper for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="debug flac test vorbis"
-
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.49.5:2[dbus]
-	>=x11-libs/gtk+-3.21.6:3
-	media-libs/libcanberra[gtk3]
-	>=app-cdr/brasero-2.90
-	sys-apps/dbus
-	gnome-base/gsettings-desktop-schemas
-
-	>=media-libs/libdiscid-0.4.0
-	>=media-libs/musicbrainz-5.0.1:5=
-
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0[vorbis?]
-	flac? ( media-plugins/gst-plugins-flac:1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs[cdda,udev]
-	|| (
-		media-plugins/gst-plugins-cdparanoia:1.0
-		media-plugins/gst-plugins-cdio:1.0 )
-	media-plugins/gst-plugins-meta:1.0
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.3 )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: gst macros does not take GST_INSPECT override anymore but we need a
-	# way to disable inspection due to gst-clutter always creating a GL context
-	# which is forbidden in sandbox since it needs write access to
-	# /dev/card*/dri
-	sed -e "s|\(gstinspect=\).*|\1$(type -P true)|" \
-		-i configure || die
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ')
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index f3b3be1b56dc..10e6838a2c99 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 0b927c077e88..2118c3be2a19 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,5 +1,3 @@
-DIST cheese-3.22.1.tar.xz 1843092 BLAKE2B ac96629373bf02fc8e92eaea372045c72b7a69230d970d346cb3fffccf3083d03e7d9a96b85281a6725a6e96f792c7ae993e598e47f074ceee39f43f50304d52 SHA512 193e421a0310a60871b8e0ac7ac28c16b7ed1caf0869904f803f45c4b15be74ab98dd88df54e5ce8c0885f466004d182450350295d3d89264e6f39035a389656
 DIST cheese-3.24.0.tar.xz 1846412 BLAKE2B bc18ee7009f4297df232c0ffdc40f5783891f721efe137e4127c7ea61595dcb033e98b415ea31e5918d93c408355e6534ddd95687a570b5abcc1c5ce0603d262 SHA512 c81d2f3038970f735960a2cbcec3a074ac2e9835d3f1fa6aae83d65299692d0464fed274e71caa59831a105430ce5db56557ea0cda27c72cdb050a59331b3107
-EBUILD cheese-3.22.1.ebuild 1957 BLAKE2B 26f7ddaf5b479b95d808f5e1936c8338242a5e72f9cdeb8962843416d5b114b332a52be4d8b4c587ab169a4f44e06fe39934f8c674dee803476c551e16b7c930 SHA512 bb8de1b7023f1d23272dae0ac89d7651705c78002d17af02625849e4c7cda99550349d52581a9b1f5c0e87cd39dbc784207197103baf1a3d79677c124b97ebed
 EBUILD cheese-3.24.0.ebuild 1975 BLAKE2B ca981be25844ffc3e14f6fa1ea762f06e74af1b9b99111a7fb864eb351b2277daf4f975ef23e0da95fdfc22bcd02f4542aa85d4a2798c7649a5ba9dcb05c2fdd SHA512 f9cf9f626d8ecce0c16c0b01b5d88d4f0e197a4633d3c28fa410689bd9a701b8a8ff0b0ac6cafeb0d813b3b258b5a09bb2e26eb1f452cfbae1f9cd8a8a70fb8b
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.22.1.ebuild b/media-video/cheese/cheese-3.22.1.ebuild
deleted file mode 100644
index 417f004eff11..000000000000
--- a/media-video/cheese/cheese-3.22.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.26"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
-HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
-
-LICENSE="GPL-2+"
-SLOT="0/8" # subslot = libcheese soname version
-IUSE="+introspection test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.90:2
-	>=x11-libs/gtk+-3.13.4:3[introspection?]
-	>=gnome-base/gnome-desktop-2.91.6:3=
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=media-libs/clutter-1.13.2:1.0[introspection?]
-	>=media-libs/clutter-gtk-0.91.8:1.0
-	media-libs/clutter-gst:3.0
-	media-libs/cogl:1.0=[introspection?]
-
-	media-video/gnome-video-effects
-	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
-	x11-libs/libX11
-	x11-libs/libXtst
-
-	>=media-libs/gstreamer-1.4:1.0[introspection?]
-	>=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/gst-plugins-bad-1.4:1.0
-	>=media-libs/gst-plugins-good-1.4:1.0
-
-	>=media-plugins/gst-plugins-jpeg-1.4:1.0
-	>=media-plugins/gst-plugins-v4l2-1.4:1.0
-	>=media-plugins/gst-plugins-vpx-1.4:1.0
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/docbook-xml-dtd:4.3
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	virtual/pkgconfig
-	x11-proto/xf86vidmodeproto
-	test? ( dev-libs/glib:2[utils] )
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		GST_INSPECT=$(type -P true) \
-		$(use_enable introspection) \
-		--disable-lcov \
-		--disable-static
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 94917c1d1786..4694ccc73515 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,7 +1,3 @@
-DIST mediainfo_0.7.99.tar.xz 1327592 BLAKE2B 42b377ad263fa1a73e9158740be014f0c5ce4f7a00b023b8d6950c3fc0545f7f68c68fc546b4aaeff819152ab9d72d1232dd87d75089557a617dbb24b0acd269 SHA512 7e50d0757c18e0eb07955a440250ca40fb5ee28dd4565528f8797f842611955942a4a6ff5b3c8736d4e24fe503272b2cd93de55187b2c3bca2c99021fe0330fa
-DIST mediainfo_17.10.tar.xz 1319988 BLAKE2B fb1f8199849dd6bc5834a1d975936504c3c08d34c247e059b2b1e0c8db9bbf642b77be9606dd8eb8f481b25cb82b44eddd6ec30ed9afbbd58e8570a734e9023b SHA512 8e24aa71054c8887dc9fc6f9ddb188dfcf61afa37549aed77f77cd13f31cf1ac2e56c2f4e5901cc4ab9d52403740d82b8081898515b4f81944566941906b63f2
 DIST mediainfo_17.12.tar.xz 1335676 BLAKE2B 66bf02f74a63b40446cb061fe6422c84d61cb10db53394a7b356e0c0b76a7c934548bf75a8e8e5556a3fab2bd2f65c2a8c3d57040bd404e5258f0cfa4f87bbd9 SHA512 3fd6c8538c7703e657c6c20fec3ba071e5575f6010f41188bdd46749ecad9bddfa2362a5f0df6c23aa98375bb9078f14704b0729d1c54174449871992b968ff9
-EBUILD mediainfo-0.7.99.ebuild 1548 BLAKE2B a07b5d07fc129aa58dcd70c682f8fbeb6d220304c527589adc544e97af335bea6a40518b6795ba3b5774e547c9b660bf2d22967bf01e9a3b6f99a9683c930ac3 SHA512 7b881f5f0199a8fb044fc5fdbe0856f769bb4e94a3a684e49cd69d089de4cb0921c1a4c47a971ddb3a99bc98e289806054e2581cf9c053b215b8867a85d511d6
-EBUILD mediainfo-17.10.ebuild 1550 BLAKE2B db359bd00c5932afee7ae290bf02588b270442a1eb054d023d6a9a9efc26d24aa59144bef9554d8c16196aea35dca10f8afade0b79691e81f3cfefff7616f47a SHA512 5eca56eedaecb066a123cb042b9ee4c53cc3ba629bc498e9bfb8dcfd519672b680766fc82af8d2fced59deed4a6fb7002322cfd565d790ba620a2782cc3af162
-EBUILD mediainfo-17.12.ebuild 1550 BLAKE2B db359bd00c5932afee7ae290bf02588b270442a1eb054d023d6a9a9efc26d24aa59144bef9554d8c16196aea35dca10f8afade0b79691e81f3cfefff7616f47a SHA512 5eca56eedaecb066a123cb042b9ee4c53cc3ba629bc498e9bfb8dcfd519672b680766fc82af8d2fced59deed4a6fb7002322cfd565d790ba620a2782cc3af162
+EBUILD mediainfo-17.12.ebuild 1548 BLAKE2B a07b5d07fc129aa58dcd70c682f8fbeb6d220304c527589adc544e97af335bea6a40518b6795ba3b5774e547c9b660bf2d22967bf01e9a3b6f99a9683c930ac3 SHA512 7b881f5f0199a8fb044fc5fdbe0856f769bb4e94a3a684e49cd69d089de4cb0921c1a4c47a971ddb3a99bc98e289806054e2581cf9c053b215b8867a85d511d6
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-0.7.99.ebuild b/media-video/mediainfo/mediainfo-0.7.99.ebuild
deleted file mode 100644
index a6625f97df57..000000000000
--- a/media-video/mediainfo/mediainfo-0.7.99.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit eutils autotools wxwidgets
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/libzen-0.4.37
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-pkg_setup() {
-	TARGETS="CLI"
-	use wxwidgets && TARGETS+=" GUI"
-}
-
-src_prepare() {
-	eapply_user
-
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		sed -i -e "s:-O2::" configure.ac
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-		dodoc "${S}"/History_${target}.txt
-		if [[ ${target} == "GUI" ]]; then
-			newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
-			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
-		fi
-	done
-}
diff --git a/media-video/mediainfo/mediainfo-17.10.ebuild b/media-video/mediainfo/mediainfo-17.10.ebuild
deleted file mode 100644
index f3350adbb933..000000000000
--- a/media-video/mediainfo/mediainfo-17.10.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit eutils autotools wxwidgets
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/libzen-0.4.37
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-pkg_setup() {
-	TARGETS="CLI"
-	use wxwidgets && TARGETS+=" GUI"
-}
-
-src_prepare() {
-	eapply_user
-
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		sed -i -e "s:-O2::" configure.ac
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-		dodoc "${S}"/History_${target}.txt
-		if [[ ${target} == "GUI" ]]; then
-			newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
-			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
-		fi
-	done
-}
diff --git a/media-video/mediainfo/mediainfo-17.12.ebuild b/media-video/mediainfo/mediainfo-17.12.ebuild
index f3350adbb933..a6625f97df57 100644
--- a/media-video/mediainfo/mediainfo-17.12.ebuild
+++ b/media-video/mediainfo/mediainfo-17.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index e653c6077d7d..2574c07dc60d 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,5 +1,3 @@
-DIST totem-3.22.1.tar.xz 1982788 BLAKE2B fe9dae757201dc0f0c39f635f192322ec12fff5f3f02202771dc6f97d83f3e5865db757b3a42e98a0c172f43f0c82198e51be88e8b84915670a4f81af600e120 SHA512 919f313d2af1d72256ccfa1fe41fe897427b7558c2308da8c257e5b5439f90af9a47a905dd692ab4cabec730a5be0e55710932f91bc6e2f63949f5d83c840e97
 DIST totem-3.24.0.tar.xz 1987260 BLAKE2B 81cb8c359b2225148a18f7a5c6ae9990cbe2e2f3b9a6a31012c9c8c0920c0cea6bad0a5d9407a79530fadf00fb845fe9e6aa8dbc84d0f8d6e84fbc144d86bc9e SHA512 488db91e09b7f5947e81cb5474444c753367542820777faab561582707b012e664f232d3810d543dfbe0823adf3d8302c2fe6cc387f4225a362d15a6df8b4342
-EBUILD totem-3.22.1-r1.ebuild 3748 BLAKE2B 2aa68ad85ae5df0032e624b26845d61f21419dd0e8b61f65be9a74b2bcae3a027ee31bc21e8e5354c58579b7d2a3b9a67eb602906d631595d6194803e32d1de0 SHA512 99c5c25872e3b045788e005c1563b9cc24c6dbf4a797ad41ec077f329ada4daddebcef4ac9f878eb65fdf433c7a6debcd410ab349c0dde1e2d6b9f2e783b91a4
 EBUILD totem-3.24.0.ebuild 3752 BLAKE2B c8bc2b83db6e8d0e72f83cc23a20a109562d4e61501c9ab1053a6e988524c5a283e19b4b44571d69b334e027436d2fd619ff2217837e23d9f19db67ce56bd37a SHA512 0cd43a1970759716c09a89a8c041b20cb0cee1773bb2244218d9468f28e5e40cb314e52a2807018d24a164ed2a4d3752512ca07d6ae42eb9324d6e4b903eab64
 MISC metadata.xml 1101 BLAKE2B 610eeeef89a5e7d258da67491891c1fe71b9c86174cb50136591d852c824825ea6c4ddc7725d90101adb0b24a8b9619b40fe2121a420a0e23e2dabb98c18bd80 SHA512 5daad91ed7d0effe52586d90af1f7b6bf78ef5987a7f77f9d2e5aa2eebebdade5bb8556586f2082029e1a43c68e60871e79b38f65ad22b6679d30f7a241fac74
diff --git a/media-video/totem/totem-3.22.1-r1.ebuild b/media-video/totem/totem-3.22.1-r1.ebuild
deleted file mode 100644
index 15a878d7bf52..000000000000
--- a/media-video/totem/totem-3.22.1-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python{3_4,3_5} )
-PYTHON_REQ_USE="threads"
-
-inherit autotools gnome2 python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="debug +introspection lirc nautilus +python test"
-# see bug #359379
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
-
-# FIXME:
-# Runtime dependency on gnome-session-2.91
-COMMON_DEPEND="
-	>=dev-libs/glib-2.35:2[dbus]
-	>=dev-libs/libpeas-1.1[gtk]
-	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
-	>=media-libs/clutter-1.17.3:1.0[gtk]
-	>=media-libs/clutter-gst-2.99.2:3.0
-	>=media-libs/clutter-gtk-1.8.1:1.0
-	>=x11-libs/cairo-1.14
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.19.4:3[introspection?]
-
-	>=media-libs/grilo-0.3.0:0.3[playlist]
-	>=media-libs/gstreamer-1.6.0:1.0
-	>=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango]
-	media-libs/gst-plugins-good:1.0
-
-	x11-libs/libX11
-
-	gnome-base/gnome-desktop:3=
-	gnome-base/gsettings-desktop-schemas
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	lirc? ( app-misc/lirc )
-	nautilus? ( >=gnome-base/nautilus-2.91.3 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/grilo-plugins:0.3
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	x11-themes/adwaita-icon-theme
-	python? (
-		>=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=x11-libs/gtk+-3.5.2:3[introspection] )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf needs:
-#	app-text/yelp-tools
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-# docbook-xml-dtd is needed for user doc
-# Prevent dev-python/pylint dep, bug #482538
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prevent pylint usage by tests, bug #482538
-	sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
-
-	eautoreconf
-	gnome2_src_prepare
-
-	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
-	# gst-inspect causes sandbox violations when a plugin needs write access to
-	# /dev/dri/card* in its init phase.
-	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
-		-i configure || die
-}
-
-src_configure() {
-	# Disabled: sample-python, sample-vala
-	local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
-	plugins+=",im-status,gromit,media-player-keys,ontop"
-	plugins+=",properties,recent,rotation,screensaver,screenshot"
-	plugins+=",skipto,variable-rate,vimeo"
-	use lirc && plugins+=",lirc"
-	use nautilus && plugins+=",save-file"
-	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
-
-	# pylint is checked unconditionally, but is only used for make check
-	# appstream-util overriding necessary until upstream fixes their macro
-	# to respect configure switch
-	gnome2_src_configure \
-		--disable-run-in-source-tree \
-		--disable-static \
-		--enable-easy-codec-installation \
-		--enable-vala \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable python) \
-		PYLINT=$(type -P true) \
-		VALAC=$(type -P true) \
-		APPSTREAM_UTIL=$(type -P true) \
-		--with-plugins=${plugins}
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index eb37a0b4f421..00f8e24955a2 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 3dbedec1f4b4..328d4feb559a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Feb 2018 07:38:11 +0000
+Sun, 04 Feb 2018 11:38:12 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 1240c558dc2a..44c5974a78f4 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 416281 BLAKE2B 9f5d0005cdae01ce5134efdc393aef2fa9e4486317293d473758f4b6f8a874ce6ac4b387a4d8c46338853ea09d96165ac399c906f15c28230dbfd8e95d4cdf26 SHA512 abd62c080ba1aa5d4609732620883228f3aa81aa544122207a98ca33c50401945a5d524cfb277af684f89fcc0fb6bc394206dcd88925ddccd9d1d6a9ee4a9949
-TIMESTAMP 2018-02-03T07:38:15Z
+TIMESTAMP 2018-02-04T11:38:15Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlp1ZudfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlp28KdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBaUw//YecLiB27DnxN85koUnILHHXUfhtukvn1+8v6v/KEZzwoBQbopsFvxthB
-pjOGgCcZBXLb2/5w0ZjeeBwE5ccF51z0JZnIRfS1okswR7My3oDSpAqb3Sp+gWZh
-H+Xu/ZGK9s8wjuK68iYP7sK0+Sw9RmH24qvGGW8MMLb/NogsW59Ut2a3kmLoH628
-WN+St62GY4eDygKLKhFSC4d7VET3m3xiAmtoc3qZZJiIXwsgkcrQw4UF1+Gwl5d7
-rpV1xRNXOJCqwEJeBvKiPIExDzFwDgsb1SF88JEva7OCDgYzxUJph6s7ZZuR2WV7
-nyTPkQ3RHX7oSiC34laAqE7eVQSB2bpJLeAdN/a2WYRskKtmyrZTZHQZxkLNHdZS
-eEJLdCGLbYzV44D6DfcTs+Bsr1ax2TTFzMHK/pWq5E3C5ngsv0Fo/1blw+5jMXcy
-ZtxHyP6oiiQPRs3zNci/KLDb6WaBpfFrUoBg8SAHXik7hxFYai5V/Z622t1iV7iU
-BIVdBGamgL6ukWH+fwDkU71C/oap29Hod0jbv0AmfNm30+Y3uXONv6IDsVx5PHhj
-FgwAyxv+T3ZAC6k62unesnagNpvexx4rZtQTa9glRwgII8YxybeQzN671dAQwG6H
-ugQT9eL5FKc1xDXHNVGY+jMPaSYXSA5KSjYyQ1v9NK44bWM5BXE=
-=vN/C
+klC4Hw/+PUETOCwWPswWP3/VY6pza2cYgIOPmbS4l/h1p6TCoRdmbW9dYOsHmGTV
+HuCm5xqC2IFSzKkU1kp4CUeLTTIjvHR8ugjKu1/Oqq6vKSDLEv7NJKNDWmLsygWI
+5RAz2OWYoWlWBmMiQrkytEHgxNA8IhoINboqjChcKA0nhPYferwBRjcuyAHdfi4c
+DFbIz0GPQgngg8JCbZ9Skt0s41+Ca0m/TiO/oQX29glfFfP482zLOAx6wHBq//Ai
+vqP0CVTEXUA3t2xuX9RTdrBapdPLy1/psPku/3MLcUYThY7v51p0VJjCAgZZ76+z
+GChIDcH25vNq7cpn8b5Oz8WGWNvI7NKAObaxXpTjjPI6+8K76fR0tCmXCEdatxMw
+fYeWVUwFZ8Jbdz40jV1e4+H0LewJEa5iL8Rcz/dfcV9vx/5ZZiODSxk4D+Hd2usx
+G7qqato3DepjgvhIZ1YAVP575b8XZcntB9YBXKZvUjAkyvBcjTi+lckhcNd0BZFv
+NOiSyI0Sx1O/Kvvriewrag93TKKIycnp8k5tVjFPuK7QRZqp85yqZbzkD+WxcRP1
+Aqhur7CCQZn5T67b09NRcv2TmmDILPw6InbpaNO8jpxCZvNmZsLd8fhKp0/LxuR3
+4aqPP7N6ZZPaQw/RI9Hzwwzj+qTcaqJH5ZRystNqTg91e3Ec1cQ=
+=U2Gm
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3dbedec1f4b4..328d4feb559a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Feb 2018 07:38:11 +0000
+Sun, 04 Feb 2018 11:38:12 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 90c808018c01..edf9d058cc4d 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index caf3b74e57a4..7d1b17b63ebd 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/systemrescuecd-x86-5.2.0 b/metadata/md5-cache/app-admin/systemrescuecd-x86-5.2.0
new file mode 100644
index 000000000000..55ab8838217a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/systemrescuecd-x86-5.2.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
+DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
+EAPI=6
+HOMEPAGE=http://www.sysresccd.org/
+IUSE=+isohybrid
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=5.2.0
+SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/5.2.0/systemrescuecd-x86-5.2.0.iso
+_md5_=b1199bbecf4da8961eb1e01c5c78ddda
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index ea05b56a20d2..42917405dd8f 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/openpgp-keys-gentoo-mirror-20180203 b/metadata/md5-cache/app-crypt/openpgp-keys-gentoo-mirror-20180203
new file mode 100644
index 000000000000..a04bbdacde74
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/openpgp-keys-gentoo-mirror-20180203
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP key used to sign gentoo-mirror commits
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Repository_mirror_and_CI
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-mirror.asc.20180203.gz
+_md5_=03a78e9a9f5a678a40dd55d05e2ae30a
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 33242388c29d..925f6ac7776d 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/circe-2.7 b/metadata/md5-cache/app-emacs/circe-2.7
new file mode 100644
index 000000000000..e02e3c204b2e
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/circe-2.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-24
+DESCRIPTION=A great IRC client for Emacs
+EAPI=6
+HOMEPAGE=https://github.com/jorgenschaefer/circe http://www.emacswiki.org/emacs/Circe
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-24
+SLOT=0
+SRC_URI=https://github.com/jorgenschaefer/circe/archive/v2.7.tar.gz -> circe-2.7.tar.gz
+_eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=97ef03d43dfd32424e1dd15f6456fb83
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index e2c5b694b836..ea2b8f4e99a9 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72 b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2
index e4222ad529b0..27ea1000ba61 100644
--- a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72
+++ b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/iproute2 sys-apps/ethtool sys-apps/which acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) bluetooth? ( net-wireless/bluez:= )
 SLOT=0
-SRC_URI=https://github.com/rickysarraf/laptop-mode-tools/releases/download/1.72/laptop-mode-tools_1.72.tar.gz
+SRC_URI=https://github.com/rickysarraf/laptop-mode-tools/releases/download/1.72.2/laptop-mode-tools_1.72.2.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
 _md5_=62202d3b9a9f2a3b6ca7b130854372dd
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index faf6ba7bf375..188e005e8454 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/ranger-1.8.1 b/metadata/md5-cache/app-misc/ranger-1.8.1
index 22b63c4174d0..8641aec65d1c 100644
--- a/metadata/md5-cache/app-misc/ranger-1.8.1
+++ b/metadata/md5-cache/app-misc/ranger-1.8.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A vim-inspired file manager for the console
 EAPI=6
-HOMEPAGE=http://ranger.nongnu.org/
+HOMEPAGE=https://ranger.github.io/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=http://nongnu.org/ranger/ranger-1.8.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=313b13063b9e51c3e20b0a7f37bb6390
+_md5_=8f954026b7d3f6a2e94f15e491a6ed5d
diff --git a/metadata/md5-cache/app-misc/ranger-1.9.0_beta5 b/metadata/md5-cache/app-misc/ranger-1.9.0_beta5
index e2bb7ec81eb4..a0153bfee695 100644
--- a/metadata/md5-cache/app-misc/ranger-1.9.0_beta5
+++ b/metadata/md5-cache/app-misc/ranger-1.9.0_beta5
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A vim-inspired file manager for the console
 EAPI=6
-HOMEPAGE=http://ranger.nongnu.org/
+HOMEPAGE=https://ranger.github.io/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://github.com/ranger/ranger/archive/v1.9.0b5.tar.gz -> ranger-1.9.0_beta5.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f65db16b10add0d0612432c6479eb3a2
+_md5_=925c75de6b3ba9f1f8149bba4d9386f1
diff --git a/metadata/md5-cache/app-misc/ranger-1.9.0_beta6 b/metadata/md5-cache/app-misc/ranger-1.9.0_beta6
new file mode 100644
index 000000000000..21381ab2f9b6
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ranger-1.9.0_beta6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A vim-inspired file manager for the console
+EAPI=6
+HOMEPAGE=https://ranger.github.io/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/ranger/ranger/archive/v1.9.0b6.tar.gz -> ranger-1.9.0_beta6.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=85c83f37c63ff72c9cf2504c1b491623
diff --git a/metadata/md5-cache/app-misc/ranger-9999 b/metadata/md5-cache/app-misc/ranger-9999
index aca08e614ca4..9c1285ad7c4e 100644
--- a/metadata/md5-cache/app-misc/ranger-9999
+++ b/metadata/md5-cache/app-misc/ranger-9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A vim-inspired file manager for the console
 EAPI=6
-HOMEPAGE=http://ranger.nongnu.org/
+HOMEPAGE=https://ranger.github.io/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=GPL-3
 RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cb5ba31ef09d9bdd3487e3faffc9bfce
+_md5_=87600f459fdacd40b25b16f41d2aa1ae
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 1b06dca8f124..edc754364d99 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/libreoffice-5.4.2.2 b/metadata/md5-cache/app-office/libreoffice-5.4.2.2
deleted file mode 100644
index 95284777c216..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-5.4.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) kde? ( dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4 )
-DESCRIPTION=A full office productivity suite
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java kde python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-5.4*
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-5.4.2.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.4.2.2.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.2//libreoffice-5.4.2.2.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.2//libreoffice-help-5.4.2.2.tar.xz https://download.documentfoundation.org/libreoffice/old/5.4.2.2//libreoffice-5.4.2.2.tar.xz https://download.documentfoundation.org/libreoffice/old/5.4.2.2//libreoffice-help-5.4.2.2.tar.xz collada? ( https://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4dfb784edf05c1d9fd6ce5ec6dabfe1e
diff --git a/metadata/md5-cache/app-office/libreoffice-5.4.4.2 b/metadata/md5-cache/app-office/libreoffice-5.4.4.2
index 9bcf742d5473..f76ec99704f7 100644
--- a/metadata/md5-cache/app-office/libreoffice-5.4.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-5.4.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=A full office productivity suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND==app-office/libreoffice-l10n-5.4*
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/oxygen-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-5.4.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.4.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.4//libreoffice-5.4.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.4//libreoffice-help-5.4.4.2.tar.xz https://download.documentfoundation.org/libreoffice/old/5.4.4.2//libreoffice-5.4.4.2.tar.xz https://download.documentfoundation.org/libreoffice/old/5.4.4.2//libreoffice-help-5.4.4.2.tar.xz collada? ( https://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4ab8c75da9cf74c4058811725aaf14e5
+_md5_=b91e4d3b66c456225c4beef07376ec01
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.0.3 b/metadata/md5-cache/app-office/libreoffice-6.0.0.3
index 4c2b8e23437c..8ee6645adaf8 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.0.3
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.0.3
@@ -4,6 +4,7 @@ DESCRIPTION=A full office productivity suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND==app-office/libreoffice-l10n-6.0*
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/oxygen-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -11,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.0.3-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.0.3.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.0.3.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.0//libreoffice-6.0.0.3.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.0//libreoffice-help-6.0.0.3.tar.xz https://download.documentfoundation.org/libreoffice/old/6.0.0.3//libreoffice-6.0.0.3.tar.xz https://download.documentfoundation.org/libreoffice/old/6.0.0.3//libreoffice-help-6.0.0.3.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5316ced36d3753f677ddcdd1cc193582
+_md5_=246b0f1a5c460dabffa518d74494c936
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-5.4.4.2 b/metadata/md5-cache/app-office/libreoffice-bin-5.4.4.2
index a6a0cb43ad2d..9fd4c5199880 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-5.4.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-5.4.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=A full office productivity suite. Binary package
 EAPI=6
 HOMEPAGE=http://www.libreoffice.org
 IUSE=gnome java kde elibc_FreeBSD java python_targets_python3_5
-KEYWORDS=-* ~amd64 x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-3
 PDEPEND==app-office/libreoffice-l10n-5.4.4.2*
 RDEPEND=app-text/hunspell:0/1.6 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.65.0 dev-libs/icu:0/60.2 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-6.4.0 >=sys-libs/glibc-2.25 virtual/jpeg:62 kde? ( >=kde-frameworks/kdelibs-4.14.37:4 >=dev-qt/qtcore-4.8.7-r3:4 >=dev-qt/qtgui-4.8.7:4 ) python_targets_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.0d:0 >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl net-print/cups dev-libs/dbus-glib gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 gnome? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) kde? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) !app-office/libreoffice !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/oxygen-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-5.4.4.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-5.4.4.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-5.4.4.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-5.4.4.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-5.4.4.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-5.4.4.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-5.4.4.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-5.4.4.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-5.4.4.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-5.4.4.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-5.4.4.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-5.4.4.2.xd3 ) ) ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f5a7bf202295a560d1a48ed654ec3e32
+_md5_=ea6b5c0d06f2748c132fe59dcf98e2aa
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.4.2 b/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.4.2
index 3545bcbd50a2..b4b4b2747526 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug
 EAPI=6
 HOMEPAGE=http://www.libreoffice.org
 IUSE=gnome java kde
-KEYWORDS=-* ~amd64 x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-3
 RDEPEND==app-office/libreoffice-bin-5.4.4.2[gnome=,java=,kde=]
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-5.4.4.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-5.4.4.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-java-5.4.4.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-5.4.4.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-java-5.4.4.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-java-5.4.4.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-5.4.4.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-5.4.4.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-java-5.4.4.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-5.4.4.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-java-5.4.4.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-java-5.4.4.2.xd3 ) ) ) )
-_md5_=07f70bc9962278d1bffa67f57e62e179
+_md5_=17994187814eaede68e9a24c429eaef9
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-5.4.4.2 b/metadata/md5-cache/app-office/libreoffice-l10n-5.4.4.2
index 239455b3e937..b0573784de50 100644
--- a/metadata/md5-cache/app-office/libreoffice-l10n-5.4.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-5.4.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Translations for the Libreoffice suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
-KEYWORDS=~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 RDEPEND=app-text/hunspell
 RESTRICT=strip
 SLOT=0
 SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.4/rpm/x86/LibreOffice_5.4.4_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.4/rpm/x86/LibreOffice_5.4.4.2_Linux_x86_rpm_langpack_zu.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ebcc748aec09bacac268bd23e80a544a
+_md5_=282f3803470f7e9646bc04a8a91e4e82
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.0.0.3 b/metadata/md5-cache/app-office/libreoffice-l10n-6.0.0.3
index b089013a0760..16c7077da1bc 100644
--- a/metadata/md5-cache/app-office/libreoffice-l10n-6.0.0.3
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.0.0.3
@@ -4,10 +4,11 @@ DESCRIPTION=Translations for the Libreoffice suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 RDEPEND=app-text/hunspell
 RESTRICT=strip
 SLOT=0
 SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.0/rpm/x86/LibreOffice_6.0.0_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.0/rpm/x86/LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_zu.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=cabe02a872af6c4251456a558b648c05
+_md5_=90d20d65c156742febded9ceda8ca7da
diff --git a/metadata/md5-cache/app-office/skrooge-2.11.0 b/metadata/md5-cache/app-office/skrooge-2.11.0
new file mode 100644
index 000000000000..9e6d00b93e96
--- /dev/null
+++ b/metadata/md5-cache/app-office/skrooge-2.11.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) kde? ( >=kde-frameworks/krunner-5.40.0:5 ) ofx? ( dev-libs/libofx ) >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 dev-libs/libxslt virtual/pkgconfig x11-misc/shared-mime-info designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 >=dev-qt/designer-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Personal finances manager, aiming at being simple and intuitive
+EAPI=6
+HOMEPAGE=https://skrooge.org/
+IUSE=activities designer kde ofx test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) kde? ( >=kde-frameworks/krunner-5.40.0:5 ) ofx? ( dev-libs/libofx ) !app-office/skrooge:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=test? ( designer )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/skrooge/skrooge-2.11.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1f44b7ab8bd304a9ae314727aa9ba91c
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index fdf7f850fc7d..acd4a0256c25 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/libqxp-0.0.0 b/metadata/md5-cache/app-text/libqxp-0.0.0
deleted file mode 100644
index 443eebbf1086..000000000000
--- a/metadata/md5-cache/app-text/libqxp-0.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/librevenge dev-libs/icu:= dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Library parsing QuarkXpress documents
-EAPI=6
-HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libqxp
-IUSE=debug doc test tools
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=dev-libs/librevenge dev-libs/icu:=
-SLOT=0
-SRC_URI=https://dev-www.libreoffice.org/src/libqxp/libqxp-0.0.0.tar.xz
-_md5_=901bb01f449d5d8cf04d4b76d7e0a46d
diff --git a/metadata/md5-cache/app-text/poppler-0.62.0-r1 b/metadata/md5-cache/app-text/poppler-0.62.0-r1
index fb9857cd9132..ce603b953667 100644
--- a/metadata/md5-cache/app-text/poppler-0.62.0-r1
+++ b/metadata/md5-cache/app-text/poppler-0.62.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=6
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
 RESTRICT=test
 SLOT=0/73
 SRC_URI=https://poppler.freedesktop.org/poppler-0.62.0.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7aba489ecccffde1275e2517a8810cb0
+_md5_=fe9ee33a998595940da1fedbe212b66d
diff --git a/metadata/md5-cache/app-text/texlive-core-2016-r6 b/metadata/md5-cache/app-text/texlive-core-2016-r6
index 8806abcf9571..323b9d16cf11 100644
--- a/metadata/md5-cache/app-text/texlive-core-2016-r6
+++ b/metadata/md5-cache/app-text/texlive-core-2016-r6
@@ -4,10 +4,10 @@ DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=http://tug.org/texlive/
 IUSE=cjk X doc source tk +luajittex xetex
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXaw ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.58.0:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0 xetex? ( >=media-libs/harfbuzz-0.9.20[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.1 cjk? ( >=dev-libs/ptexenc-1.3.4_p20160523 ) >=app-text/ps2pkm-1.8_p20160523 >=app-text/dvipsk-5.996_p20160523 >=dev-tex/bibtexu-3.71_p20160523 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20160523-source.tar.xz mirror://gentoo/texlive-core-patches-65.1.tar.xz mirror://gentoo/texlive-module-tetex-2016.tar.xz mirror://gentoo/texlive-module-hyphen-base-2016.tar.xz mirror://gentoo/texlive-module-texconfig-2016.tar.xz mirror://gentoo/texlive-module-gsftopk-2016.tar.xz mirror://gentoo/texlive-module-texlive.infra-2016.tar.xz mirror://gentoo/texlive-module-a2ping-2016.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2016.tar.xz mirror://gentoo/texlive-module-arara-2016.tar.xz mirror://gentoo/texlive-module-asymptote-2016.tar.xz mirror://gentoo/texlive-module-bundledoc-2016.tar.xz mirror://gentoo/texlive-module-checklistings-2016.tar.xz mirror://gentoo/texlive-module-ctan_chk-2016.tar.xz mirror://gentoo/texlive-module-ctanify-2016.tar.xz mirror://gentoo/texlive-module-ctanupload-2016.tar.xz mirror://gentoo/texlive-module-ctie-2016.tar.xz mirror://gentoo/texlive-module-cweb-2016.tar.xz mirror://gentoo/texlive-module-de-macro-2016.tar.xz mirror://gentoo/texlive-module-dtl-2016.tar.xz mirror://gentoo/texlive-module-dtxgen-2016.tar.xz mirror://gentoo/texlive-module-dvi2tty-2016.tar.xz mirror://gentoo/texlive-module-dviasm-2016.tar.xz mirror://gentoo/texlive-module-dvicopy-2016.tar.xz mirror://gentoo/texlive-module-dvidvi-2016.tar.xz mirror://gentoo/texlive-module-dviljk-2016.tar.xz mirror://gentoo/texlive-module-dvipos-2016.tar.xz mirror://gentoo/texlive-module-findhyph-2016.tar.xz mirror://gentoo/texlive-module-fragmaster-2016.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2016.tar.xz mirror://gentoo/texlive-module-hyphenex-2016.tar.xz mirror://gentoo/texlive-module-installfont-2016.tar.xz mirror://gentoo/texlive-module-lacheck-2016.tar.xz mirror://gentoo/texlive-module-latex-git-log-2016.tar.xz mirror://gentoo/texlive-module-latex-papersize-2016.tar.xz mirror://gentoo/texlive-module-latex2man-2016.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2016.tar.xz mirror://gentoo/texlive-module-latexfileversion-2016.tar.xz mirror://gentoo/texlive-module-latexpand-2016.tar.xz mirror://gentoo/texlive-module-latexindent-2016.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2016.tar.xz mirror://gentoo/texlive-module-ltximg-2016.tar.xz mirror://gentoo/texlive-module-listings-ext-2016.tar.xz mirror://gentoo/texlive-module-make4ht-2016.tar.xz mirror://gentoo/texlive-module-match_parens-2016.tar.xz mirror://gentoo/texlive-module-mflua-2016.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2016.tar.xz mirror://gentoo/texlive-module-patgen-2016.tar.xz mirror://gentoo/texlive-module-pdfbook2-2016.tar.xz mirror://gentoo/texlive-module-pdfcrop-2016.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2016.tar.xz mirror://gentoo/texlive-module-pdftools-2016.tar.xz mirror://gentoo/texlive-module-pdfxup-2016.tar.xz mirror://gentoo/texlive-module-pfarrei-2016.tar.xz mirror://gentoo/texlive-module-pkfix-2016.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2016.tar.xz mirror://gentoo/texlive-module-purifyeps-2016.tar.xz mirror://gentoo/texlive-module-seetexk-2016.tar.xz mirror://gentoo/texlive-module-srcredact-2016.tar.xz mirror://gentoo/texlive-module-sty2dtx-2016.tar.xz mirror://gentoo/texlive-module-synctex-2016.tar.xz mirror://gentoo/texlive-module-tex4ebook-2016.tar.xz mirror://gentoo/texlive-module-texcount-2016.tar.xz mirror://gentoo/texlive-module-texdef-2016.tar.xz mirror://gentoo/texlive-module-texdiff-2016.tar.xz mirror://gentoo/texlive-module-texdirflatten-2016.tar.xz mirror://gentoo/texlive-module-texdoc-2016.tar.xz mirror://gentoo/texlive-module-texfot-2016.tar.xz mirror://gentoo/texlive-module-texliveonfly-2016.tar.xz mirror://gentoo/texlive-module-texloganalyser-2016.tar.xz mirror://gentoo/texlive-module-texosquery-2016.tar.xz mirror://gentoo/texlive-module-texware-2016.tar.xz mirror://gentoo/texlive-module-tie-2016.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2016.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2016.tar.xz mirror://gentoo/texlive-module-web-2016.tar.xz mirror://gentoo/texlive-module-collection-binextra-2016.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2016.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2016.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2016.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2016.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2016.tar.xz mirror://gentoo/texlive-module-arara.doc-2016.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2016.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2016.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2016.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2016.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2016.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2016.tar.xz mirror://gentoo/texlive-module-ctie.doc-2016.tar.xz mirror://gentoo/texlive-module-cweb.doc-2016.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2016.tar.xz mirror://gentoo/texlive-module-dtl.doc-2016.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2016.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2016.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2016.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2016.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2016.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2016.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2016.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2016.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2016.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2016.tar.xz mirror://gentoo/texlive-module-installfont.doc-2016.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2016.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2016.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2016.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2016.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2016.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2016.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2016.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2016.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2016.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2016.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2016.tar.xz mirror://gentoo/texlive-module-patgen.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2016.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2016.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2016.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2016.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2016.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2016.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2016.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2016.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2016.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2016.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2016.tar.xz mirror://gentoo/texlive-module-synctex.doc-2016.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2016.tar.xz mirror://gentoo/texlive-module-texcount.doc-2016.tar.xz mirror://gentoo/texlive-module-texdef.doc-2016.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2016.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2016.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2016.tar.xz mirror://gentoo/texlive-module-texfot.doc-2016.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2016.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2016.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2016.tar.xz mirror://gentoo/texlive-module-texware.doc-2016.tar.xz mirror://gentoo/texlive-module-tie.doc-2016.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2016.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-web.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2016.tar.xz mirror://gentoo/texlive-module-arara.source-2016.tar.xz mirror://gentoo/texlive-module-checklistings.source-2016.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2016.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2016.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2016.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2016.tar.xz mirror://gentoo/texlive-module-pythontex.source-2016.tar.xz mirror://gentoo/texlive-module-texdef.source-2016.tar.xz mirror://gentoo/texlive-module-texosquery.source-2016.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=77fda6bbb3a0de7f4ad5c02eb40f64bf
+_md5_=180fdd2eb1486df5fc93e097f6fed52f
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 6e56f1103920..675c7296425e 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.52.0 b/metadata/md5-cache/dev-cpp/glibmm-2.52.0
deleted file mode 100644
index 6d24a693dc35..000000000000
--- a/metadata/md5-cache/dev-cpp/glibmm-2.52.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=C++ interface for glib2
-EAPI=6
-HOMEPAGE=https://www.gtkmm.org
-IUSE=doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1+ GPL-2+
-RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=2
-SRC_URI=mirror://gnome/sources/glibmm/2.52/glibmm-2.52.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e72159a7f45ec6f12eb14ef3ec38062
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 20f9f08d4623..cd645778ed45 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.84 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.84
new file mode 100644
index 000000000000..821974704da4
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.84
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 >=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=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.0
+SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.84/src/apache-tomcat-7.0.84-src.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=0636fb3665990e69504a49a79f912971
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.49 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.49
new file mode 100644
index 000000000000..f1d34eea0bc4
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.49
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.7 >=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=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+EAPI=5
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.49/src/apache-tomcat-8.0.49-src.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b1ad69f3076f6270770b17ee90044c32
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.27 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.27
new file mode 100644
index 000000000000..83f2fca19afc
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.27
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.7 >=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=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.27/src/apache-tomcat-8.5.27-src.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f5f958932af21631e515939139c1bfb6
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 7111ac1eac7e..93339f51e27c 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/boost-1.65.0 b/metadata/md5-cache/dev-libs/boost-1.65.0
index 6f419b696c4d..1ed7206072ff 100644
--- a/metadata/md5-cache/dev-libs/boost-1.65.0
+++ b/metadata/md5-cache/dev-libs/boost-1.65.0
@@ -4,7 +4,7 @@ DESCRIPTION=Boost Libraries for C++
 EAPI=6
 HOMEPAGE=http://www.boost.org/
 IUSE=context debug doc icu +nls mpi python static-libs +threads tools python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt
 LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-admin/eselect-boost
 REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/1.65.0
 SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fb3713bf10b7ac63541d3674dc7ca363
+_md5_=70756710c6516b52454f80289101bd2a
diff --git a/metadata/md5-cache/dev-libs/gmime-3.0.2 b/metadata/md5-cache/dev-libs/gmime-3.0.2
deleted file mode 100644
index d69472d09218..000000000000
--- a/metadata/md5-cache/dev-libs/gmime-3.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= ) >=dev-util/gtk-doc-am-1.8 virtual/libiconv virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) test? ( app-crypt/gnupg ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Utilities for creating and parsing messages using MIME
-EAPI=6
-HOMEPAGE=http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/
-IUSE=crypt doc idn static-libs test vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= )
-SLOT=3.0
-SRC_URI=mirror://gnome/sources/gmime/3.0/gmime-3.0.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=920da965e8eeebe8d6b9524df7e45386
diff --git a/metadata/md5-cache/dev-libs/gmime-3.0.3 b/metadata/md5-cache/dev-libs/gmime-3.0.3
deleted file mode 100644
index 34dc6b2762bd..000000000000
--- a/metadata/md5-cache/dev-libs/gmime-3.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= ) >=dev-util/gtk-doc-am-1.8 virtual/libiconv virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) test? ( app-crypt/gnupg ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Utilities for creating and parsing messages using MIME
-EAPI=6
-HOMEPAGE=http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/
-IUSE=crypt doc idn static-libs test vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= )
-SLOT=3.0
-SRC_URI=mirror://gnome/sources/gmime/3.0/gmime-3.0.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=920da965e8eeebe8d6b9524df7e45386
diff --git a/metadata/md5-cache/dev-libs/icu-60.2 b/metadata/md5-cache/dev-libs/icu-60.2
index a9af11db0ef8..853d130e3e71 100644
--- a/metadata/md5-cache/dev-libs/icu-60.2
+++ b/metadata/md5-cache/dev-libs/icu-60.2
@@ -4,9 +4,9 @@ DESCRIPTION=International Components for Unicode
 EAPI=6
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 SLOT=0/60.2
 SRC_URI=http://download.icu-project.org/files/icu4c/60.2/icu4c-60_2-src.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a0862cb91986b2915b7e3f0774d99db2
+_md5_=080160bad2a320edf28a30969cdac205
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.20.4 b/metadata/md5-cache/dev-libs/libgweather-3.20.4
deleted file mode 100644
index 4b6fdda16994..000000000000
--- a/metadata/md5-cache/dev-libs/libgweather-3.20.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-libs/gtk+-3.13.5:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.18 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Library to access weather information from online services
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/LibGWeather
-IUSE=glade +introspection vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/gtk+-3.13.5:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) !<gnome-base/gnome-applets-2.22.0
-REQUIRED_USE=vala? ( introspection )
-SLOT=2/3-6
-SRC_URI=mirror://gnome/sources/libgweather/3.20/libgweather-3.20.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f9709c19a36c4ebea3d5e47a11d839ca
diff --git a/metadata/md5-cache/dev-libs/libixion-0.13.0 b/metadata/md5-cache/dev-libs/libixion-0.13.0
index f05822c1de1b..e122fc234b48 100644
--- a/metadata/md5-cache/dev-libs/libixion-0.13.0
+++ b/metadata/md5-cache/dev-libs/libixion-0.13.0
@@ -4,10 +4,11 @@ DESCRIPTION=General purpose formula parser & interpreter
 EAPI=6
 HOMEPAGE=https://gitlab.com/ixion/ixion
 IUSE=debug python static-libs +threads python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0/0.13
 SRC_URI=https://kohei.us/files/ixion/src/libixion-0.13.0.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f6aa43ad6889d4fd9233c9451c7480b3
+_md5_=f3a5ece294780a4f29ccf31bd8ce66fc
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.13.1 b/metadata/md5-cache/dev-libs/liborcus-0.13.1
deleted file mode 100644
index 3c9ada5ff15b..000000000000
--- a/metadata/md5-cache/dev-libs/liborcus-0.13.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( >=dev-libs/libixion-0.13.0:= ) >=dev-util/mdds-1.2.2:1
-DESCRIPTION=Standalone file import filter library for spreadsheet documents
-EAPI=6
-HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
-IUSE=python +spreadsheet-model static-libs tools python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-LICENSE=MIT
-RDEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( >=dev-libs/libixion-0.13.0:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0/0.13
-SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.13.1.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dcdb5f24795cfe790b49492b92ed1012
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.13.2 b/metadata/md5-cache/dev-libs/liborcus-0.13.2
index b62f2b2febf4..a5ca2187fe51 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.13.2
+++ b/metadata/md5-cache/dev-libs/liborcus-0.13.2
@@ -4,10 +4,11 @@ DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=6
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
 IUSE=python +spreadsheet-model static-libs tools python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( >=dev-libs/libixion-0.13.0:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0/0.13
 SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.13.2.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=77b2a9450cfce23689b47ecbfce60d31
+_md5_=ee273eb193287747348897808c3d83f8
diff --git a/metadata/md5-cache/dev-libs/liborcus-9999 b/metadata/md5-cache/dev-libs/liborcus-9999
index 543dc1e6fd6d..30a8e01f2cbd 100644
--- a/metadata/md5-cache/dev-libs/liborcus-9999
+++ b/metadata/md5-cache/dev-libs/liborcus-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0/0.13
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=826bf437ff0564e71ef146a40a6252e3
+_md5_=ee273eb193287747348897808c3d83f8
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 887d507ff0a4..a67bd337b8a8 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/clx-0.7.5 b/metadata/md5-cache/dev-lisp/clx-0.7.5
new file mode 100644
index 000000000000..0fad849615e8
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/clx-0.7.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-apps/texinfo doc? ( virtual/texi2dvi )
+DESCRIPTION=CLX is the Common Lisp interface to the X11 protocol primarily for SBCL.
+EAPI=6
+HOMEPAGE=http://www.cliki.net/CLX
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=MIT
+PDEPEND=virtual/commonlisp
+RDEPEND=!dev-lisp/cl-clx
+SLOT=0
+SRC_URI=https://github.com/sharplispers/clx/archive/0.7.5.tar.gz -> clx-0.7.5.tar.gz
+_eclasses_=common-lisp-3	8c4aaa6d66cd2daed8572bb60bf6fe07	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=89177febec4377ff81cee19543b4e7a4
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index a090a1252a19..6773752bdafe 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/castellan-0.12.1 b/metadata/md5-cache/dev-python/castellan-0.12.1
deleted file mode 100644
index 3b5bf3134fca..000000000000
--- a/metadata/md5-cache/dev-python/castellan-0.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_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=Generic Key Manager interface for OpenStack
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/castellan
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/c/castellan/castellan-0.12.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f72869f05ac881e664147b55e696f4bf
diff --git a/metadata/md5-cache/dev-python/castellan-0.12.2 b/metadata/md5-cache/dev-python/castellan-0.12.2
index d42e35e74187..a831873990eb 100644
--- a/metadata/md5-cache/dev-python/castellan-0.12.2
+++ b/metadata/md5-cache/dev-python/castellan-0.12.2
@@ -4,11 +4,11 @@ DESCRIPTION=Generic Key Manager interface for OpenStack
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/castellan
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/c/castellan/castellan-0.12.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0be883bc94cc413f313701a52b13f67b
+_md5_=513e63614a5cdfe9516154defffe4d67
diff --git a/metadata/md5-cache/dev-python/castellan-0.4.0 b/metadata/md5-cache/dev-python/castellan-0.4.0
deleted file mode 100644
index 630f90f90365..000000000000
--- a/metadata/md5-cache/dev-python/castellan-0.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Generic Key Manager interface for OpenStack
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/castellan
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-1.3 >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/c/castellan/castellan-0.4.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=866aa1649ccca8e2d1896cce79e7674c
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.16.7 b/metadata/md5-cache/dev-python/dbusmock-0.16.7
deleted file mode 100644
index f137d7b62f9c..000000000000
--- a/metadata/md5-cache/dev-python/dbusmock-0.16.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Easily create mock objects on D-Bus for software testing
-EAPI=6
-HOMEPAGE=https://github.com/martinpitt/python-dbusmock
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64
-LICENSE=LGPL-3+
-RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-dbusmock/python-dbusmock-0.16.7.tar.gz -> dbusmock-0.16.7.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=577813d0777945c6a91928d4e985436b
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r1 b/metadata/md5-cache/dev-python/docopt-0.6.2-r1
deleted file mode 100644
index 83de1466a8d2..000000000000
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Pythonic argument parser, that will make you smile
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/docopt https://github.com/docopt/docopt
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/d/docopt/docopt-0.6.2.tar.gz https://github.com/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba00c40fbf5da119c2d11b2c3785ce8c
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r2 b/metadata/md5-cache/dev-python/docopt-0.6.2-r2
index 0ffe8d38dd62..79ea40ce3eed 100644
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r2
+++ b/metadata/md5-cache/dev-python/docopt-0.6.2-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Pythonic argument parser, that will make you smile
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/docopt https://github.com/docopt/docopt
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/docopt/docopt-0.6.2.tar.gz https://github.com/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a7daa6e23176dfcb3d750c62fd433268
+_md5_=efed716240102764c3c3c7272194db9d
diff --git a/metadata/md5-cache/dev-python/keyring-10.3.3 b/metadata/md5-cache/dev-python/keyring-10.3.3
deleted file mode 100644
index 93160f799348..000000000000
--- a/metadata/md5-cache/dev-python/keyring-10.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/secretstorage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Provides access to the system keyring service
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/keyring
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keyring/keyring-10.3.3.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aa399e392b4117fed3f42fe47f20e610
diff --git a/metadata/md5-cache/dev-python/keyring-10.4.0 b/metadata/md5-cache/dev-python/keyring-10.4.0
deleted file mode 100644
index 04436ea9ca2c..000000000000
--- a/metadata/md5-cache/dev-python/keyring-10.4.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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/secretstorage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Provides access to the system keyring service
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/keyring
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keyring/keyring-10.4.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3f3216d68e718531e94bcbd28db12a10
diff --git a/metadata/md5-cache/dev-python/keyring-10.5.0 b/metadata/md5-cache/dev-python/keyring-10.5.0
deleted file mode 100644
index cd71e5b3fe6d..000000000000
--- a/metadata/md5-cache/dev-python/keyring-10.5.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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/secretstorage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/collective-checkdocs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Provides access to the system keyring service
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/keyring
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keyring/keyring-10.5.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6269b18b2be368026bcca2d9b421b8d3
diff --git a/metadata/md5-cache/dev-python/keyring-10.5.1 b/metadata/md5-cache/dev-python/keyring-10.5.1
deleted file mode 100644
index da9ddb9acd18..000000000000
--- a/metadata/md5-cache/dev-python/keyring-10.5.1
+++ /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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/secretstorage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/collective-checkdocs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Provides access to the system keyring service
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/keyring
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keyring/keyring-10.5.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a582fd14695ac14c4055249e618f886
diff --git a/metadata/md5-cache/dev-python/keyring-10.6.0 b/metadata/md5-cache/dev-python/keyring-10.6.0
index f6461997e2a8..fdf38d6d1719 100644
--- a/metadata/md5-cache/dev-python/keyring-10.6.0
+++ b/metadata/md5-cache/dev-python/keyring-10.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Provides access to the system keyring service
 EAPI=6
 HOMEPAGE=https://github.com/jaraco/keyring
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~arm ~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-10.6.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36b5dc06d0381f1deb84ee013ca45e80
+_md5_=5a582fd14695ac14c4055249e618f886
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.0.20180203 b/metadata/md5-cache/dev-python/miniupnpc-2.0.20180203
new file mode 100644
index 000000000000..7fbdd729ccd6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.0.20180203
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-libs/miniupnpc-2.0.20180203:0= dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python bindings for UPnP client library
+EAPI=6
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=net-libs/miniupnpc-2.0.20180203:0= python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.0.20180203.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8ae16d7e19c368c60bf0bbd10134c6ad
diff --git a/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.4 b/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.4
new file mode 100644
index 000000000000..0ce5a2611a7b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Control Onkyo A/V receivers over the network
+EAPI=6
+HOMEPAGE=https://github.com/miracle2k/onkyo-eiscp https://pypi.python.org/pypi/onkyo-eiscp
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docopt-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/o/onkyo-eiscp/onkyo-eiscp-1.2.4.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2efef3929bef2f406188c00e2a14a9bc
diff --git a/metadata/md5-cache/dev-python/pyatspi-2.20.3 b/metadata/md5-cache/dev-python/pyatspi-2.20.3
deleted file mode 100644
index c34d52476ae7..000000000000
--- a/metadata/md5-cache/dev-python/pyatspi-2.20.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-2.90.1:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Python binding to at-spi library
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Accessibility
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86
-LICENSE=LGPL-2 GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-2.90.1:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/dbus-1 >=app-accessibility/at-spi2-core-2.20.2[introspection] !<gnome-extra/at-spi-1.32.0-r1
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/pyatspi/2.20/pyatspi-2.20.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2773012f47092139664ccb3ed9f0f094
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.4.1 b/metadata/md5-cache/dev-python/python-gnupg-0.4.1
new file mode 100644
index 000000000000..9e71ea719d78
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.4.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-crypt/gnupg python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python wrapper for GNU Privacy Guard
+EAPI=6
+HOMEPAGE=http://pythonhosted.org/python-gnupg/ https://github.com/vsajip/python-gnupg/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-crypt/gnupg python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/python-gnupg/python-gnupg-0.4.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f122b71be8ec95cedb854b735a90691c
diff --git a/metadata/md5-cache/dev-python/wxpython-2.8.12.1-r2 b/metadata/md5-cache/dev-python/wxpython-2.8.12.1-r2
index 6a16d92059e9..8332db7581d1 100644
--- a/metadata/md5-cache/dev-python/wxpython-2.8.12.1-r2
+++ b/metadata/md5-cache/dev-python/wxpython-2.8.12.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A blending of the wxWindows C++ class library with Python
 EAPI=5
 HOMEPAGE=http://www.wxpython.org/
 IUSE=cairo doc examples opengl python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=wxWinLL-3
 RDEPEND=dev-lang/python-exec:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/wxGTK-2.8.12.1:2.8[opengl?,tiff,X] dev-libs/glib:2 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg x11-libs/gtk+:2 x11-libs/pango[X] cairo? ( >=dev-python/pycairo-1.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=2.8
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-2.8.12.1.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-2.8.12.1.tar.bz2 mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 ) examples? ( mirror://sourceforge/wxpython/wxPython-demo-2.8.12.1.tar.bz2 )
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be38850b82f9c344cca2192cf6b77da3
+_md5_=34be39503524ab38c7fbd1d69692140c
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index d199197c5f83..069b27ae25e9 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/assistant-5.7.1 b/metadata/md5-cache/dev-qt/assistant-5.7.1
index 55c6b79e157a..9dfa816a2323 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.7.1
+++ b/metadata/md5-cache/dev-qt/assistant-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qthelp-5.7.1 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=de955874787a8d09b48d66997db7bf7e
diff --git a/metadata/md5-cache/dev-qt/assistant-5.9.3 b/metadata/md5-cache/dev-qt/assistant-5.9.3
index 5bd1c7f099cc..99f1c417bd01 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.9.3
+++ b/metadata/md5-cache/dev-qt/assistant-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qthelp-5.9.3 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f00c00eff78e6a3bd3443db7b0cb2618
diff --git a/metadata/md5-cache/dev-qt/assistant-5.9.4 b/metadata/md5-cache/dev-qt/assistant-5.9.4
new file mode 100644
index 000000000000..5941df47bd0f
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/assistant-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qthelp-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtsql-5.9.4[sqlite] ~dev-qt/qtwidgets-5.9.4 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=webkit debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qthelp-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtsql-5.9.4[sqlite] ~dev-qt/qtwidgets-5.9.4 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a806569a20446ff23f59a051b2aaec37
diff --git a/metadata/md5-cache/dev-qt/designer-5.7.1 b/metadata/md5-cache/dev-qt/designer-5.7.1
index d9f773752b5f..f1b9c66e53b4 100644
--- a/metadata/md5-cache/dev-qt/designer-5.7.1
+++ b/metadata/md5-cache/dev-qt/designer-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=65e8725189331a3117b88194437a6f0d
diff --git a/metadata/md5-cache/dev-qt/designer-5.9.3 b/metadata/md5-cache/dev-qt/designer-5.9.3
index bc5cb24bfacb..e505369c643e 100644
--- a/metadata/md5-cache/dev-qt/designer-5.9.3
+++ b/metadata/md5-cache/dev-qt/designer-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtnetwork-5.9.3 ~dev-qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=fcb98472b970fcb711760f75b8582e7a
diff --git a/metadata/md5-cache/dev-qt/designer-5.9.4 b/metadata/md5-cache/dev-qt/designer-5.9.4
new file mode 100644
index 000000000000..f7237511f021
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/designer-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtwidgets-5.9.4 ~dev-qt/qtxml-5.9.4 declarative? ( ~dev-qt/qtdeclarative-5.9.4[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=declarative webkit debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtwidgets-5.9.4 ~dev-qt/qtxml-5.9.4 declarative? ( ~dev-qt/qtdeclarative-5.9.4[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=445062d5d4d8ddd2d4c9a8f09c6776a7
diff --git a/metadata/md5-cache/dev-qt/linguist-5.7.1 b/metadata/md5-cache/dev-qt/linguist-5.7.1
index e44bc69531ff..ef1b0b6ca8f1 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.7.1
+++ b/metadata/md5-cache/dev-qt/linguist-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/designer-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a3ee70abae8cae0fb3fb0b5f636404be
diff --git a/metadata/md5-cache/dev-qt/linguist-5.9.3 b/metadata/md5-cache/dev-qt/linguist-5.9.3
index e224720cd750..cf47e5ed70e8 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.9.3
+++ b/metadata/md5-cache/dev-qt/linguist-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/designer-5.9.3 ~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=ba2a39972e3e2cc6a6666f404785d8d8
diff --git a/metadata/md5-cache/dev-qt/linguist-5.9.4 b/metadata/md5-cache/dev-qt/linguist-5.9.4
new file mode 100644
index 000000000000..ab477b4718a6
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/linguist-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/designer-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtwidgets-5.9.4 ~dev-qt/qtxml-5.9.4 >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Graphical tool for translating Qt applications
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/designer-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtwidgets-5.9.4 ~dev-qt/qtxml-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=830549cf778eb08b692feea85d950300
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.7.1 b/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
index 8aa6d7f3a2ee..83bb824047f3 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtxml-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=dbeed594e096764ff6642240bd1240cf
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.9.3 b/metadata/md5-cache/dev-qt/linguist-tools-5.9.3
index 740a5f2d9347..f48ed3781c60 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.9.3
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtxml-5.9.3 qml? ( ~dev-qt/qtdeclarative-5.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=dc32b3ab2a3b7ad35ec30e454ef5817e
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.9.4 b/metadata/md5-cache/dev-qt/linguist-tools-5.9.4
new file mode 100644
index 000000000000..75e55694edf2
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtxml-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Tools for working with Qt translation data files
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtxml-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=bf91e97fcd44906ddcf3ce8b70711718
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.7.1 b/metadata/md5-cache/dev-qt/pixeltool-5.7.1
index c6fda532e534..4443246854c2 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.7.1
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=665ad50021991975ec683a46c3a3b72d
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.9.3 b/metadata/md5-cache/dev-qt/pixeltool-5.9.3
index 891df467bec9..e986ae9d31dd 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.9.3
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtwidgets-5.9.3 dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a10a7c7583a5986442e9a218db32d635
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.9.4 b/metadata/md5-cache/dev-qt/pixeltool-5.9.4
new file mode 100644
index 000000000000..7acd25edf517
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Qt screen magnifier
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=aa9b9c5c415920bd5268209770a0eb97
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.7.1 b/metadata/md5-cache/dev-qt/qdbus-5.7.1
index 7ffcc75b18c1..3113a9beeed8 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.7.1
+++ b/metadata/md5-cache/dev-qt/qdbus-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 ~dev-qt/qtxml-5.7.1 dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=6dda8a2de2af7ed29b71cc6fdc914ed4
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.9.3 b/metadata/md5-cache/dev-qt/qdbus-5.9.3
index e175a87f171f..e950836522b8 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.9.3
+++ b/metadata/md5-cache/dev-qt/qdbus-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdbus-5.9.3 ~dev-qt/qtxml-5.9.3 dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=082ed90cbe2501d1a63078a9bde9e7ca
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.9.4 b/metadata/md5-cache/dev-qt/qdbus-5.9.4
new file mode 100644
index 000000000000..bf91e9174aab
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdbus-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 ~dev-qt/qtxml-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Interface to Qt applications communicating over D-Bus
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 ~dev-qt/qtxml-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=ae627c0d21e8b38a694f94526832d4cc
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1 b/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
index 5eb9b0b9a83c..53efda438458 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f54c355e28463628eed095d295a48211
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.9.3 b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.3
index 811ec5ab7e1a..be2951cb686f 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.9.3
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdbus-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=5e40923d6d9bfca0dc34cb7a415a7262
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.9.4 b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.4
new file mode 100644
index 000000000000..b1c166b42832
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 ~dev-qt/qtxml-5.9.4 >=sys-apps/sed-4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 ~dev-qt/qtxml-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=01b962991d1329df214d24065600b7d6
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.7.1 b/metadata/md5-cache/dev-qt/qdoc-5.7.1
index ae6b49e595a0..46784573ba82 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.7.1
+++ b/metadata/md5-cache/dev-qt/qdoc-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtxml-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9d7d023c64c918edf558c7ea703cf9e4
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.9.3 b/metadata/md5-cache/dev-qt/qdoc-5.9.3
index 9e7b1d476c7c..e5c8d09a388b 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.9.3
+++ b/metadata/md5-cache/dev-qt/qdoc-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 qml? ( ~dev-qt/qtdeclarative-5.9.3 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=bacbc407873d7db6bd21571e7ffa6050
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.9.4 b/metadata/md5-cache/dev-qt/qdoc-5.9.4
new file mode 100644
index 000000000000..c33d0318d95a
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdoc-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Qt documentation generator
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=274a4acab892678f62a3f3a0f3467f84
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1 b/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
index 62a60b99f381..43e16c64686a 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qt3d-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a14cade7a74204bc44bc18e96f732f95
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.9.3 b/metadata/md5-cache/dev-qt/qt3d-5.9.3
index 2707df328bf8..79666d53b44a 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.9.3
+++ b/metadata/md5-cache/dev-qt/qt3d-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.9.3 ~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qt3d-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e83fe3cccab7d8f86070c41445f9ad7f
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.9.4 b/metadata/md5-cache/dev-qt/qt3d-5.9.4
new file mode 100644
index 000000000000..fcfaa66b5300
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt3d-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtconcurrent-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.9.4[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=The 3D module for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 qml debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtconcurrent-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.9.4[gles2=] ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qt3d-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=b0f27108666b914c013a885990a9cdd1
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1 b/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
index 424d383e24c3..36edc700fc6f 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 >=n
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtconnectivity-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=2b95f75a1c6c5d4586fe1c7eeb71342f
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.9.3 b/metadata/md5-cache/dev-qt/qtbluetooth-5.9.3
index f33e6d8e7a72..3256480560c3 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.9.3 ~dev-qt/qtcore-5.9.3 ~dev-qt/qtdbus-5.9.3 >=n
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtconnectivity-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=85c02300c40202ba90824059fffad21a
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.9.4 b/metadata/md5-cache/dev-qt/qtbluetooth-5.9.4
new file mode 100644
index 000000000000..9c9db2e1f07c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtconcurrent-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.9.4 ) ~dev-qt/qtnetwork-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Bluetooth support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtconcurrent-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtconnectivity-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=884eb2a940b9d9bdb48ff10e8cc7ef0c
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.7.1 b/metadata/md5-cache/dev-qt/qtcharts-5.7.1
index a0b4d91d07ac..639efc7038e3 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 qml? (
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtcharts-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=7a25fc03e96bb3ae33fa8569bebd2f4e
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.9.3 b/metadata/md5-cache/dev-qt/qtcharts-5.9.3
index f75b234432a2..0fefbf628c9e 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtwidgets-5.9.3 qml? (
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtcharts-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=491ee4b1f51e7d699947fc4815f7a7c0
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.9.4 b/metadata/md5-cache/dev-qt/qtcharts-5.9.4
new file mode 100644
index 000000000000..17f3a2c7fb4a
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Chart component library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtcharts-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=af69ac4f669ba6c4edd9b20ca84fbce7
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1 b/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
index 073b738cb253..f0064bd72b6a 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=fe9e4778b359dcd21362dc37c1ce3b82
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.9.3 b/metadata/md5-cache/dev-qt/qtconcurrent-5.9.3
index be265855f917..abf8abb64c1d 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=2928615655ff69503d98652a1e5021ec
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.9.4 b/metadata/md5-cache/dev-qt/qtconcurrent-5.9.4
new file mode 100644
index 000000000000..4974a84ed92e
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=0b7a3f908df3496de09350a89797a3f8
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.7.1-r3 b/metadata/md5-cache/dev-qt/qtcore-5.7.1-r3
index 74e9847da359..bbd85f046429 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.7.1-r3
+++ b/metadata/md5-cache/dev-qt/qtcore-5.7.1-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 >=dev-libs/libpcre-8.38[pcr
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a367bd278558379df42d2c4b165d2ef3
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.9.3 b/metadata/md5-cache/dev-qt/qtcore-5.9.3
index 6e692cc799b3..d38494e642b0 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtcore-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,un
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=0dfb616b9d105c3791c4f975c8d88697
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.9.4 b/metadata/md5-cache/dev-qt/qtcore-5.9.4
new file mode 100644
index 000000000000..20ebcaf5d933
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcore-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+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=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=f0a48c87c0365b0ef7336aff2d91c440
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
index 91e16660e676..eff45358b9a0 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] qml? ( ~dev-qt/qtdeclar
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdatavis3d-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=5efd699a913bf017c8ae7b2f715d37cb
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.3 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.3
index ff80b2cbee61..c1c78510dabf 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] qml? ( ~dev-qt/qtdeclar
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtdatavis3d-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e50f455d4b2ffbf64a772f94f4342633
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.4 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.4
new file mode 100644
index 000000000000..d3e58d2432b5
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] qml? ( ~dev-qt/qtdeclarative-5.9.4[gles2=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=3D data visualization library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 qml debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] qml? ( ~dev-qt/qtdeclarative-5.9.4[gles2=] ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtdatavis3d-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=4f21dea58f96d06896536007b6de8dae
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.7.1 b/metadata/md5-cache/dev-qt/qtdbus-5.7.1
index ff4b467abae6..f796bc4f7afb 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=300d9f5a3bb98682966d30148e5f7e0c
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.9.3 b/metadata/md5-cache/dev-qt/qtdbus-5.9.3
index f99d533cc930..dce46d48a528 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=22652e1639b9804593ec1aacedf30212
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.9.4 b/metadata/md5-cache/dev-qt/qtdbus-5.9.4
new file mode 100644
index 000000000000..a2cda56150ba
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 >=sys-apps/dbus-1.4.20 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=0bbe3dc6da7799cb081f15b6aa087f05
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1
index d28200c740f3..a33dc91cb321 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=3c04f179185fb1c7beaa54553ad7ecc8
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
index 6e08168a42de..23b4345bca4a 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=692ec7c258748fa466d999f56eba960a
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.9.3 b/metadata/md5-cache/dev-qt/qtdeclarative-5.9.3
index 74f323621989..15423e548f37 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] ~dev-qt/qtnetwork-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtdeclarative-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=ce907a3c0c404e5482425c05724090b6
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.9.4 b/metadata/md5-cache/dev-qt/qtdeclarative-5.9.4
new file mode 100644
index 000000000000..0a4ea52522a6
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qttest-5.9.4 localstorage? ( ~dev-qt/qtsql-5.9.4 ) widgets? ( ~dev-qt/qtwidgets-5.9.4[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtxmlpatterns-5.9.4 ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=The QML and Quick modules for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 +jit localstorage +widgets xml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qttest-5.9.4 localstorage? ( ~dev-qt/qtsql-5.9.4 ) widgets? ( ~dev-qt/qtwidgets-5.9.4[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtxmlpatterns-5.9.4 ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtdeclarative-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=463689d5cd7fac5b3136c71d4519a775
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.7.1 b/metadata/md5-cache/dev-qt/qtdiag-5.7.1
index 5d3b5f1fe665..36f8ef3b3b15 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1[ssl=] d
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=708fd8fee5f122532763ee938714342c
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.9.3 b/metadata/md5-cache/dev-qt/qtdiag-5.9.3
index a2e71d8b1dde..11c729720f68 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 network? ( ~dev-qt/qtnetwork-5.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=94debd9c530d97f5a9beb62a967ad0b7
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.9.4 b/metadata/md5-cache/dev-qt/qtdiag-5.9.4
new file mode 100644
index 000000000000..4136dc0d56c1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 network? ( ~dev-qt/qtnetwork-5.9.4[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=+network +widgets debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 network? ( ~dev-qt/qtnetwork-5.9.4[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.9.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=95acc32e2d3f5c899322d8c9bc1df214
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
index d0bb42d25263..e0fa4ea8ad35 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 dev
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtgraphicaleffects-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9c6d36e0a8bba5a791b151bbafc83bf0
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.3 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.3
index 826a720ac871..6aa61a99404b 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 dev
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtgraphicaleffects-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=8b0e36d933ed505c15e2f30551b7e2d5
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.4 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.4
new file mode 100644
index 000000000000..68007b005dfe
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Set of QML types for adding visual effects to user interfaces
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtgraphicaleffects-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=379988901174bbbe1ecd1dae36bb81f9
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
index d9ea5aba406c..a28a6362dc99 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? (
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f3f7e257dfac151c52801eeae2bb30a3
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.9.3 b/metadata/md5-cache/dev-qt/qtgui-5.9.3
index 4c5aef6e5df4..6ebcc7a129a7 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtgui-5.9.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? (
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=58121064becf6e8e9a62e16b52d1e1c8
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.9.4 b/metadata/md5-cache/dev-qt/qtgui-5.9.4
new file mode 100644
index 000000000000..821d0318d45d
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgui-5.9.4
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.9.4 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.0.6:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.9.4 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.9.4 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.9.4 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc +xcb debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=ibus? ( app-i18n/ibus )
+RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.9.4 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.0.6:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.9.4 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.9.4 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.9.4 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
+REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) xcb? ( gles2? ( egl ) )
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=d3eb2a5b3169b88054b5acc3a30bdb87
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.9.4-r1 b/metadata/md5-cache/dev-qt/qtgui-5.9.4-r1
new file mode 100644
index 000000000000..d94e93193dbe
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgui-5.9.4-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.9.4 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.0.6:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.9.4 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.9.4 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.9.4 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc +xcb debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=ibus? ( app-i18n/ibus )
+RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.9.4 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.0.6:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.9.4 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.9.4 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.9.4 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
+REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) xcb? ( gles2? ( egl ) )
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=3614a81236ecffa3b4f98a1ebf27500c
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.7.1 b/metadata/md5-cache/dev-qt/qthelp-5.7.1
index 5289bc87e7b9..0382f23569a3 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.7.1
+++ b/metadata/md5-cache/dev-qt/qthelp-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=fa55ec04300e0ca5a2486351482374c2
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.9.3 b/metadata/md5-cache/dev-qt/qthelp-5.9.3
index 6f40a86aa63e..f7eecfee9829 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.9.3
+++ b/metadata/md5-cache/dev-qt/qthelp-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtnetwork-5.9.3 ~dev-qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f6c6d84ab0305c99267a20cf4693758b
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.9.4 b/metadata/md5-cache/dev-qt/qthelp-5.9.4
new file mode 100644
index 000000000000..15a5113368c9
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qthelp-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtsql-5.9.4[sqlite] ~dev-qt/qtwidgets-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Qt5 module for integrating online documentation into applications
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtsql-5.9.4[sqlite] ~dev-qt/qtwidgets-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=7fcec33e5ca44ec5532c063f57768dba
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.7.1 b/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
index ca4623fa355f..b42091b83bc3 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 media-libs/jasper:= media-libs/
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtimageformats-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=5b45684084405c2cb0a770ef1e1b39e5
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.9.3 b/metadata/md5-cache/dev-qt/qtimageformats-5.9.3
index 228f382145b9..58328f39c892 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 media-libs/jasper:= media-libs/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtimageformats-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=7c0973e4d7f95cbe35bbc05c9be5209c
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.9.4 b/metadata/md5-cache/dev-qt/qtimageformats-5.9.4
new file mode 100644
index 000000000000..3467d91db154
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Additional format plugins for the Qt image I/O system
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=jpeg2k mng debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtimageformats-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=30de7f78795a3cf32bbc4e02a68add81
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.7.1 b/metadata/md5-cache/dev-qt/qtlocation-5.7.1
index ce911d5353c8..c65cba8f58fc 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~de
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f16af598359c715ab69d2186912d6241
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.9.3 b/metadata/md5-cache/dev-qt/qtlocation-5.9.3
index fc7db155e8e9..a58050edf89b 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=320d543b38c87c6a4aa3bc2227bbfa1f
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.9.4 b/metadata/md5-cache/dev-qt/qtlocation-5.9.4
new file mode 100644
index 000000000000..b08fb12b4cd5
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtpositioning-5.9.4 ~dev-qt/qtsql-5.9.4 sys-libs/zlib ~dev-qt/qtconcurrent-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=The Location module for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtpositioning-5.9.4 ~dev-qt/qtsql-5.9.4 sys-libs/zlib dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtlocation-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=c7083a2d84f0b31591195e3020bada06
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1 b/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
index 7f9bb6befa8a..6ee35f75eb23 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtmultimedia-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a414cbddbd38fee4600900317d79a91e
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.9.3 b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.3
index 5faa2ab9afb5..dd125cb046b5 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] ~dev-qt/qtnetwork-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtmultimedia-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=97e074b6c2ea6e8ec7bd8fcf7c594893
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.9.4 b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.4
new file mode 100644
index 000000000000..049e51664a34
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtnetwork-5.9.4 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-5.9.4 gles2? ( ~dev-qt/qtgui-5.9.4[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.9.4 ~dev-qt/qtwidgets-5.9.4[gles2=] ) gstreamer? ( x11-proto/videoproto ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtnetwork-5.9.4 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-5.9.4 gles2? ( ~dev-qt/qtgui-5.9.4[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.9.4 ~dev-qt/qtwidgets-5.9.4[gles2=] ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtmultimedia-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=bbbcd4c034b6427962ef21a1b1ffbdea
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.7.1 b/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
index 22de2b4748a9..089775d923da 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.7
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=cd3aab100c8c0dc80d1971f915f37739
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.9.3 b/metadata/md5-cache/dev-qt/qtnetwork-5.9.3
index 6cac24596a21..342696bec8de 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.9
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=81faf5ec62dfd5a3a5d48ba16e3f5adc
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.9.4 b/metadata/md5-cache/dev-qt/qtnetwork-5.9.4
new file mode 100644
index 000000000000..054114288272
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.9.4 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.9.4 ) ssl? ( dev-libs/openssl:0=[bindist=] ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Network abstraction library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=bindist connman libproxy networkmanager +ssl debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.9.4 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.9.4 ) ssl? ( dev-libs/openssl:0=[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=9a032c604c4e6d15adf4f5b109efe9fe
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.3 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.3
index c341e8f11f72..63ab5c07e795 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtnetwork-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtnetworkauth-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a5d0b10c9f6fc56323ba72498b7712e3
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.4 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.4
new file mode 100644
index 000000000000..195d09c30c1a
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Network authorization library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtnetworkauth-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=c4663a10aeec8aeecbb3d294d2678729
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.7.1 b/metadata/md5-cache/dev-qt/qtopengl-5.7.1
index 637adb69a4cf..0eec9d0cb0e8 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtwidgets-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=33702d61bc94ebe2ec41d4e571334f27
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.9.3 b/metadata/md5-cache/dev-qt/qtopengl-5.9.3
index f8b75ee8648f..9caeb25e6d14 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] ~dev-qt/qtwidgets-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=3d580076a240579b9ffca441ea2556ee
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.9.4 b/metadata/md5-cache/dev-qt/qtopengl-5.9.4
new file mode 100644
index 000000000000..02a594876565
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtwidgets-5.9.4[gles2=] virtual/opengl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtwidgets-5.9.4[gles2=] virtual/opengl dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=9893b662facf50c975389790b82e24b1
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.7.1 b/metadata/md5-cache/dev-qt/qtpaths-5.7.1
index dc92913309ef..eb40ef735638 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e7030b81bb1e1985ffae10ff05325f23
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.9.3 b/metadata/md5-cache/dev-qt/qtpaths-5.9.3
index 43768530891c..ac51ebd34367 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=529c9cf384423268eaf25c7d953cd28b
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.9.4 b/metadata/md5-cache/dev-qt/qtpaths-5.9.4
new file mode 100644
index 000000000000..d26a5690f93b
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Command line client to QStandardPaths
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=23375c4eecad9165609c104837158e02
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1 b/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
index 3a2760837bbd..6714ad22491d 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=0643ba650e59cc2fddf0bc18627ce522
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.9.3 b/metadata/md5-cache/dev-qt/qtplugininfo-5.9.3
index dbc4fb096b1f..0cd70b7ae5ec 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=ca8ba2814d3e39f4038cf0491a0ff5d2
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.9.4 b/metadata/md5-cache/dev-qt/qtplugininfo-5.9.4
new file mode 100644
index 000000000000..4006e67bf1a1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Qt5 plugin metadata dumper
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=a468c26cc030a4f2c3a0cf9b7788dcc4
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.7.1 b/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
index bf86c1d88767..adc23b42f649 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 geoclue? ( ~dev-qt/qtdbus-5.7.1 ) qml? ( ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=b31f28eda98b13c7fad47cd84b0d34e9
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.9.3 b/metadata/md5-cache/dev-qt/qtpositioning-5.9.3
index 6bf2402c9dbd..48037c931b0d 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.9.3
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 geoclue? ( ~dev-qt/qtdbus-5.9.3 ) qml? ( ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=644698f75aa6190028c1d4f1b67dfae2
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.9.4 b/metadata/md5-cache/dev-qt/qtpositioning-5.9.4
new file mode 100644
index 000000000000..156deccc4e31
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.9.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 geoclue? ( ~dev-qt/qtdbus-5.9.4 ) qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Physical position determination library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=geoclue qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=geoclue? ( app-misc/geoclue:0 )
+RDEPEND=~dev-qt/qtcore-5.9.4 geoclue? ( ~dev-qt/qtdbus-5.9.4 ) qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtlocation-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=32e60caa19fd41418a7137c0880faaf0
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
index 9df00dc97178..bdab0ccb4cb8 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtwidgets-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f5562e8a887725d43355c80fe98d6160
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.9.3 b/metadata/md5-cache/dev-qt/qtprintsupport-5.9.3
index e13804fefb41..31e379d9c4dd 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] ~dev-qt/qtwidgets-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=1f60e213375ddbd5d062fc3d4ab1a1af
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.9.4 b/metadata/md5-cache/dev-qt/qtprintsupport-5.9.4
new file mode 100644
index 000000000000..c19abae03446
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtwidgets-5.9.4[gles2=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.9.4 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Printing support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=cups gles2 test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtwidgets-5.9.4[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=f31f60a09d03fc9fdba20e51790bd858
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
index ac1260bf3fe2..96387b727377 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 wid
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=d373fd8804095291aca0e9d045cbdff6
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.3 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.3
index e23f76e05d56..0681301038dc 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 wid
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=7f1403dfb36666220e3f4b5444717652
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.4 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.4
new file mode 100644
index 000000000000..e749bb3efcc7
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 widgets? ( ~dev-qt/qtwidgets-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Set of controls used in conjunction with Qt Quick to build complete interfaces
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=+widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 widgets? ( ~dev-qt/qtwidgets-5.9.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtquickcontrols-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=06cac9e9f94c9abfa93ddd7c99a5870d
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
index 2e2d5c5879a6..213d7a0f8c5a 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgraphicaleffe
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols2-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=76a8075e6e58ad1696f5c0890c901074
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.3 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.3
index 7d6cba2b2153..81bca46f974e 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 wid
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols2-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a45f254daee4dfd9f7d9fef892155ecc
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.4 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.4
new file mode 100644
index 000000000000..663743f2bd02
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 widgets? ( ~dev-qt/qtwidgets-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=widgets debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 widgets? ( ~dev-qt/qtwidgets-5.9.4 ) ~dev-qt/qtgraphicaleffects-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtquickcontrols2-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=815230b2d5e24b94c325f6d4de76287e
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.7.1 b/metadata/md5-cache/dev-qt/qtscript-5.7.1
index 217c75f31e89..55b2cef25a53 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtscript-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 scripttools? ( ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidget
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtscript-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=6736b2476fc9c5189625b2e941b40dac
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.9.3 b/metadata/md5-cache/dev-qt/qtscript-5.9.3
index 1d8dc903ddbe..a2c4eef03d6d 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtscript-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 scripttools? ( ~dev-qt/qtgui-5.9.3 ~dev-qt/qtwidget
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtscript-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=16365c5f01ad7e0d9b38cbd0d43753f4
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.9.4 b/metadata/md5-cache/dev-qt/qtscript-5.9.4
new file mode 100644
index 000000000000..3bd10508a10d
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtscript-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 scripttools? ( ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=+jit scripttools debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 scripttools? ( ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtscript-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=ebb9e2d1b27417c457741b3c517ecb0f
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.7.1 b/metadata/md5-cache/dev-qt/qtscxml-5.7.1
index 20715fe1fb69..9873ffd29a23 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtscxml-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=04055beb06fbfb7fc86acdffb7b666e8
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.9.3 b/metadata/md5-cache/dev-qt/qtscxml-5.9.3
index c5a346958cd8..c3f19ab23a80 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtscxml-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=71c58017ad97e2ab56959960ca2bc139
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.9.4 b/metadata/md5-cache/dev-qt/qtscxml-5.9.4
new file mode 100644
index 000000000000..9a0acfb95bac
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtscxml-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=931899ecf2935db1b1545f4395bf26e6
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.7.1 b/metadata/md5-cache/dev-qt/qtsensors-5.7.1
index e26e2d0b391f..277a249bd7d3 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtsensors-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=c1fd72b820f83b02661f11d402a9ef3e
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.9.3 b/metadata/md5-cache/dev-qt/qtsensors-5.9.3
index 16999a86f57d..6181ccdecf68 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdbus-5.9.3 qml? ( ~dev-qt/qtdeclarative-5
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtsensors-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=094910a38d69bb3caaf95353aa5af976
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.9.4 b/metadata/md5-cache/dev-qt/qtsensors-5.9.4
new file mode 100644
index 000000000000..eb3c4f8b5d6c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Hardware sensor access library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtsensors-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=146be5b8fa4ac5bdc1202ffcc8846e7a
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.9.3 b/metadata/md5-cache/dev-qt/qtserialbus-5.9.3
index b42d9eccba10..298b87a4dae8 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtnetwork-5.9.3 ~dev-qt/qtserialport-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtserialbus-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f4ed19e9c2b7a34fed2788aee6590432
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.9.4 b/metadata/md5-cache/dev-qt/qtserialbus-5.9.4
new file mode 100644
index 000000000000..31baf7b47682
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtserialport-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Support for CAN and other serial buses
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtserialport-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtserialbus-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=fb20edd5e4970b927693f51fe6d0307a
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.7.1 b/metadata/md5-cache/dev-qt/qtserialport-5.7.1
index ced413c57a39..fd9603e1c967 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtserialport-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=49ce7180d4115c76818f44cba7912401
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.9.3 b/metadata/md5-cache/dev-qt/qtserialport-5.9.3
index 8c75003a7e9c..e8ed5cfe360c 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtserialport-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=4399d1bf39070876cf8b30690effd649
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.9.4 b/metadata/md5-cache/dev-qt/qtserialport-5.9.4
new file mode 100644
index 000000000000..910a1a2280a8
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 virtual/libudev:= dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Serial port abstraction library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 virtual/libudev:= dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtserialport-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=28799061d0de088a508254da213c4048
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.9.3 b/metadata/md5-cache/dev-qt/qtspeech-5.9.3
index 0857724c46cd..44658af4bc22 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.9.3 dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtspeech-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=67a38f59ac652928e9bf5ee8c66e1abf
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.9.4 b/metadata/md5-cache/dev-qt/qtspeech-5.9.4
new file mode 100644
index 000000000000..d80f71115bd4
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Text-to-speech library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtspeech-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=68ce3ecc9edcd600a938784a6dd05b01
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
index 9fe89cad2d1b..da3442dbd877 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=6740d6562d6b22e4ac13c0cde7b7c9e0
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.9.3 b/metadata/md5-cache/dev-qt/qtsql-5.9.3
index 92f512870d47..33e469a21c12 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtsql-5.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=741e5e3ff11cde8cad89e9216e3df3fa
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.9.4 b/metadata/md5-cache/dev-qt/qtsql-5.9.4
new file mode 100644
index 000000000000..0cfe53535ceb
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsql-5.9.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=SQL abstraction library for the Qt5 tooolkit
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-qt/qtchooser
+REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=79bff4f67222b66772535c3aa32cfada
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.7.1 b/metadata/md5-cache/dev-qt/qtsvg-5.7.1
index 765369916416..8415afa30a3b 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 >=sys-l
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtsvg-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=fbcd165e7e76f2890e625ef87af67018
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.9.3 b/metadata/md5-cache/dev-qt/qtsvg-5.9.3
index b65b1a79b149..1bea61717c94 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtwidgets-5.9.3 >=sys-l
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtsvg-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f200af3ff7f0ff3d7c4821e5c142666c
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.9.4 b/metadata/md5-cache/dev-qt/qtsvg-5.9.4
new file mode 100644
index 000000000000..14758d26a98e
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 >=sys-libs/zlib-1.2.5 test? ( ~dev-qt/qtxml-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=SVG rendering library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtsvg-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=662798cb1c8ad6c3f55331c68ea15093
diff --git a/metadata/md5-cache/dev-qt/qttest-5.7.1 b/metadata/md5-cache/dev-qt/qttest-5.7.1
index 2399b4a08603..f34949cebced 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.7.1
+++ b/metadata/md5-cache/dev-qt/qttest-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=aebe413ac76c08a586128816d0313a81
diff --git a/metadata/md5-cache/dev-qt/qttest-5.9.3 b/metadata/md5-cache/dev-qt/qttest-5.9.3
index e5ee7129fabd..31ae221aff6f 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.9.3
+++ b/metadata/md5-cache/dev-qt/qttest-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=fbd71c5be36871bed8f0ca993f18b8ee
diff --git a/metadata/md5-cache/dev-qt/qttest-5.9.4 b/metadata/md5-cache/dev-qt/qttest-5.9.4
new file mode 100644
index 000000000000..a03319c8390b
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qttest-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 test? ( ~dev-qt/qtgui-5.9.4 ~dev-qt/qtxml-5.9.4 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DESCRIPTION=Unit testing library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=9a09cc19525a8a5ee513ec51be34440a
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.7.1 b/metadata/md5-cache/dev-qt/qttranslations-5.7.1
index 7be8f38ebc44..26d4b323e1d3 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.7.1
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttranslations-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=0c557233df3820f27212a7aab0264ef6
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.9.3 b/metadata/md5-cache/dev-qt/qttranslations-5.9.3
index bedd301028f2..67b808268117 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.9.3
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttranslations-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=dd235fbab214911599d7e26f1c64570e
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.9.4 b/metadata/md5-cache/dev-qt/qttranslations-5.9.4
new file mode 100644
index 000000000000..4c64c9e368ac
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/linguist-tools-5.9.4 ~dev-qt/qtcore-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Translation files for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttranslations-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=911268480aaf0c5dd8ec6c742358e3c2
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
index 215ba67c944c..5cb6a0e68cc5 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~de
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=d995579aae877ac4a5619a1850d7ff36
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.3 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.3
index 215165af2e46..42312faccd35 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=0f0150eaccd9483baeccb20807cee990
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.4 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.4
new file mode 100644
index 000000000000..6c3c043db0e7
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtsvg-5.9.4 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Virtual keyboard plugin for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=handwriting +spell +xcb debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtsvg-5.9.4 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtvirtualkeyboard-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=c48c6cb8bc7b6c4f2854587eaa202b46
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.7.1 b/metadata/md5-cache/dev-qt/qtwayland-5.7.1
index 2321640dc194..6c02f3eb5bcc 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.4.0 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwayland-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9d7394a0dc477a8ba16c9719632e18e3
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.9.3 b/metadata/md5-cache/dev-qt/qtwayland-5.9.3
index c8c1e8591abf..7251dc012ee7 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwayland-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=5fb3aed5377bd12a02bb00e0dda33640
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.9.4 b/metadata/md5-cache/dev-qt/qtwayland-5.9.4
new file mode 100644
index 000000000000..b180ebde6f22
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Wayland platform plugin for Qt
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=+libinput xcomposite debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4[egl,libinput?] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwayland-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=f8203b85ce0071070b9ba8613f5fe48c
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1 b/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
index 9bd12fa5eff9..06bc4b4798a6 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebchannel-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e8a26835419fd5a3c1421c024f273e4b
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.9.3 b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.3
index 41ddf00f771f..5466ff3f0e08 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 qml? ( ~dev-qt/qtdeclarative-5.9.3 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwebchannel-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=d9c5f87946f197e5c271af84a3c2c328
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.9.4 b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.4
new file mode 100644
index 000000000000..351683c9a1c6
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebchannel-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=bbad63d1fb759b60dc37e081887099aa
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2 b/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
index f1b387565a64..a2d7aef78439 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebengine-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=bdde4f1bce6bead538f7ddc4e00c8263
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.9.3 b/metadata/md5-cache/dev-qt/qtwebengine-5.9.3
index fca8b5e39edb..d11228dfa6d0 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwebengine-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=7fff38ddf0d87bffb16dae30266b570b
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.9.4 b/metadata/md5-cache/dev-qt/qtwebengine-5.9.4
new file mode 100644
index 000000000000..845a818a2b2b
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtwebchannel-5.9.4[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( ~dev-qt/qtpositioning-5.9.4 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.4[widgets] ~dev-qt/qtwidgets-5.9.4 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtprintsupport-5.9.4 ~dev-qt/qtwebchannel-5.9.4[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( ~dev-qt/qtpositioning-5.9.4 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.4[widgets] ~dev-qt/qtwidgets-5.9.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebengine-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=b0a155476dc1fa3a1e6df798e765a395
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.7.1 b/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
index f298cea6654b..aca3f4f21296 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
 RESTRICT=mirror test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e9e52d8f9b3c33300a1761c12b5eee6a
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.9.1 b/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
index 2bcbe064c7db..2e319dd80f21 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( gstreamer multimedia )
 RESTRICT=mirror test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=675068bc3ad1ecf755d14d9bc6ace647
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1 b/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
index 22faf59d9a48..565c7166a6b3 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtnetwork-5.7.1[ssl=] qml? ( ~dev-qt/qtdecl
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebsockets-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9eb13718d8a7d4e451684d275bf2c83e
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.9.3 b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.3
index 2099d69b3f76..e9d05d0588a3 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtnetwork-5.9.3[ssl=] qml? ( ~dev-qt/qtdecl
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwebsockets-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e53ff69c93d748c42bcaa1cdc58758a2
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.9.4 b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.4
new file mode 100644
index 000000000000..85b63c0fdc8f
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4[ssl=] qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=qml +ssl debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4[ssl=] qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebsockets-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=7d6ebe1b2d442aac1eb3d7881f0a3518
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.7.1 b/metadata/md5-cache/dev-qt/qtwebview-5.7.1
index 6621b58a4273..23fb2be61d31 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~de
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebview-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=82697778ea3ac492e122861147c788ad
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.9.3 b/metadata/md5-cache/dev-qt/qtwebview-5.9.3
index eb92832393a5..4d9a8beef5f1 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwebview-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e8647f9198111762fe53da594ddbae5d
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.9.4 b/metadata/md5-cache/dev-qt/qtwebview-5.9.4
new file mode 100644
index 000000000000..df2450992ccb
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwebengine-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Module for displaying web content in a QML application using the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwebengine-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebview-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=78a32f1358129eac1a3540c0893f209d
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.7.1 b/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
index 6b8693d9936a..f496efc5a5ac 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=,png=,xcb?] dev-qt/qtchoo
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=6495bb5330a8f0e1ed3035e301a3178a
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.9.3 b/metadata/md5-cache/dev-qt/qtwidgets-5.9.3
index d0633ff72ad3..aaf3d4d9b7aa 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=,png=,xcb?] gtk? ( ~dev-q
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=508f46744af011dc2fe9c7efa9b6c933
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.9.4 b/metadata/md5-cache/dev-qt/qtwidgets-5.9.4
new file mode 100644
index 000000000000..3540521e8e48
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.9.4[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 gtk +png +xcb debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.9.4[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=cb5ad5ef2cb47c979ea8a804dc5a49ce
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.7.1 b/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
index 31501e3f5959..6ab546fa59d7 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtx11extras-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=ea23adca57db425b64a512f8402662a5
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.9.3 b/metadata/md5-cache/dev-qt/qtx11extras-5.9.3
index c97cbd0f99b0..63ec7b85022c 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtx11extras-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=03dd3ed1dcd532fb496095a94a4187c1
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.9.4 b/metadata/md5-cache/dev-qt/qtx11extras-5.9.4
new file mode 100644
index 000000000000..03d909da4faa
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[xcb] test? ( ~dev-qt/qtwidgets-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[xcb] dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtx11extras-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=3e5e873d10953f3d5fa517577a28c3aa
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.7.1 b/metadata/md5-cache/dev-qt/qtxml-5.7.1
index d7fb54c4fa11..0ddb63ac416e 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtxml-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e6a031338a2cdc2ecba1dffe406860e7
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.9.3 b/metadata/md5-cache/dev-qt/qtxml-5.9.3
index 25f2f38de4e9..95ac9dcebdd4 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtxml-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=68f7d4b7249b9f5ac7dd097ffbc46119
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.9.4 b/metadata/md5-cache/dev-qt/qtxml-5.9.4
new file mode 100644
index 000000000000..0fef398d2674
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtxml-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 test? ( ~dev-qt/qtnetwork-5.9.4 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=63f30197a12aff9bc58901f7159b8a74
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
index ade277a288cf..c0734d4edc03 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtnetwork-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtxmlpatterns-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a31e531e8991eb6f6300a579ffe9de6a
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.3 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.3
index 1abb91290fa1..16c6af9a668f 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtnetwork-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtxmlpatterns-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=15bbfc7c1c5360523f01cc03755e547a
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.4 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.4
new file mode 100644
index 000000000000..d7635603e819
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.4 )
+DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.9
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtxmlpatterns-opensource-src-5.9.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	114966b20687a50bb00589af56c45a93	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=d680c76f73aae4ece50e319228cccbd7
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index e6488dfbbb65..f86ad0d2ea68 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-3.5.16 b/metadata/md5-cache/dev-ruby/d3_rails-3.5.16
deleted file mode 100644
index 38c97c834f0b..000000000000
--- a/metadata/md5-cache/dev-ruby/d3_rails-3.5.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Ruby on Rails integration for the Javascript Data Visualization Framework, D3
-EAPI=5
-HOMEPAGE=https://github.com/logical42/d3_rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
-KEYWORDS=~amd64
-LICENSE=MIT BSD
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/d3_rails-3.5.16.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=211d23cb20d070f5683e317de1e6ac1f
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-3.5.17 b/metadata/md5-cache/dev-ruby/d3_rails-3.5.17
index efd75040f123..bae77e828022 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-3.5.17
+++ b/metadata/md5-cache/dev-ruby/d3_rails-3.5.17
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby on Rails integration for the Javascript Data Visualization Framework, D3
 EAPI=5
 HOMEPAGE=https://github.com/logical42/d3_rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64
 LICENSE=MIT BSD
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/d3_rails-3.5.17.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=211d23cb20d070f5683e317de1e6ac1f
+_md5_=9854f144de158ffdf4de9eb1f049648f
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-4.1.1 b/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
index b7e35efa7966..5f139c64104f 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
+++ b/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby on Rails integration for the Javascript Data Visualization Framework, D3
 EAPI=5
 HOMEPAGE=https://github.com/logical42/d3_rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64
 LICENSE=MIT BSD
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/d3_rails-4.1.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9546fa81c4be82b0fe4f7c293bd22524
+_md5_=10ff77cc0f26faf46c20873c1eb07c6a
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.9.0 b/metadata/md5-cache/dev-ruby/date_validator-0.9.0
index 802444616d18..fc4c6a0d937c 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.9.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.9.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby22] >=dev-ruby/activesupport-3.0[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby23] >=dev-ruby/activesupport-3.0[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby22] >=dev-ruby/activesupport-3.0[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby23] >=dev-ruby/activesupport-3.0[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby24] >=dev-ruby/activesupport-3.0[ruby_targets_ruby24] ) doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3
 EAPI=5
 HOMEPAGE=https://github.com/codegram/date_validator
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/date_validator-0.9.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c3e7c72c1ee879a5c07ead727d09cef0
+_md5_=5e75c50a00e4e9b6d40e9f53bca96be8
diff --git a/metadata/md5-cache/dev-ruby/ddplugin-1.0.1 b/metadata/md5-cache/dev-ruby/ddplugin-1.0.1
index 783ae755341b..41c2923aded5 100644
--- a/metadata/md5-cache/dev-ruby/ddplugin-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ddplugin-1.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Provides plugin management for Ruby projects
 EAPI=5
 HOMEPAGE=https://github.com/ddfreyne/ddplugin/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1
 SRC_URI=mirror://rubygems/ddplugin-1.0.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3866b8f5000ad56990acbe371971a976
+_md5_=feb3daae9be45669efeb32cb30d1e3aa
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2 b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
deleted file mode 100644
index f574e6ea81ea..000000000000
--- a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A Ruby wrapper for the MRI 2.0 debug_inspector API
-EAPI=5
-HOMEPAGE=https://github.com/banister/debug_inspector
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/debug_inspector-0.0.2.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a53a6313756ba765c6e6f7b3ab618f02
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.1.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.1.1
deleted file mode 100644
index c00ba08cee68..000000000000
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A simple set of utility functions for Hash
-EAPI=5
-HOMEPAGE=http://trac.misuse.org/science/wiki/DeepMerge
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/deep_merge-1.1.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=265376fb465e36e2f4bd5945d5c8a7b5
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
index a10b1df441cd..9c47bdb5337b 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A simple set of utility functions for Hash
 EAPI=6
 HOMEPAGE=http://trac.misuse.org/science/wiki/DeepMerge
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/deep_merge-1.2.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3111395542a1cf2f182b5e29fe3eada5
+_md5_=695f4b43dabf29a7ce03a5730ca1bcfb
diff --git a/metadata/md5-cache/dev-ruby/delayer-0.0.2 b/metadata/md5-cache/dev-ruby/delayer-0.0.2
index 74c847372e0b..7d29012e3929 100644
--- a/metadata/md5-cache/dev-ruby/delayer-0.0.2
+++ b/metadata/md5-cache/dev-ruby/delayer-0.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Delay the processing
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/delayer
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/delayer-0.0.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1103a1fe22f27b48ee9ac06c1a275bad
+_md5_=ef2d412ab99e76818cd1ac76fd3027ab
diff --git a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2 b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
index 8590da7eb58b..4cd784fa06a3 100644
--- a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A Ruby library for handling deprecated code
 EAPI=5
 HOMEPAGE=https://github.com/erikh/deprecated
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=3
 SRC_URI=mirror://rubygems/deprecated-3.0.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ff7ce41f73190f3c89334b4409694316
+_md5_=fdcb2a9eb199140aae119bcd3317319b
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.59.3 b/metadata/md5-cache/dev-ruby/dnsruby-1.59.3
deleted file mode 100644
index da39286cbab8..000000000000
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.59.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A pure Ruby DNS client library
-EAPI=5
-HOMEPAGE=https://github.com/alexdalitz/dnsruby
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/dnsruby-1.59.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c706f1f8f7179759fbc510dcb82bfdfb
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.60.0 b/metadata/md5-cache/dev-ruby/dnsruby-1.60.0
deleted file mode 100644
index 2cfd48b07313..000000000000
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.60.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A pure Ruby DNS client library
-EAPI=5
-HOMEPAGE=https://github.com/alexdalitz/dnsruby
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/dnsruby-1.60.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c706f1f8f7179759fbc510dcb82bfdfb
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.60.1 b/metadata/md5-cache/dev-ruby/dnsruby-1.60.1
deleted file mode 100644
index fa60c93e05ec..000000000000
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.60.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A pure Ruby DNS client library
-EAPI=6
-HOMEPAGE=https://github.com/alexdalitz/dnsruby
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/dnsruby-1.60.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2d7bfdb115dc47353c8f3057bf773959
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.60.2 b/metadata/md5-cache/dev-ruby/dnsruby-1.60.2
index b99fc6965d5c..9f95f43347f7 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.60.2
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.60.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A pure Ruby DNS client library
 EAPI=6
 HOMEPAGE=https://github.com/alexdalitz/dnsruby
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/dnsruby-1.60.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2d7bfdb115dc47353c8f3057bf773959
+_md5_=a5e8bd7a92082fedc56f4ee1e7cd75cf
diff --git a/metadata/md5-cache/dev-ruby/equalizer-0.0.11 b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
index 9c53a776151e..dd36f7afafc9 100644
--- a/metadata/md5-cache/dev-ruby/equalizer-0.0.11
+++ b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Module to define equality, equivalence and inspection methods
 EAPI=5
 HOMEPAGE=https://github.com/dkubb/equalizer
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/equalizer-0.0.11.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=371a46df5723262903aae3d952bc9e55
+_md5_=b509d1ef6fcf0736ff927d1dad54aa99
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
index 578f96657dc2..594717b18c86 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Erubis is an implementation of eRuby
 EAPI=5
 HOMEPAGE=http://www.kuwata-lab.com/erubis/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby25] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/erubis-2.7.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8f46ac5d3d7a92ff0f275284ac1518e3
+_md5_=f99c3e1f7770700a802288d565bf06af
diff --git a/metadata/md5-cache/dev-ruby/escape_utils-1.2.0 b/metadata/md5-cache/dev-ruby/escape_utils-1.2.0
deleted file mode 100644
index 0bf671d41e8f..000000000000
--- a/metadata/md5-cache/dev-ruby/escape_utils-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Faster string escaping routines for your ruby apps
-EAPI=5
-HOMEPAGE=https://github.com/brianmario/escape_utils
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/escape_utils-1.2.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=85a65e204b97a293283b2defb3e9887e
diff --git a/metadata/md5-cache/dev-ruby/escape_utils-1.2.1 b/metadata/md5-cache/dev-ruby/escape_utils-1.2.1
index 6821dd7d9f10..189980daf3bb 100644
--- a/metadata/md5-cache/dev-ruby/escape_utils-1.2.1
+++ b/metadata/md5-cache/dev-ruby/escape_utils-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Faster string escaping routines for your ruby apps
 EAPI=5
 HOMEPAGE=https://github.com/brianmario/escape_utils
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/escape_utils-1.2.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=85a65e204b97a293283b2defb3e9887e
+_md5_=796a500b5856d5525170333bffad959e
diff --git a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0 b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
index 34ef57eef4c1..d86c45e79bbd 100644
--- a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
+++ b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec: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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A set of helpers to help you test your asynchronous code
 EAPI=5
 HOMEPAGE=https://github.com/ruby-amqp/evented-spec
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/evented-spec-0.9.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=59f7e6b38ea6c2bae4bcfca79cc2a455
+_md5_=3c1446e71cd866c84dd2a4a5dc71475d
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.1 b/metadata/md5-cache/dev-ruby/exifr-1.3.1
deleted file mode 100644
index 93771acdcf74..000000000000
--- a/metadata/md5-cache/dev-ruby/exifr-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A library to read EXIF info from JPEG and TIFF images
-EAPI=6
-HOMEPAGE=https://github.com/remvee/exifr/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/exifr-1.3.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7a6c1f37f8e17690904029a0c5127400
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.3 b/metadata/md5-cache/dev-ruby/exifr-1.3.3
index 28707b63cdc3..e6dedee6ee8c 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.3.3
+++ b/metadata/md5-cache/dev-ruby/exifr-1.3.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A library to read EXIF info from JPEG and TIFF images
 EAPI=6
 HOMEPAGE=https://github.com/remvee/exifr/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/exifr-1.3.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5a80f9063e290750f6bb5b21f43bedc6
+_md5_=3f933fed1826d2d42dc304977ed84168
diff --git a/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518 b/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
index 64b5f4c91c8b..5930e5220973 100644
--- a/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
+++ b/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A math parser
 EAPI=5
 HOMEPAGE=http://lukaszwrobel.pl/blog/math-parser-part-3-implementation
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/nricciar/expression_parser/archive/6e3c7973423ff0f2cd33db2304fcd4eac3af01ad.tar.gz -> expression_parser-0.9.0_p20130518.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e7e438b10393d9aeb329f9a6d7b026b1
+_md5_=1eae9adc519702723cd81ea1a54aa4d4
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
index 30a14469e5fc..5b75fed53bd9 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Simple wrapper around multithreaded Porter stemming algorithm
 EAPI=5
 HOMEPAGE=https://github.com/romanbsd/fast-stemmer
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/fast-stemmer-1.0.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e7461513bed8d367e06bbd655f24ef66
+_md5_=c99a3dbc1010b8a08cfc0cd8c35d0bcd
diff --git a/metadata/md5-cache/dev-ruby/fattr-2.3.0 b/metadata/md5-cache/dev-ruby/fattr-2.3.0
index 42865caf5798..a65bccdebc11 100644
--- a/metadata/md5-cache/dev-ruby/fattr-2.3.0
+++ b/metadata/md5-cache/dev-ruby/fattr-2.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=fattr.rb is a "fatter attr" for ruby
 EAPI=5
 HOMEPAGE=https://github.com/ahoward/fattr
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=~amd64 ~x86 ~x86-fbsd
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/fattr-2.3.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d1bdf242288738eeada2774b25782f99
+_md5_=fceb6313b1fb77c625777e8b28b5d7d2
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
index a047cc21fc2c..d915280f194e 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/fcgi ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=dev-libs/fcgi ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=FastCGI library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/alphallc/ruby-fcgi-ng
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=Ruby
-RDEPEND=dev-libs/fcgi ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-libs/fcgi ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/fcgi-0.9.2.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fcaf39eafe2c212c837927d03aafd1fd
+_md5_=c35944532f658a2be4cb4ce40ce37abe
diff --git a/metadata/md5-cache/dev-ruby/ferret-0.11.8.6 b/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
deleted file mode 100644
index 80c75fc4ea3c..000000000000
--- a/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/bzip2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A ruby indexing/searching library
-EAPI=5
-HOMEPAGE=https://github.com/jkraemer/ferret
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/ferret-0.11.8.6.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=feddea99478a88077b22f6af30489e6a
diff --git a/metadata/md5-cache/dev-ruby/ferret-0.11.8.7 b/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
index d1d39a15e567..46d6d4702e6b 100644
--- a/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
+++ b/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/bzip2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=app-arch/bzip2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A ruby indexing/searching library
 EAPI=5
 HOMEPAGE=https://github.com/jkraemer/ferret
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=app-arch/bzip2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=app-arch/bzip2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/ferret-0.11.8.7.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e8921ebdb9c30839f7ac755e9b2473e1
+_md5_=b3c2a391d6d9919d69bd3e538cefb26a
diff --git a/metadata/md5-cache/dev-ruby/file-tail-1.1.1 b/metadata/md5-cache/dev-ruby/file-tail-1.1.1
deleted file mode 100644
index 0ffb42176d42..000000000000
--- a/metadata/md5-cache/dev-ruby/file-tail-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A small ruby library that allows it to 'tail' files in Ruby
-EAPI=5
-HOMEPAGE=https://flori.github.com/file-tail
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/file-tail-1.1.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ed5fa4848b5002d8626720e74626598a
diff --git a/metadata/md5-cache/dev-ruby/filesize-0.1.1 b/metadata/md5-cache/dev-ruby/filesize-0.1.1
index 8eefc767c6bb..ea0b90414308 100644
--- a/metadata/md5-cache/dev-ruby/filesize-0.1.1
+++ b/metadata/md5-cache/dev-ruby/filesize-0.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=small ruby class for handling filesizes with both the SI and binary prefixes
 EAPI=5
 HOMEPAGE=https://github.com/dominikh/filesize
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.1.1
 SRC_URI=mirror://rubygems/filesize-0.1.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=750e93f6f699bbe53b68fb4cefcc4007
+_md5_=d8afdd09f485b9696fd44dadc9e358d1
diff --git a/metadata/md5-cache/dev-ruby/fivemat-1.3.3 b/metadata/md5-cache/dev-ruby/fivemat-1.3.3
deleted file mode 100644
index f0c5145718ed..000000000000
--- a/metadata/md5-cache/dev-ruby/fivemat-1.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=MiniTest/RSpec/Cucumber formatter that gives each test file its own line of dots
-EAPI=5
-HOMEPAGE=https://github.com/tpope/fivemat
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/fivemat-1.3.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d6aae3f1a0e7cdb46cbdfd33fe60faf5
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.2 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.2
deleted file mode 100644
index 0305d681a3bb..000000000000
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/railties-3.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Font-awesome for the asset pipeline
-EAPI=6
-HOMEPAGE=https://github.com/bokmann/font-awesome-rails https://rubygems.org/gems/font-awesome-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
-KEYWORDS=~amd64
-LICENSE=MIT OFL
-RDEPEND=ruby_targets_ruby22? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/railties-3.2:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/font-awesome-rails-4.7.0.2.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0720889c3cc7929acd9ccb5bbaac1fad
diff --git a/metadata/md5-cache/dev-ruby/forgery-0.6.0 b/metadata/md5-cache/dev-ruby/forgery-0.6.0
deleted file mode 100644
index bb0240c9a487..000000000000
--- a/metadata/md5-cache/dev-ruby/forgery-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Easy and customizable generation of forged data
-EAPI=5
-HOMEPAGE=https://github.com/sevenwire/forgery
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/sevenwire/forgery/archive/v0.6.0.tar.gz -> forgery-0.6.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7c9a8d22a61b6629ca8aa15b8f083aff
diff --git a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0 b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0
deleted file mode 100644
index bd49ef168b79..000000000000
--- a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Forwardable with hash, and instance variable extensions
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/forwardable-extended https://github.com/envygeeks/forwardable-extended
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/forwardable-extended-2.6.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=936fc376adc952037240b4e979a5e2dd
diff --git a/metadata/md5-cache/dev-ruby/gh-0.15.0-r1 b/metadata/md5-cache/dev-ruby/gh-0.15.0-r1
deleted file mode 100644
index 7c2ab47e9cd7..000000000000
--- a/metadata/md5-cache/dev-ruby/gh-0.15.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-ruby/webmock[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/webmock[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=multi-layer client for the github api v3
-EAPI=5
-HOMEPAGE=https://github.com/travis-ci/gh
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/travis-ci/gh/archive/v0.15.0.tar.gz -> gh-0.15.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=aaec712591791403e4ecf0591038920f
diff --git a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2 b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
index 21c0d31ca2ef..b0e21ee4617a 100644
--- a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
+++ b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Gnuplot drawing library - Ruby Bindings
 EAPI=5
 HOMEPAGE=http://rgplot.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
-RDEPEND=sci-visualization/gnuplot ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=sci-visualization/gnuplot ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/gnuplot-2.6.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a42b83004d976322eca69e479435c2b8
+_md5_=80821e976d47b1fa2e25cefbf20c63d0
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-0.3.4 b/metadata/md5-cache/dev-ruby/hashdiff-0.3.4
deleted file mode 100644
index 357de5376316..000000000000
--- a/metadata/md5-cache/dev-ruby/hashdiff-0.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Simple Hash extension to make working with nested hashes easier
-EAPI=6
-HOMEPAGE=https://github.com/liufengyun/hashdiff
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/hashdiff-0.3.4.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=23f0731a0bd9fca88e5cb18e9f3fa116
diff --git a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1 b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1
deleted file mode 100644
index 7aeb9d695ed1..000000000000
--- a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Internal HashiCorp service to check version information
-EAPI=5
-HOMEPAGE=http://www.hashicorp.com
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/hashicorp-checkpoint-0.1.4.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=df94dcf2b22a4c0f5a14f57cf34bf2d0
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.4.6 b/metadata/md5-cache/dev-ruby/hashie-3.4.6
deleted file mode 100644
index 0a7fdb478d78..000000000000
--- a/metadata/md5-cache/dev-ruby/hashie-3.4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Hashie is a small collection of tools that make hashes more powerful
-EAPI=5
-HOMEPAGE=http://intridea.com/posts/hashie-the-hash-toolkit
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=mirror://rubygems/hashie-3.4.6.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=93555959c43ba2750d96d25a45a37a45
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.5.1 b/metadata/md5-cache/dev-ruby/hashie-3.5.1
deleted file mode 100644
index f624591ef205..000000000000
--- a/metadata/md5-cache/dev-ruby/hashie-3.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Hashie is a small collection of tools that make hashes more powerful
-EAPI=5
-HOMEPAGE=https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=mirror://rubygems/hashie-3.5.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fc18f23b2f3eeeceec627e1f5a39a7ec
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.5.5 b/metadata/md5-cache/dev-ruby/hashie-3.5.5
deleted file mode 100644
index e0f3b35a675a..000000000000
--- a/metadata/md5-cache/dev-ruby/hashie-3.5.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activesupport[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Hashie is a small collection of tools that make hashes more powerful
-EAPI=5
-HOMEPAGE=https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=mirror://rubygems/hashie-3.5.5.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9c7efdc1093374387dd7dcd000d000c2
diff --git a/metadata/md5-cache/dev-ruby/hashr-2.0.0 b/metadata/md5-cache/dev-ruby/hashr-2.0.0
deleted file mode 100644
index 3acbe525c36d..000000000000
--- a/metadata/md5-cache/dev-ruby/hashr-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Simple Hash extension to make working with nested hashes easier
-EAPI=5
-HOMEPAGE=https://github.com/svenfuchs/hashr
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/hashr-2.0.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=15d7e1c71cce1676cfccd6a1b58212c4
diff --git a/metadata/md5-cache/dev-ruby/hashr-2.0.1 b/metadata/md5-cache/dev-ruby/hashr-2.0.1
index 31366ffb6da3..313d94c19a10 100644
--- a/metadata/md5-cache/dev-ruby/hashr-2.0.1
+++ b/metadata/md5-cache/dev-ruby/hashr-2.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Simple Hash extension to make working with nested hashes easier
 EAPI=5
 HOMEPAGE=https://github.com/svenfuchs/hashr
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashr-2.0.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e5a1b0be5ccddf38952f7c28fc8b77ba
+_md5_=aaad2bae72ddff20837780c2ffcfe020
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
index 8714976139fd..ea9f7768d295 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby25] dev-ruby/test-unit:2[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Removes leading whitespace from Ruby heredocs
 EAPI=5
 HOMEPAGE=https://github.com/adrianomitre/heredoc_unindent
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/heredoc_unindent-1.2.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=15b983f9a585297e7afcab91a2645359
+_md5_=6f0a37adceb62ec134ffa6a5cc7477b2
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6 b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
deleted file mode 100644
index 00324768969b..000000000000
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A plaintext backend for hiera-eyaml
-EAPI=5
-HOMEPAGE=https://github.com/gtmtechltd/hiera-eyaml-plaintext
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/hiera-eyaml-plaintext-0.6.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0f768a0932c8c1aa6c6ee563b49a1e37
diff --git a/metadata/md5-cache/dev-ruby/highline-1.7.8 b/metadata/md5-cache/dev-ruby/highline-1.7.8
index b9e3b9449cdb..988f4735906f 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.7.8
+++ b/metadata/md5-cache/dev-ruby/highline-1.7.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Highline is a high-level command-line IO library for ruby
 EAPI=5
 HOMEPAGE=https://github.com/JEG2/highline
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/highline-1.7.8.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=802acd83f2dd25deb9ab323c66e99b71
+_md5_=5a0b28b8cd115ef1cb5477c08c299ff6
diff --git a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1 b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
index e10444d7336e..6200250b837b 100644
--- a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Hike is a Ruby library for finding files in a set of paths
 EAPI=5
 HOMEPAGE=https://github.com/sstephenson/hike
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/sstephenson/hike/archive/v1.2.3.tar.gz -> hike-1.2.3.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=dd80ce1ef1738f5f3d446afb261c5265
+_md5_=9060757e07a13364c840007b474e99a7
diff --git a/metadata/md5-cache/dev-ruby/hike-2.1.2 b/metadata/md5-cache/dev-ruby/hike-2.1.2
index 4946462288e6..458fb9ce5b88 100644
--- a/metadata/md5-cache/dev-ruby/hike-2.1.2
+++ b/metadata/md5-cache/dev-ruby/hike-2.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Hike is a Ruby library for finding files in a set of paths
 EAPI=5
 HOMEPAGE=https://github.com/sstephenson/hike
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=2
 SRC_URI=https://github.com/sstephenson/hike/archive/v2.1.2.tar.gz -> hike-2.1.2.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3340a4f0917407004a85de6eb9df10c4
+_md5_=1f0addba51a5db6610f6aae0a1a61fc5
diff --git a/metadata/md5-cache/dev-ruby/hitimes-1.2.4 b/metadata/md5-cache/dev-ruby/hitimes-1.2.4
deleted file mode 100644
index dc32ae992960..000000000000
--- a/metadata/md5-cache/dev-ruby/hitimes-1.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A fast, high resolution timer library
-EAPI=5
-HOMEPAGE=https://github.com/copiousfreetime/hitimes
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=ISC
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/hitimes-1.2.4.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1f1ddc62c23fde9b6d3a1fb9cfd52c9b
diff --git a/metadata/md5-cache/dev-ruby/hitimes-1.2.5 b/metadata/md5-cache/dev-ruby/hitimes-1.2.5
deleted file mode 100644
index 81f0cb889293..000000000000
--- a/metadata/md5-cache/dev-ruby/hitimes-1.2.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A fast, high resolution timer library
-EAPI=6
-HOMEPAGE=https://github.com/copiousfreetime/hitimes
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=ISC
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/hitimes-1.2.5.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9399519a2f1b40804439421af9143a31
diff --git a/metadata/md5-cache/dev-ruby/hitimes-1.2.6 b/metadata/md5-cache/dev-ruby/hitimes-1.2.6
index 6377556d247e..c6236ee76682 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-1.2.6
+++ b/metadata/md5-cache/dev-ruby/hitimes-1.2.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A fast, high resolution timer library
 EAPI=6
 HOMEPAGE=https://github.com/copiousfreetime/hitimes
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/hitimes-1.2.6.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9399519a2f1b40804439421af9143a31
+_md5_=eea7b4c1b3c795dc4edf6b8a10f8de04
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.5 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.5
index 99d0eba56812..3a963052c3da 100644
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.5
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Hoe plugins providing tasks used by seattle.rb
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/hoe-seattlerb
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-seattlerb-1.3.5.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6ee12666c30d0588017cecea6b75b3aa
+_md5_=47f88a7ad126d65f2a894053cf5d762f
diff --git a/metadata/md5-cache/dev-ruby/html2haml-2.2.0 b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
index a1eb6df5a82d..e753d67d0b8a 100644
--- a/metadata/md5-cache/dev-ruby/html2haml-2.2.0
+++ b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby22] >=dev-ruby/haml-4.0.0[ruby_targets_ruby22] <dev-ruby/haml-6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby23] >=dev-ruby/haml-4.0.0[ruby_targets_ruby23] <dev-ruby/haml-6[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby22] >=dev-ruby/haml-4.0.0[ruby_targets_ruby22] <dev-ruby/haml-6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby23] >=dev-ruby/haml-4.0.0[ruby_targets_ruby23] <dev-ruby/haml-6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby24] >=dev-ruby/haml-4.0.0[ruby_targets_ruby24] <dev-ruby/haml-6[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Convert HTML and HTML+Erb to Haml
 EAPI=6
 HOMEPAGE=https://github.com/haml/html2haml
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby22] >=dev-ruby/haml-4.0.0[ruby_targets_ruby22] <dev-ruby/haml-6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby23] >=dev-ruby/haml-4.0.0[ruby_targets_ruby23] <dev-ruby/haml-6[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby22] >=dev-ruby/haml-4.0.0[ruby_targets_ruby22] <dev-ruby/haml-6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby23] >=dev-ruby/haml-4.0.0[ruby_targets_ruby23] <dev-ruby/haml-6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby24] >=dev-ruby/haml-4.0.0[ruby_targets_ruby24] <dev-ruby/haml-6[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/html2haml-2.2.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=24cfe7b244d099c78a3d8cd456fde76d
+_md5_=f9c5918c1d67757acbb256fdc13b8761
diff --git a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4 b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
index b7de76dfa56b..d8a22a34a9db 100644
--- a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
+++ b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A simple library for encoding/decoding entities in (X)HTML documents
 EAPI=5
 HOMEPAGE=https://github.com/threedaymonk/htmlentities
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=amd64 x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/htmlentities-4.3.4.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2ec6096064467dcda51feb312d46598c
+_md5_=b8a06fa70e758271c16d8bdcfcbc450f
diff --git a/metadata/md5-cache/dev-ruby/httpauth-0.2.1 b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
index e44124f711c2..d52f1f5356f0 100644
--- a/metadata/md5-cache/dev-ruby/httpauth-0.2.1
+++ b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Library implementing the full HTTP Authentication protocol (RFC 2617)
 EAPI=5
 HOMEPAGE=https://github.com/Manfred/HTTPauth
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/Manfred/HTTPauth/archive/v0.2.1.tar.gz -> httpauth-0.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=53a065a40e3574dd061cd6a243e3d75b
+_md5_=1058f9e930c7a1658435ecca650985c6
diff --git a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1 b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
index 4998784db985..41a97164fa9f 100644
--- a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
+++ b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Measure image size (GIF, PNG, JPEG, etc)
 EAPI=5
 HOMEPAGE=http://imagesize.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=amd64 ~ppc x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/mattheworiordan/imagesize/archive/bd5be2afb088beba3f0d863cef4eac7db56ca804.tar.gz -> imagesize-0.1.1_p20100902.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4fc597fe1dbb5de652c59fde273010fc
+_md5_=b38e1c90d60880ceb74aa5846c439f56
diff --git a/metadata/md5-cache/dev-ruby/inflecto-0.0.2 b/metadata/md5-cache/dev-ruby/inflecto-0.0.2
index 29ed7bfa1f28..54466619d7c5 100644
--- a/metadata/md5-cache/dev-ruby/inflecto-0.0.2
+++ b/metadata/md5-cache/dev-ruby/inflecto-0.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Inflector for ruby
 EAPI=6
 HOMEPAGE=https://github.com/mbj/inflecto
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/inflecto-0.0.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=98533d1e94944fa05542043f7c703323
+_md5_=4b9f7920a15af3100f52c63cecc2a852
diff --git a/metadata/md5-cache/dev-ruby/inifile-3.0.0 b/metadata/md5-cache/dev-ruby/inifile-3.0.0
index 264d51c77f3d..f73c9c8c81e4 100644
--- a/metadata/md5-cache/dev-ruby/inifile-3.0.0
+++ b/metadata/md5-cache/dev-ruby/inifile-3.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Native Ruby package for reading and writing INI files
 EAPI=5
 HOMEPAGE=https://github.com/TwP/inifile
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/inifile-3.0.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=91a622fa2ae828f66674e1ab7d38a22e
+_md5_=880370f8d9e552a969c77ae6af1af96e
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0 b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
index 4d451856dccd..4a7a2012e067 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
+++ b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Manage class instances with dictionary
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/instance_storage/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/instance_storage-1.0.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=324f91ee656b079a6ee1231bb9e62151
+_md5_=05ac1889c0ad8169853f62f881518296
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.7 b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
index f56d5ad3c73f..8ba3f9b634bc 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.7
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/blankslate:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Instantiate an arbitrary Ruby class
 EAPI=5
 HOMEPAGE=https://github.com/floehopper/introspection
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/blankslate:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/instantiator-0.0.7.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a69343821c83de6b6a27c8af6d435eaa
+_md5_=c6cf2c008afe3157d9d3a136d8c2fa84
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.5.4 b/metadata/md5-cache/dev-ruby/itextomml-1.5.4
deleted file mode 100644
index 1f32297c7058..000000000000
--- a/metadata/md5-cache/dev-ruby/itextomml-1.5.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Native Ruby bindings to itex2MML, which converts itex equations to MathML
-EAPI=5
-HOMEPAGE=http://golem.ph.utexas.edu/~distler/blog/itex2MML.html
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=|| ( GPL-2+ MPL-1.1 LGPL-2+ )
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://rubygems/itextomml-1.5.4.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=045f5944b6eb6e049b6001e342c675fe
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.5.5 b/metadata/md5-cache/dev-ruby/itextomml-1.5.5
deleted file mode 100644
index 6519db9a708b..000000000000
--- a/metadata/md5-cache/dev-ruby/itextomml-1.5.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Native Ruby bindings to itex2MML, which converts itex equations to MathML
-EAPI=5
-HOMEPAGE=http://golem.ph.utexas.edu/~distler/blog/itex2MML.html
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2+ MPL-1.1 LGPL-2+ )
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://rubygems/itextomml-1.5.5.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=84b2f135f05edf37939b92be87949456
diff --git a/metadata/md5-cache/dev-ruby/journey-1.0.4-r1 b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
index 567b852fdbc5..ef113fc0d435 100644
--- a/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/json[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/json[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/json[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/json[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/hoe[ruby_targets_ruby25] dev-ruby/json[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Journey is a router. It routes requests
 EAPI=5
 HOMEPAGE=https://github.com/rails/journey
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/journey-1.0.4.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=45d38476f5373f9e6abd9803f86be820
+_md5_=8148140659e17eccad0ce9e316aa8160
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2 b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
index 825b11615648..c46a3cd4a23d 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !dev-ruby/jsobfu:0[ruby_targets_ruby23] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/execjs[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/execjs[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !dev-ruby/jsobfu:0[ruby_targets_ruby23] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !dev-ruby/jsobfu:0[ruby_targets_ruby24] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/execjs[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/execjs[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/execjs[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Javascript code obfuscator
 EAPI=6
 HOMEPAGE=https://github.com/rapid7/jsobfu
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !dev-ruby/jsobfu:0[ruby_targets_ruby23] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !dev-ruby/jsobfu:0[ruby_targets_ruby23] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !dev-ruby/jsobfu:0[ruby_targets_ruby24] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.4.2
 SRC_URI=mirror://rubygems/jsobfu-0.4.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3b20111ef743d6f2d30e1aa5e86d522b
+_md5_=f530ac46a1849b894bea856f483fe9f3
diff --git a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2 b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
index feaf03ec8044..0b448dbd3dcd 100644
--- a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
+++ b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A simple Ruby DBMS that stores data in plaintext files
 EAPI=5
 HOMEPAGE=http://www.netpromi.com/kirbybase_ruby.html
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/KirbyBase-2.6.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fa210294535d457497b0753cc0cd28b8
+_md5_=1844b668ba10dba51a6cddb9f16c208d
diff --git a/metadata/md5-cache/dev-ruby/kissfft-0.0.2 b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
index 6d608eb0df78..69576e3e8301 100644
--- a/metadata/md5-cache/dev-ruby/kissfft-0.0.2
+++ b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=ruby interface to kissfft
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/kissfft
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/kissfft-0.0.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=17564cf74ca56a5482bddf065015b709
+_md5_=9609dd6ac1697ee7692b5439de41426b
diff --git a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2 b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
index ae99f7176622..577895bda9b5 100644
--- a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
+++ b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec: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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Levenshtein distance algorithm
 EAPI=5
 HOMEPAGE=https://github.com/mbleigh/mash
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/levenshtein-0.2.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9939a2dc74930db623c8bcec9d357e3f
+_md5_=3a50cf11acd780d50e6e04f9b2b37027
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 78b3f396c8d0..d3e3f66546eb 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/racket-6.11 b/metadata/md5-cache/dev-scheme/racket-6.11
new file mode 100644
index 000000000000..f043c45c8158
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/racket-6.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
+DESCRIPTION=General purpose, multi-paradigm Lisp-Scheme programming language
+EAPI=6
+HOMEPAGE=http://racket-lang.org/
+IUSE=doc +futures +jit minimal +places +threads +X
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ LGPL-3
+RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
+REQUIRED_USE=futures? ( jit )
+SLOT=0
+SRC_URI=minimal? ( http://download.racket-lang.org/installers/6.11/racket-minimal-6.11-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/6.11/racket-6.11-src-builtpkgs.tgz )
+_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
+_md5_=732b568d2f3455d9ad80ffb9a550b576
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 0d17a1816942..01389af1477a 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/boost-build-1.65.0 b/metadata/md5-cache/dev-util/boost-build-1.65.0
index 1026c3a153ef..77fb24d88717 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.65.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.65.0
@@ -4,7 +4,7 @@ DESCRIPTION=A system for large project software construction, simple to use and
 EAPI=6
 HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
 IUSE=examples python test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Boost-1.0
 RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1
 REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5010d292271489b9e09e1cadaecf2ce6
+_md5_=b89df0c4990252d97379c09af534066c
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.17.12 b/metadata/md5-cache/dev-util/checkbashisms-2.17.12
new file mode 100644
index 000000000000..150e9c602bf4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.17.12
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
+EAPI=6
+HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.17.12.tar.xz
+_md5_=e699215e3a300f6440f6a125c805af82
diff --git a/metadata/md5-cache/dev-util/devhelp-3.22.0 b/metadata/md5-cache/dev-util/devhelp-3.22.0
deleted file mode 100644
index 907ca8756e3d..000000000000
--- a/metadata/md5-cache/dev-util/devhelp-3.22.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.19.3:3 >=net-libs/webkit-gtk-2.6.0:4 python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-util/intltool-0.40 gnome-base/gnome-common virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An API documentation browser for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Devhelp
-IUSE=gedit python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.19.3:3 >=net-libs/webkit-gtk-2.6.0:4 gedit? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-editors/gedit[introspection,python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] x11-libs/gtk+[introspection] ) gnome-base/gsettings-desktop-schemas
-REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
-SLOT=0/3-1
-SRC_URI=mirror://gnome/sources/devhelp/3.22/devhelp-3.22.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e7571480fd3f07b1cfef1214583c16b4
diff --git a/metadata/md5-cache/dev-util/kdevplatform-5.1.2 b/metadata/md5-cache/dev-util/kdevplatform-5.1.2
deleted file mode 100644
index 53b5f98811b4..000000000000
--- a/metadata/md5-cache/dev-util/kdevplatform-5.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=kde-apps/libkomparediff2-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 reviewboard? ( dev-libs/purpose ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) welcomepage? ( >=dev-qt/qtdeclarative-5.7.1:5[widgets] ) dev-libs/boost >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE development support libraries and apps
-EAPI=6
-HOMEPAGE=https://www.kdevelop.org/
-IUSE=cvs reviewboard subversion +welcomepage test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=kde-apps/libkomparediff2-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 reviewboard? ( dev-libs/purpose ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) welcomepage? ( >=dev-qt/qtdeclarative-5.7.1:5[widgets] ) cvs? ( dev-vcs/cvs ) reviewboard? ( >=kde-apps/ktp-accounts-kcm-14.12.0:5 ) !dev-util/kdevelop:4 !dev-util/kdevplatform:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=test? ( welcomepage )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/kdevelop/5.1.2/src/kdevplatform-5.1.2.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c5d205f5f572c3dfb52cb27b526a9dd9
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index a1d40554f021..619cf19641ca 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-lfs-2.3.1 b/metadata/md5-cache/dev-vcs/git-lfs-2.3.4
index 1f64f6e590a2..2f5bf612b283 100644
--- a/metadata/md5-cache/dev-vcs/git-lfs-2.3.1
+++ b/metadata/md5-cache/dev-vcs/git-lfs-2.3.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=MIT BSD BSD-2 BSD-4 Apache-2.0
 RDEPEND=dev-vcs/git
 SLOT=0
-SRC_URI=https://github.com/git-lfs/git-lfs/archive/v2.3.1.tar.gz -> git-lfs-2.3.1.tar.gz
+SRC_URI=https://github.com/git-lfs/git-lfs/archive/v2.3.4.tar.gz -> git-lfs-2.3.4.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=0fdc807d24750ec4f07387f105af0fe3
+_md5_=73f0a2b76fabcdb5f1f298a08bb6e2f5
diff --git a/metadata/md5-cache/dev-vcs/tig-2.3.3 b/metadata/md5-cache/dev-vcs/tig-2.3.3
new file mode 100644
index 000000000000..1c6d6f1b8408
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tig-2.3.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0=
+DESCRIPTION=text mode interface for git
+EAPI=6
+HOMEPAGE=https://jonas.github.io/tig/
+IUSE=test unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
+REQUIRED_USE=test? ( unicode )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/jonas/tig/releases/download/tig-2.3.3/tig-2.3.3.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=c2b2664aea7f68768327f9ea72977ffe
diff --git a/metadata/md5-cache/dev-vcs/tig-9999 b/metadata/md5-cache/dev-vcs/tig-9999
index ee9e6d60288f..19707ee9851e 100644
--- a/metadata/md5-cache/dev-vcs/tig-9999
+++ b/metadata/md5-cache/dev-vcs/tig-9999
@@ -3,9 +3,11 @@ DEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= app-text/asciidoc app-
 DESCRIPTION=text mode interface for git
 EAPI=6
 HOMEPAGE=https://jonas.github.io/tig/
-IUSE=unicode
+IUSE=test unicode
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
+REQUIRED_USE=test? ( unicode )
+RESTRICT=test
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7ddd662f250c6c5ce38296db9f88fdba
+_md5_=c2b2664aea7f68768327f9ea72977ffe
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 6b0589a9ffb8..1b4066aebc54 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/gnome-nibbles-3.22.2.2 b/metadata/md5-cache/games-arcade/gnome-nibbles-3.22.2.2
deleted file mode 100644
index 8426b68a316b..000000000000
--- a/metadata/md5-cache/games-arcade/gnome-nibbles-3.22.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-support:1 >=media-libs/clutter-1.22.0:1.0 >=media-libs/clutter-gtk-1.4.0:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.18.0:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50.2 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Nibbles clone for Gnome
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Nibbles
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-support:1 >=media-libs/clutter-1.22.0:1.0 >=media-libs/clutter-gtk-1.4.0:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.18.0:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-nibbles/3.22/gnome-nibbles-3.22.2.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1d8a69bcb8f572c2eaa07e6c6352c5d3
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 94bc3c0f8ab1..7e2b9aac3f01 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/gnome-chess-3.22.2 b/metadata/md5-cache/games-board/gnome-chess-3.22.2
deleted file mode 100644
index 87a4029d32ef..000000000000
--- a/metadata/md5-cache/games-board/gnome-chess-3.22.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.19:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Play the classic two-player boardgame of chess
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Chess
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.19:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-chess/3.22/gnome-chess-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ca7be7ee7a9cc9bdd15f94e7bf406af
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.22.2 b/metadata/md5-cache/games-board/gnome-mines-3.22.2
deleted file mode 100644
index 6d56ca8c1093..000000000000
--- a/metadata/md5-cache/games-board/gnome-mines-3.22.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgnome-games-support:1 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.12:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Clear hidden mines from a minefield
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Mines
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgnome-games-support:1 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.12:3 !<x11-themes/gnome-themes-standard-3.14
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-mines/3.22/gnome-mines-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cc3ce4b3327e2fb2d72fabcc8f7fa602
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 2ef8a32e0f89..d07eac5b4fda 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.22.2 b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.22.2
deleted file mode 100644
index ab155ae04ecc..000000000000
--- a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.22.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.19.0:3[introspection] x11-libs/pango[introspection] || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Test your logic skills in this number grid puzzle
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Sudoku
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-3+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.19.0:3[introspection] x11-libs/pango[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-sudoku/3.22/gnome-sudoku-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0abebdaaca7bc5f5316f2597c5af5822
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-3.22.2 b/metadata/md5-cache/games-puzzle/lightsoff-3.22.2
deleted file mode 100644
index 02b1db0c6c6b..000000000000
--- a/metadata/md5-cache/games-puzzle/lightsoff-3.22.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/librsvg-2.32:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5.5:1.0 >=x11-libs/gtk+-3.13.4:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Turn off all the lights
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Lightsoff
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/librsvg-2.32:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5.5:1.0 >=x11-libs/gtk+-3.13.4:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/lightsoff/3.22/lightsoff-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56b8394e0658aaf2926505fdd74c2fca
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.22.2 b/metadata/md5-cache/games-puzzle/swell-foop-3.22.2
deleted file mode 100644
index d5e8e16ae79f..000000000000
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.22.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5:1.0 >=x11-libs/gtk+-3.12:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Clear the screen by removing groups of colored and shaped tiles
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Swell%20Foop
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5:1.0 >=x11-libs/gtk+-3.12:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/swell-foop/3.22/swell-foop-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=097b666a8be2173521d4e722cb4a8b79
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 243d56c97e79..03720a229868 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/openttd-1.7.2 b/metadata/md5-cache/games-simulation/openttd-1.7.2
new file mode 100644
index 000000000000..469bd46daf3f
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/openttd-1.7.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst
+DEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu-layoutex dev-libs/icu-le-hb >=dev-libs/icu-58.1:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=OpenTTD is a clone of Transport Tycoon Deluxe
+EAPI=6
+HOMEPAGE=http://www.openttd.org/
+IUSE=aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=!dedicated? ( openmedia? ( games-misc/openmsx games-misc/opensfx ) aplaymidi? ( media-sound/alsa-utils ) !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) ) openmedia? ( >=games-misc/opengfx-0.4.7 )
+RDEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu-layoutex dev-libs/icu-le-hb >=dev-libs/icu-58.1:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://binaries.openttd.org/releases/1.7.2/openttd-1.7.2-source.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=035f7c35894880d5718b5616f98f2cfb
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index d3a66d35f5b6..bb2d9769d808 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/freeciv-2.5.10 b/metadata/md5-cache/games-strategy/freeciv-2.5.10
new file mode 100644
index 000000000000..561eba3c283b
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/freeciv-2.5.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.2 ) virtual/pkgconfig !dedicated? ( x11-proto/xextproto nls? ( sys-devel/gettext ) ) >=sys-apps/sed-4
+DESCRIPTION=multiplayer strategy game (Civilization Clone)
+EAPI=6
+HOMEPAGE=http://www.freeciv.org/
+IUSE=auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.2 )
+SLOT=0
+SRC_URI=mirror://sourceforge/freeciv/freeciv-2.5.10.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d31bdce1acdab96ab27a7872ea6cc79b
diff --git a/metadata/md5-cache/games-strategy/freeciv-2.6.0_beta1 b/metadata/md5-cache/games-strategy/freeciv-2.6.0_beta2
index 06baec2acf75..6aa1afbde68a 100644
--- a/metadata/md5-cache/games-strategy/freeciv-2.6.0_beta1
+++ b/metadata/md5-cache/games-strategy/freeciv-2.6.0_beta2
@@ -7,6 +7,6 @@ IUSE=auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sd
 LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.3 )
 SLOT=0
-SRC_URI=mirror://sourceforge/freeciv/freeciv-2.6.0-beta1.tar.bz2
+SRC_URI=mirror://sourceforge/freeciv/freeciv-2.6.0-beta2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=69c941d3881b7e56e95b39826a923ca0
+_md5_=6d32ae42e2c8a477de189dc5a86d559a
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 3704f43f053c..3742948f86ce 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/dconf-editor-3.22.3 b/metadata/md5-cache/gnome-base/dconf-editor-3.22.3
deleted file mode 100644
index f81b6b86c59e..000000000000
--- a/metadata/md5-cache/gnome-base/dconf-editor-3.22.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46.0:2 >=gnome-base/dconf-0.25.1 >=x11-libs/gtk+-3.22.0:3 >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Graphical tool for editing the dconf configuration database
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/dconf-editor
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46.0:2 >=gnome-base/dconf-0.25.1 >=x11-libs/gtk+-3.22.0:3 !<gnome-base/dconf-0.22[X]
-SLOT=0
-SRC_URI=mirror://gnome/sources/dconf-editor/3.22/dconf-editor-3.22.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a3f73cc1ee962f846248bede4701a20
diff --git a/metadata/md5-cache/gnome-base/gdm-3.22.3-r1 b/metadata/md5-cache/gnome-base/gdm-3.22.3-r1
deleted file mode 100644
index 65cf946b8f8b..000000000000
--- a/metadata/md5-cache/gnome-base/gdm-3.22.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libxcb >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/intltool-0.40.0 dev-util/itstool virtual/pkgconfig x11-proto/inputproto x11-proto/randrproto test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=GNOME Display Manager for managing graphical display servers and user logins
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GDM
-IUSE=accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86
-LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libxcb >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
-SLOT=0
-SRC_URI=mirror://gnome/sources/gdm/3.22/gdm-3.22.3.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=18a5caec480b71b7357d2cd4644bfa25
diff --git a/metadata/md5-cache/gnome-base/gdm-3.24.2 b/metadata/md5-cache/gnome-base/gdm-3.24.2
deleted file mode 100644
index f79ab6b4bf9d..000000000000
--- a/metadata/md5-cache/gnome-base/gdm-3.24.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.35 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libxcb >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/intltool-0.40.0 dev-util/itstool virtual/pkgconfig x11-proto/inputproto x11-proto/randrproto test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=GNOME Display Manager for managing graphical display servers and user logins
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GDM
-IUSE=accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86
-LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.35 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libxcb >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
-SLOT=0
-SRC_URI=mirror://gnome/sources/gdm/3.24/gdm-3.24.2.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=313ee745c42ea9abea4a8555dfd1c6a3
diff --git a/metadata/md5-cache/gnome-base/gnome-3.22.2 b/metadata/md5-cache/gnome-base/gnome-3.22.2
deleted file mode 100644
index 37963e8fd739..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-3.22.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Meta package for GNOME 3, merge this package to install
-EAPI=6
-HOMEPAGE=https://www.gnome.org/
-IUSE=accessibility +bluetooth +classic +cdr cups +extras
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=metapackage
-PDEPEND=>=gnome-base/gvfs-1.30.2[udisks]
-RDEPEND=>=gnome-base/gnome-core-libs-3.22.2[cups?] >=gnome-base/gnome-core-apps-3.22.2[cups?,bluetooth?,cdr?] >=gnome-base/gdm-3.22.2 >=x11-wm/mutter-3.22.2 >=gnome-base/gnome-shell-3.22.2[bluetooth?] >=x11-themes/gnome-backgrounds-3.22.1 x11-themes/sound-theme-freedesktop accessibility? ( >=app-accessibility/at-spi2-atk-2.22 >=app-accessibility/at-spi2-core-2.22 >=app-accessibility/caribou-0.4.21 >=app-accessibility/orca-3.22.2 >=gnome-extra/mousetweaks-3.12.0 ) classic? ( >=gnome-extra/gnome-shell-extensions-3.22.2 ) extras? ( >=gnome-base/gnome-extra-apps-3.22.2 )
-SLOT=2.0
-_md5_=df44a4048d75ff2fbfaf821b550c91ba
diff --git a/metadata/md5-cache/gnome-base/gnome-3.24.0 b/metadata/md5-cache/gnome-base/gnome-3.24.0
deleted file mode 100644
index d7cadb2127b6..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-3.24.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Meta package for GNOME 3, merge this package to install
-EAPI=6
-HOMEPAGE=https://www.gnome.org/
-IUSE=accessibility +bluetooth +classic +cdr cups +extras
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=metapackage
-PDEPEND=>=gnome-base/gvfs-1.30.2[udisks]
-RDEPEND=>=gnome-base/gnome-core-libs-3.24.0[cups?] >=gnome-base/gnome-core-apps-3.24.0[cups?,bluetooth?,cdr?] >=gnome-base/gdm-3.24.0 >=x11-wm/mutter-3.24.0 >=gnome-base/gnome-shell-3.24.0[bluetooth?] >=x11-themes/gnome-backgrounds-3.24.0 x11-themes/sound-theme-freedesktop accessibility? ( >=app-accessibility/at-spi2-atk-2.24 >=app-accessibility/at-spi2-core-2.24 >=app-accessibility/caribou-0.4.21 >=app-accessibility/orca-3.24.0 >=gnome-extra/mousetweaks-3.12.0 ) classic? ( >=gnome-extra/gnome-shell-extensions-3.24.0 ) extras? ( >=gnome-base/gnome-extra-apps-3.24.0 )
-SLOT=2.0
-_md5_=0ee571b7eeb83e2e8d5dab3cda48c166
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.22.2-r1 b/metadata/md5-cache/gnome-base/gnome-control-center-3.22.2-r1
deleted file mode 100644
index fd388c5666e3..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.22.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.22.0:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=sys-apps/accountsservice-0.6.39 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= virtual/libgudev x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] >=net-fs/samba-4.0.0[client] ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.21.5:= ) ibus? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common sys-devel/autoconf-archive >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
-IUSE=+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
-RDEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.22.0:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=sys-apps/accountsservice-0.6.39 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= virtual/libgudev x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] >=net-fs/samba-4.0.0[client] ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.21.5:= ) ibus? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) !<gnome-base/gdm-2.91.94 !<gnome-extra/gnome-color-manager-3.1.2 !gnome-extra/gnome-media[pulseaudio] !<gnome-extra/gnome-media-2.32.0-r300 !<net-wireless/gnome-bluetooth-3.3.2
-SLOT=2
-SRC_URI=mirror://gnome/sources/gnome-control-center/3.22/gnome-control-center-3.22.2.tar.xz https://dev.gentoo.org/~mgorny/dist/gnome-control-center-3.22.2-patchset.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c6ddd0c5384da24fb52c339ac9e9e1bf
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.24.2 b/metadata/md5-cache/gnome-base/gnome-control-center-3.24.2
deleted file mode 100644
index ed1ccb635b81..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.24.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.22.0:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= >=gnome-base/gnome-settings-daemon-3.23.90[colord?,policykit] >=x11-misc/colord-0.1.34:0= >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=sys-apps/accountsservice-0.6.39 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= virtual/libgudev x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] >=net-fs/samba-4.0.0[client] ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.21.5:= ) ibus? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common sys-devel/autoconf-archive >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
-IUSE=+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
-RDEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.22.0:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= >=gnome-base/gnome-settings-daemon-3.23.90[colord?,policykit] >=x11-misc/colord-0.1.34:0= >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=sys-apps/accountsservice-0.6.39 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= virtual/libgudev x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] >=net-fs/samba-4.0.0[client] ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.21.5:= ) ibus? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) !<gnome-base/gdm-2.91.94 !<gnome-extra/gnome-color-manager-3.1.2 !gnome-extra/gnome-media[pulseaudio] !<gnome-extra/gnome-media-2.32.0-r300 !<net-wireless/gnome-bluetooth-3.3.2
-SLOT=2
-SRC_URI=mirror://gnome/sources/gnome-control-center/3.24/gnome-control-center-3.24.2.tar.xz https://dev.gentoo.org/~mgorny/dist/gnome-control-center-3.24.2-patchset.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=16ae77bb9a7ffa3404858dd6e382ebae
diff --git a/metadata/md5-cache/gnome-base/gnome-core-apps-3.22.2 b/metadata/md5-cache/gnome-base/gnome-core-apps-3.22.2
deleted file mode 100644
index 9843df5e361c..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-core-apps-3.22.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Sub-meta package for the core applications integrated with GNOME 3
-EAPI=6
-HOMEPAGE=https://www.gnome.org/
-IUSE=+bluetooth +cdr cups
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
-LICENSE=metapackage
-RDEPEND=>=gnome-base/gnome-core-libs-3.22.2[cups?] >=gnome-base/gnome-session-3.22.2 >=gnome-base/gnome-settings-daemon-3.22.1[cups?] >=gnome-base/gnome-control-center-3.22.1[cups?] >=app-crypt/gcr-3.20.0 >=gnome-base/nautilus-3.22.1 >=gnome-base/gnome-keyring-3.20.0 >=gnome-extra/evolution-data-server-3.22.2 >=app-crypt/seahorse-3.20.0 >=app-editors/gedit-3.22.0 >=app-text/evince-3.22.1 >=gnome-extra/gnome-contacts-3.22.1 >=media-gfx/eog-3.20.5 >=media-video/totem-3.22.0 >=x11-terms/gnome-terminal-3.22.1 >=gnome-extra/gnome-user-docs-3.22.0 >=gnome-extra/yelp-3.22.0 >=x11-themes/adwaita-icon-theme-3.22.0 >=x11-themes/gnome-themes-standard-3.22.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.20.0 ) cdr? ( >=app-cdr/brasero-3.12.1 ) !gnome-base/gnome-applets
-SLOT=3.0
-_md5_=19d92d295ece7d0226a3dd31b5e12093
diff --git a/metadata/md5-cache/gnome-base/gnome-core-apps-3.24.0 b/metadata/md5-cache/gnome-base/gnome-core-apps-3.24.0
deleted file mode 100644
index aad91933da02..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-core-apps-3.24.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Sub-meta package for the core applications integrated with GNOME 3
-EAPI=6
-HOMEPAGE=https://www.gnome.org/
-IUSE=+bluetooth +cdr cups
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=gnome-base/gnome-core-libs-3.24.0[cups?] >=gnome-base/gnome-session-3.24.0 >=gnome-base/gnome-settings-daemon-3.24.0[cups?] >=gnome-base/gnome-control-center-3.24.0[cups?] >=app-crypt/gcr-3.20.0 >=gnome-base/nautilus-3.24.0 >=gnome-base/gnome-keyring-3.20.0 >=gnome-extra/evolution-data-server-3.24.0 >=app-crypt/seahorse-3.20.0 >=app-editors/gedit-3.22.1 >=app-text/evince-3.24.0 >=gnome-extra/gnome-contacts-3.22.1 >=media-gfx/eog-3.24.0 >=media-video/totem-3.24.0 >=x11-terms/gnome-terminal-3.24.0 >=gnome-extra/gnome-user-docs-3.24.0 >=gnome-extra/yelp-3.22.0 >=x11-themes/adwaita-icon-theme-3.24.0 >=x11-themes/gnome-themes-standard-3.22.3 bluetooth? ( >=net-wireless/gnome-bluetooth-3.20.0 ) cdr? ( >=app-cdr/brasero-3.12.1 ) !gnome-base/gnome-applets
-SLOT=3.0
-_md5_=3e3bf744015b0bf032ca8a2c2f01ce97
diff --git a/metadata/md5-cache/gnome-base/gnome-core-libs-3.22.2 b/metadata/md5-cache/gnome-base/gnome-core-libs-3.22.2
deleted file mode 100644
index fe7c6b0d9a30..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-core-libs-3.22.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Sub-meta package for the core libraries of GNOME 3
-EAPI=6
-HOMEPAGE=https://www.gnome.org/
-IUSE=cups python
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=metapackage
-RDEPEND=>=dev-libs/glib-2.50.2:2 >=x11-libs/gdk-pixbuf-2.36.0:2 >=x11-libs/pango-1.40.3 >=media-libs/clutter-1.26.0:1.0 >=x11-libs/gtk+-3.22.3:3[cups?] >=dev-libs/atk-2.22.0 >=gnome-base/librsvg-2.40.16 >=gnome-base/gnome-desktop-3.22.2:3 >=x11-libs/startup-notification-0.12 >=gnome-base/gvfs-1.30.2 >=gnome-base/dconf-0.26.0 >=media-libs/gstreamer-1.8.3:1.0 >=media-libs/gst-plugins-base-1.8.3:1.0 >=media-libs/gst-plugins-good-1.8.3:1.0 python? ( >=dev-python/pygobject-3.22.0:3 )
-SLOT=3.0
-_md5_=2f9b21ce8a4450869f840052c2dfaef3
diff --git a/metadata/md5-cache/gnome-base/gnome-core-libs-3.24.0 b/metadata/md5-cache/gnome-base/gnome-core-libs-3.24.0
deleted file mode 100644
index a6882e650b14..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-core-libs-3.24.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Sub-meta package for the core libraries of GNOME 3
-EAPI=6
-HOMEPAGE=https://www.gnome.org/
-IUSE=cups python
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=metapackage
-RDEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gdk-pixbuf-2.36.6:2 >=x11-libs/pango-1.40.9 >=media-libs/clutter-1.26.2:1.0 >=x11-libs/gtk+-3.22.16:3[cups?] >=dev-libs/atk-2.24 >=gnome-base/librsvg-2.40.18 >=gnome-base/gnome-desktop-3.24.0:3 >=x11-libs/startup-notification-0.12 >=gnome-base/gvfs-1.32 >=gnome-base/dconf-0.26 >=media-libs/gstreamer-1.10.5:1.0 >=media-libs/gst-plugins-base-1.10.5:1.0 >=media-libs/gst-plugins-good-1.10.5:1.0 python? ( >=dev-python/pygobject-3.24.0:3 )
-SLOT=3.0
-_md5_=aab084f8f5fc10e65e45bbe7d6f493ff
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.22.2 b/metadata/md5-cache/gnome-base/gnome-desktop-3.22.2
deleted file mode 100644
index 7635b71bd7c9..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.22.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.33.0:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) udev? ( sys-apps/hwids virtual/libudev:= ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.6 dev-util/itstool sys-devel/gettext x11-proto/xproto virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Libraries for the gnome desktop that are not part of the UI
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-desktop
-IUSE=debug +introspection udev test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.33.0:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) udev? ( sys-apps/hwids virtual/libudev:= ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-SLOT=3/12
-SRC_URI=mirror://gnome/sources/gnome-desktop/3.22/gnome-desktop-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=49dad57b76b62fdf0de1d66157ead33c
diff --git a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.22.2 b/metadata/md5-cache/gnome-base/gnome-extra-apps-3.22.2
deleted file mode 100644
index 61199641103d..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.22.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Sub-meta package for the applications of GNOME 3
-EAPI=6
-HOMEPAGE=https://www.gnome.org/
-IUSE=+games +share +shotwell +tracker
-KEYWORDS=amd64 x86
-LICENSE=metapackage
-RDEPEND=>=gnome-base/gnome-core-libs-3.22.2 >=sys-apps/baobab-3.22.1 >=media-video/cheese-3.22.1 >=www-client/epiphany-3.22.2 >=app-arch/file-roller-3.22.1 >=gnome-extra/gnome-calculator-3.22.2 >=gnome-extra/gnome-calendar-3.22.1 >=gnome-extra/gnome-characters-3.22.0 >=sys-apps/gnome-disk-utility-3.22.1 >=media-gfx/gnome-font-viewer-3.22.0 >=gnome-extra/gnome-power-manager-3.22.2 >=media-gfx/gnome-screenshot-3.22.0 >=gnome-extra/gnome-system-monitor-3.22.2 >=gnome-extra/gnome-weather-3.20.2 >=gnome-extra/gucharmap-9.0.2:2.90 >=gnome-extra/sushi-3.21.91 >=media-sound/sound-juicer-3.22.1 >=net-misc/vino-3.22.0 >=gnome-base/dconf-editor-3.22.1 >=app-dicts/gnome-dictionary-3.20.0 >=mail-client/evolution-3.22.2 >=net-analyzer/gnome-nettool-3.8.1 >=gnome-extra/gnome-tweak-tool-3.22.0 >=gnome-extra/nautilus-sendto-3.8.4 >=net-misc/vinagre-3.22.0 games? ( >=games-puzzle/five-or-more-3.22.2 >=games-board/four-in-a-row-3.22.1 >=games-board/gnome-chess-3.22.2 >=games-puzzle/gnome-klotski-3.22.1 >=games-board/gnome-mahjongg-3.22.0 >=games-board/gnome-mines-3.22.2 >=games-arcade/gnome-nibbles-3.22.1 >=games-arcade/gnome-robots-3.22.1 >=games-puzzle/gnome-sudoku-3.22.2 >=games-puzzle/gnome-taquin-3.22.0 >=games-puzzle/gnome-tetravex-3.22.0 >=games-puzzle/hitori-3.22.0 >=games-board/iagno-3.22.0 >=games-puzzle/lightsoff-3.22.2 >=games-puzzle/quadrapassel-3.22.0 >=games-puzzle/swell-foop-3.22.2 >=games-board/tali-3.22.0 ) share? ( >=gnome-extra/gnome-user-share-3.18.3 ) shotwell? ( >=media-gfx/shotwell-0.24 ) tracker? ( >=app-misc/tracker-1.10.1 >=gnome-extra/gnome-documents-3.22.0 >=media-gfx/gnome-photos-3.22.2 >=media-sound/gnome-music-3.22.1 )
-SLOT=3.0
-_md5_=c2e7ecdeda9bef7c220ae381b63fb22d
diff --git a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.24.0 b/metadata/md5-cache/gnome-base/gnome-extra-apps-3.24.0
deleted file mode 100644
index a9fdca7f1fa5..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.24.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Sub-meta package for the applications of GNOME 3
-EAPI=6
-HOMEPAGE=https://www.gnome.org/
-IUSE=+games +share +shotwell +tracker
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=gnome-base/gnome-core-libs-3.24.0 >=sys-apps/baobab-3.24.0 >=media-video/cheese-3.24.0 >=www-client/epiphany-3.24.0 >=app-arch/file-roller-3.24.0 >=gnome-extra/gnome-calculator-3.24.0 >=gnome-extra/gnome-calendar-3.24.0 >=gnome-extra/gnome-characters-3.24.0 >=sys-apps/gnome-disk-utility-3.24.0 >=media-gfx/gnome-font-viewer-3.24.0 >=gnome-extra/gnome-power-manager-3.24.0 >=media-gfx/gnome-screenshot-3.22.0 >=gnome-extra/gnome-system-monitor-3.24.0 >=gnome-extra/gnome-weather-3.24.0 >=gnome-extra/gucharmap-10:2.90 >=gnome-extra/sushi-3.24.0 >=media-sound/sound-juicer-3.24.0 >=net-misc/vino-3.22.0 >=gnome-base/dconf-editor-3.22.3 >=app-dicts/gnome-dictionary-3.24.0 >=mail-client/evolution-3.24.0 >=net-analyzer/gnome-nettool-3.8.1 >=gnome-extra/gnome-tweak-tool-3.24.0 >=gnome-extra/nautilus-sendto-3.8.4 >=net-misc/vinagre-3.22.0 games? ( >=games-puzzle/five-or-more-3.22.2 >=games-board/four-in-a-row-3.22.1 >=games-board/gnome-chess-3.24.0 >=games-puzzle/gnome-klotski-3.22.1 >=games-board/gnome-mahjongg-3.22.0 >=games-board/gnome-mines-3.24.0 >=games-arcade/gnome-nibbles-3.24.0 >=games-arcade/gnome-robots-3.22.1 >=games-puzzle/gnome-sudoku-3.24.0 >=games-puzzle/gnome-taquin-3.22.0 >=games-puzzle/gnome-tetravex-3.22.0 >=games-puzzle/hitori-3.22.0 >=games-board/iagno-3.22.0 >=games-puzzle/lightsoff-3.24.0 >=games-puzzle/quadrapassel-3.22.0 >=games-puzzle/swell-foop-3.24.0 >=games-board/tali-3.22.0 ) share? ( >=gnome-extra/gnome-user-share-3.18.3 ) shotwell? ( >=media-gfx/shotwell-0.26 ) tracker? ( >=app-misc/tracker-1.12 >=gnome-extra/gnome-documents-3.24.0 >=media-gfx/gnome-photos-3.24.0 >=media-sound/gnome-music-3.24.0 )
-SLOT=3.0
-_md5_=d677b57cdfa6402cde9ba2ee560cec35
diff --git a/metadata/md5-cache/gnome-base/gnome-light-3.22.2 b/metadata/md5-cache/gnome-base/gnome-light-3.22.2
deleted file mode 100644
index 69fe37229680..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-light-3.22.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst pretend
-DESCRIPTION=Meta package for GNOME-Light, merge this package to install
-EAPI=6
-HOMEPAGE=https://www.gnome.org/
-IUSE=cups +gnome-shell
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
-LICENSE=metapackage
-PDEPEND=>=gnome-base/gvfs-1.30.2
-RDEPEND=!gnome-base/gnome >=gnome-base/gnome-core-libs-3.22.2[cups?] >=gnome-base/gnome-session-3.22.2 >=gnome-base/gnome-settings-daemon-3.22.2[cups?] >=gnome-base/gnome-control-center-3.22.2[cups?] >=gnome-base/nautilus-3.22.2 gnome-shell? ( >=x11-wm/mutter-3.22.2 >=gnome-base/gnome-shell-3.22.2 ) >=x11-themes/adwaita-icon-theme-2 >=x11-themes/gnome-themes-standard-3.22.2 >=x11-themes/gnome-backgrounds-2 >=x11-terms/gnome-terminal-3.22.2
-SLOT=2.0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5a421110ee7dba5e46eece0ec3a46b78
diff --git a/metadata/md5-cache/gnome-base/gnome-light-3.24.0 b/metadata/md5-cache/gnome-base/gnome-light-3.24.0
deleted file mode 100644
index 3a4a0e4e1e40..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-light-3.24.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst pretend
-DESCRIPTION=Meta package for GNOME-Light, merge this package to install
-EAPI=6
-HOMEPAGE=https://www.gnome.org/
-IUSE=cups +gnome-shell
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=metapackage
-PDEPEND=>=gnome-base/gvfs-1.32
-RDEPEND=!gnome-base/gnome >=gnome-base/gnome-core-libs-3.24.0[cups?] >=gnome-base/gnome-session-3.24.0 >=gnome-base/gnome-settings-daemon-3.24.0[cups?] >=gnome-base/gnome-control-center-3.24.0[cups?] >=gnome-base/nautilus-3.24.0 gnome-shell? ( >=x11-wm/mutter-3.24.0 >=gnome-base/gnome-shell-3.24.0 ) >=x11-themes/adwaita-icon-theme-2 >=x11-themes/gnome-themes-standard-3.22.3 >=x11-themes/gnome-backgrounds-2 >=x11-terms/gnome-terminal-3.24.0
-SLOT=2.0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8e59100496a1191c5b84ccdf7dd7103b
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.22.3 b/metadata/md5-cache/gnome-base/gnome-session-3.22.3
deleted file mode 100644
index 12531d38fea0..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-session-3.22.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) dev-libs/libxslt >=dev-util/intltool-0.40.6 >=sys-devel/gettext-0.10.40 virtual/pkgconfig !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) gnome-base/gnome-common >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Gnome session manager
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-session
-IUSE=doc elibc_FreeBSD ipv6 systemd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) gnome-base/gnome-settings-daemon >=gnome-base/gsettings-desktop-schemas-0.1.7 x11-themes/adwaita-icon-theme sys-apps/dbus[X] !systemd? ( sys-auth/consolekit >=dev-libs/dbus-glib-0.76 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-session/3.22/gnome-session-3.22.3.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6ca3626d1c10ee28239fa32abe9f1d6
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.24.1 b/metadata/md5-cache/gnome-base/gnome-session-3.24.1
deleted file mode 100644
index 3c241a3c44dc..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-session-3.24.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) dev-libs/libxslt >=dev-util/intltool-0.40.6 >=sys-devel/gettext-0.10.40 virtual/pkgconfig !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Gnome session manager
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-session
-IUSE=doc elibc_FreeBSD ipv6 systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) >=gnome-base/gnome-settings-daemon-3.23.2 >=gnome-base/gsettings-desktop-schemas-0.1.7 x11-themes/adwaita-icon-theme sys-apps/dbus[X] !systemd? ( sys-auth/consolekit >=dev-libs/dbus-glib-0.76 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=288a500febf64b6a601ad18e24e9f0e2
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.22.2-r1 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.22.2-r1
deleted file mode 100644
index 6f9dda3e2480..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.22.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.37.7:2[dbus] >=x11-libs/gtk+-3.15.3:3 >=gnome-base/gnome-desktop-3.11.1:3= >=gnome-base/gsettings-desktop-schemas-3.20 >=gnome-base/librsvg-2.36.2:2 media-fonts/cantarell media-libs/alsa-lib media-libs/fontconfig media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 >=sys-power/upower-0.99:= x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3:= x11-libs/libX11 x11-libs/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc x11-misc/xkeyboard-config >=app-misc/geoclue-2.3.1:2.0 >=dev-libs/libgweather-3.9.5:2= >=sci-geosciences/geocode-glib-3.10 >=sys-auth/polkit-0.103 colord? ( >=media-libs/lcms-2.2:2 >=x11-misc/colord-1.0.2:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20 x11-drivers/xf86-input-wacom virtual/libgudev:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( virtual/libgudev:= ) wayland? ( dev-libs/wayland ) cups? ( sys-apps/sed ) test? ( || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.5 dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) gnome-base/gnome-session ) app-text/docbook-xsl-stylesheets dev-libs/libxml2:2 dev-libs/libxslt sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig x11-proto/inputproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gnome Settings Daemon
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-settings-daemon
-IUSE=+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.37.7:2[dbus] >=x11-libs/gtk+-3.15.3:3 >=gnome-base/gnome-desktop-3.11.1:3= >=gnome-base/gsettings-desktop-schemas-3.20 >=gnome-base/librsvg-2.36.2:2 media-fonts/cantarell media-libs/alsa-lib media-libs/fontconfig media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 >=sys-power/upower-0.99:= x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3:= x11-libs/libX11 x11-libs/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc x11-misc/xkeyboard-config >=app-misc/geoclue-2.3.1:2.0 >=dev-libs/libgweather-3.9.5:2= >=sci-geosciences/geocode-glib-3.10 >=sys-auth/polkit-0.103 colord? ( >=media-libs/lcms-2.2:2 >=x11-misc/colord-1.0.2:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20 x11-drivers/xf86-input-wacom virtual/libgudev:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( virtual/libgudev:= ) wayland? ( dev-libs/wayland ) gnome-base/dconf !openrc-force? ( sys-apps/systemd ) !<gnome-base/gnome-control-center-2.22 !<gnome-extra/gnome-color-manager-3.1.1 !<gnome-extra/gnome-power-manager-3.1.3
-REQUIRED_USE=input_devices_wacom? ( udev ) smartcard? ( udev )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.22/gnome-settings-daemon-3.22.2.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e55d3bf3f1499074e2bbced0064b4970
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.22.3 b/metadata/md5-cache/gnome-base/gnome-shell-3.22.3
index 18bf54a61e07..a894b9645372 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.22.3
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.22.3
@@ -4,7 +4,7 @@ DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
 IUSE=+bluetooth +ibus +networkmanager nsplugin -openrc-force python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~arm ~ia64 ~ppc ~ppc64
+KEYWORDS=~alpha ~arm
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
 RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.39 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.22.1[introspection] >=x11-libs/startup-notification-0.11 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/dbus-glib dev-libs/libxml2:2 media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) nsplugin? ( >=dev-libs/json-glib-0.13.2 ) app-accessibility/at-spi2-core:2[introspection] >=app-accessibility/caribou-0.4.8 dev-libs/libgweather:2[introspection] >=sys-apps/accountsservice-0.6.14[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 !openrc-force? ( >=sys-apps/systemd-31 ) x11-misc/xdg-utils media-fonts/dejavu >=x11-themes/adwaita-icon-theme-3.19.90 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.22/gnome-shell-3.22.3.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c3e44c3bb6ae0d79620d372bbb4ff9b3
+_md5_=aa06cf8320df81f6602730ddb0f11685
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.22.3-r2 b/metadata/md5-cache/gnome-base/gnome-shell-3.22.3-r2
deleted file mode 100644
index 18a97e672d33..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.22.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.39 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.22.1[introspection] >=x11-libs/startup-notification-0.11 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/dbus-glib dev-libs/libxml2:2 media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) nsplugin? ( >=dev-libs/json-glib-0.13.2 ) dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 >=dev-util/gtk-doc-am-1.17 gnome-base/gnome-common sys-devel/autoconf-archive >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
-IUSE=+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~ia64 x86
-LICENSE=GPL-2+ LGPL-2+
-PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
-RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.39 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.22.1[introspection] >=x11-libs/startup-notification-0.11 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/dbus-glib dev-libs/libxml2:2 media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) nsplugin? ( >=dev-libs/json-glib-0.13.2 ) app-accessibility/at-spi2-core:2[introspection] >=app-accessibility/caribou-0.4.8 dev-libs/libgweather:2[introspection] >=sys-apps/accountsservice-0.6.14[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 !openrc-force? ( >=sys-apps/systemd-31 ) x11-misc/xdg-utils media-fonts/dejavu >=x11-themes/adwaita-icon-theme-3.19.90 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-shell/3.22/gnome-shell-3.22.3.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0dd739e1a5e081b7e4734b5b1d482808
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.0 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.0
deleted file mode 100644
index c7c9ad000cb3..000000000000
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) !<gnome-base/gdm-3.8 >=dev-util/intltool-0.50.1 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Collection of GSettings schemas for GNOME desktop
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gsettings-desktop-schemas
-IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) !<gnome-base/gdm-3.8
-SLOT=0
-SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dbc2be75fc83c5bb8f2bf57e96902896
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.32.1 b/metadata/md5-cache/gnome-base/gvfs-1.32.1
deleted file mode 100644
index 2ec5416ee1bb..000000000000
--- a/metadata/md5-cache/gnome-base/gvfs-1.32.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-crypt/gcr:= >=dev-libs/glib-2.51:2 dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) google? ( >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] >=net-libs/gnome-online-accounts-3.17.1:= ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.12 ) nfs? ( >=net-fs/libnfs-1.9.8 ) policykit? ( sys-auth/polkit sys-libs/libcap ) samba? ( >=net-fs/samba-4[client] ) systemd? ( >=sys-apps/systemd-206:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) >=virtual/libgudev-147:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.4 virtual/pkgconfig dev-util/gdbus-codegen dev-util/gtk-doc-am test? ( >=dev-python/twisted-core-12.3.0 || ( net-analyzer/netcat net-analyzer/netcat6 ) ) !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Virtual filesystem implementation for gio
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
-IUSE=afp archive bluray cdda fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=app-crypt/gcr:= >=dev-libs/glib-2.51:2 dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) google? ( >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] >=net-libs/gnome-online-accounts-3.17.1:= ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.12 ) nfs? ( >=net-fs/libnfs-1.9.8 ) policykit? ( sys-auth/polkit sys-libs/libcap ) samba? ( >=net-fs/samba-4[client] ) systemd? ( >=sys-apps/systemd-206:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) >=virtual/libgudev-147:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 )
-REQUIRED_USE=cdda? ( udev ) google? ( gnome-online-accounts ) mtp? ( udev ) udisks? ( udev ) systemd? ( udisks )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/gvfs/1.32/gvfs-1.32.1.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc6cc143b9971e658988bca25913f3e0
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.22.3 b/metadata/md5-cache/gnome-base/nautilus-3.22.3
deleted file mode 100644
index b77c518679f8..000000000000
--- a/metadata/md5-cache/gnome-base/nautilus-3.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-arch/gnome-autoar-0.1 >=dev-libs/glib-2.49.1:2[dbus] >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.21.6:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= gnome-base/dconf >=gnome-base/gsettings-desktop-schemas-3.8.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) tracker? ( >=app-misc/tracker-0.16:= ) xmp? ( >=media-libs/exempi-2.1.0:2 ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.33 >=dev-util/gtk-doc-am-1.10 >=sys-devel/gettext-0.19.7 virtual/pkgconfig x11-proto/xproto >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A file manager for the GNOME desktop
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
-IUSE=exif gnome +introspection packagekit +previewer selinux sendto tracker xmp test
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2+ FDL-1.1
-PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk]
-RDEPEND=>=app-arch/gnome-autoar-0.1 >=dev-libs/glib-2.49.1:2[dbus] >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.21.6:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= gnome-base/dconf >=gnome-base/gsettings-desktop-schemas-3.8.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) tracker? ( >=app-misc/tracker-0.16:= ) xmp? ( >=media-libs/exempi-2.1.0:2 ) packagekit? ( app-admin/packagekit-base ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/nautilus/3.22/nautilus-3.22.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6b58a50cd01b4fdf80764be3172e987a
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index f770dd309575..9e5941167c0d 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.24.6 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.24.6
deleted file mode 100644
index 83cfb61b37fd..000000000000
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.24.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) sys-devel/make >=dev-util/cmake-3.7.2 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Evolution groupware backend
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
-IUSE=api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
-RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=test
-SLOT=0/60
-SRC_URI=mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.6.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bfaae2b85e58d97479d1c1a10bac8c31
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.22.6 b/metadata/md5-cache/gnome-extra/evolution-ews-3.22.6
deleted file mode 100644
index 012411c86293..000000000000
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.22.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.40:2 dev-libs/libical:0= >=dev-libs/libmspack-0.4 >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.22.6:0= >=mail-client/evolution-3.22.6:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3:3 >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35.5 virtual/pkgconfig test? ( net-libs/uhttpmock ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.40:2 dev-libs/libical:0= >=dev-libs/libmspack-0.4 >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.22.6:0= >=mail-client/evolution-3.22.6:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/evolution-ews/3.22/evolution-ews-3.22.6.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9844fdf9b3ef0ceda0ac4254b4bcd0fa
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.24.5 b/metadata/md5-cache/gnome-extra/evolution-ews-3.24.5
deleted file mode 100644
index 9fcf7bed6119..000000000000
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.24.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.46:2 dev-libs/libical:0= >=dev-libs/libmspack-0.4 >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.24.5:0= >=mail-client/evolution-3.24.5:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.10:3 dev-util/gdbus-codegen >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig test? ( net-libs/uhttpmock ) sys-devel/make >=dev-util/cmake-3.7.2 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.46:2 dev-libs/libical:0= >=dev-libs/libmspack-0.4 >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.24.5:0= >=mail-client/evolution-3.24.5:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.10:3
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/evolution-ews/3.24/evolution-ews-3.24.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b476d139f6644be4f1e4f2eb58b6469f
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-3.22.4 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.22.4
deleted file mode 100644
index 598574b18a2d..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.22.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.12 >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.2.3 >=x11-libs/gtk+-3.19.4:3 >=net-libs/gtk-vnc-0.4.4[gtk3] app-crypt/libsecret app-emulation/spice[smartcard] >=net-misc/spice-gtk-0.27[gtk3,smartcard,usbredir] virtual/libusb:1 >=app-misc/tracker-0.16:0=[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/mtools >=virtual/libgudev-165:= || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) app-text/yelp-tools >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Simple GNOME 3 application to access remote or virtual systems
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
-KEYWORDS=amd64
-LICENSE=LGPL-2
-RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.12 >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.2.3 >=x11-libs/gtk+-3.19.4:3 >=net-libs/gtk-vnc-0.4.4[gtk3] app-crypt/libsecret app-emulation/spice[smartcard] >=net-misc/spice-gtk-0.27[gtk3,smartcard,usbredir] virtual/libusb:1 >=app-misc/tracker-0.16:0=[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/mtools >=virtual/libgudev-165:=
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cfcbb1d641cae02c85f2956b7a249e68
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-3.22.3 b/metadata/md5-cache/gnome-extra/gnome-calculator-3.22.3
deleted file mode 100644
index 29a50ee026d3..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-3.22.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libxml2:2 dev-libs/mpfr:0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.11.6:3 >=x11-libs/gtksourceview-3.15.1:3.0 app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A calculator application for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Calculator
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libxml2:2 dev-libs/mpfr:0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.11.6:3 >=x11-libs/gtksourceview-3.15.1:3.0 !<gnome-extra/gnome-utils-2.3 !gnome-extra/gcalctool
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-calculator/3.22/gnome-calculator-3.22.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0a5713de609c71c71ee8326aadf3792e
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-3.22.5 b/metadata/md5-cache/gnome-extra/gnome-calendar-3.22.5
deleted file mode 100644
index 340012b6b115..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-3.22.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3 >=gnome-extra/evolution-data-server-3.17.1:= >=dev-libs/libical-1.0.1:0= >=net-libs/gnome-online-accounts-3.2.0:= >=gnome-base/gsettings-desktop-schemas-3.21.2 dev-libs/appstream-glib dev-util/gdbus-codegen >=dev-util/intltool-0.40.6 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Manage your online calendars with simple and modern interface
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3 >=gnome-extra/evolution-data-server-3.17.1:= >=dev-libs/libical-1.0.1:0= >=net-libs/gnome-online-accounts-3.2.0:= >=gnome-base/gsettings-desktop-schemas-3.21.2
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-calendar/3.22/gnome-calendar-3.22.5.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8ec78abf18077782b3294e9eb58d1d95
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-3.22.0 b/metadata/md5-cache/gnome-extra/gnome-characters-3.22.0
deleted file mode 100644
index 84a7511299e9..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-characters-3.22.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/pango-1.36[introspection] dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/dogtail[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Unicode character map viewer and library
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
-IUSE=test test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 BSD
-RDEPEND=>=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/pango-1.36[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-characters/3.22/gnome-characters-3.22.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a57e6e2c1bc3f51c8b4c373f8cdd05d6
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-3.22.1 b/metadata/md5-cache/gnome-extra/gnome-clocks-3.22.1
deleted file mode 100644
index 2da6c128870c..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-3.22.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libgweather-3.13.91:2= >=gnome-base/gnome-desktop-3.7.90:3= >=media-libs/gsound-0.98 >=sci-geosciences/geocode-glib-0.99.4 >=x11-libs/gtk+-3.19.8:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Clocks application for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Clocks
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libgweather-3.13.91:2= >=gnome-base/gnome-desktop-3.7.90:3= >=media-libs/gsound-0.98 >=sci-geosciences/geocode-glib-0.99.4 >=x11-libs/gtk+-3.19.8:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-clocks/3.22/gnome-clocks-3.22.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e388fd71f1ecf4c34e6ce85643ad4e40
diff --git a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.22.2 b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.22.2
deleted file mode 100644
index 116316995bf1..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.22.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-1.3.1:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2 ) app-text/docbook-sgml-dtd:4.1 app-text/docbook-sgml-utils dev-libs/appstream-glib dev-libs/libxslt >=dev-util/intltool-0.35 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Color profile manager for the GNOME desktop
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-color-manager
-IUSE=packagekit raw test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-1.3.1:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-color-manager/3.22/gnome-color-manager-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6db9328dc604e7ed2b3221aebca76f60
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.22.5 b/metadata/md5-cache/gnome-extra/gnome-documents-3.22.5
deleted file mode 100644
index 50e13cb14841..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-documents-3.22.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/evince-3.13.3[introspection] >=net-libs/webkit-gtk-2.6:4[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=x11-libs/gtk+-3.19.1:3[introspection] >=net-libs/libsoup-2.41.3:2.4 gnome-base/gnome-desktop:3=[introspection] >=app-misc/tracker-1:=[miner-fs] >=x11-libs/cairo-1.14 >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] x11-libs/gdk-pixbuf:2[introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] x11-libs/pango[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=app-text/libgepub-0.4[introspection] dev-libs/libxslt >=dev-util/intltool-0.50.1 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A document manager application for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Documents
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-text/evince-3.13.3[introspection] >=net-libs/webkit-gtk-2.6:4[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=x11-libs/gtk+-3.19.1:3[introspection] >=net-libs/libsoup-2.41.3:2.4 gnome-base/gnome-desktop:3=[introspection] >=app-misc/tracker-1:=[miner-fs] >=x11-libs/cairo-1.14 >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] x11-libs/gdk-pixbuf:2[introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] x11-libs/pango[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=app-text/libgepub-0.4[introspection] net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-documents/3.22/gnome-documents-3.22.5.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b501e7a1f20286c8ea1733bf25d1e4e8
diff --git a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.22.0 b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.22.0
deleted file mode 100644
index f465275aa63c..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.22.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/yelp-tools >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Help a new user get started in GNOME
-EAPI=6
-HOMEPAGE=https://help.gnome.org/
-KEYWORDS=amd64 ~arm x86
-LICENSE=CC-BY-SA-3.0
-RDEPEND=gnome-extra/gnome-user-docs
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-getting-started-docs/3.22/gnome-getting-started-docs-3.22.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a5385e3eb04b83a776903284f87cd75b
diff --git a/metadata/md5-cache/gnome-extra/gnome-logs-3.22.1 b/metadata/md5-cache/gnome-extra/gnome-logs-3.22.1
deleted file mode 100644
index e1c7e4cacec5..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-logs-3.22.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.43.90:2 gnome-base/gsettings-desktop-schemas sys-apps/systemd:= >=x11-libs/gtk+-3.19.3:3 ~app-text/docbook-xml-dtd-4.3 app-text/yelp-tools dev-libs/appstream-glib dev-libs/libxslt >=dev-util/intltool-0.50 gnome-base/gnome-common virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/dogtail[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Log messages and event viewer
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Logs
-IUSE=test test
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.43.90:2 gnome-base/gsettings-desktop-schemas sys-apps/systemd:= >=x11-libs/gtk+-3.19.3:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-logs/3.22/gnome-logs-3.22.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c9a12fc9b191728a5bf5b7a134055871
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.22.2 b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.22.2
deleted file mode 100644
index a29204d788fd..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.22.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= app-text/docbook-sgml-dtd:4.1 app-text/docbook-sgml-utils dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext x11-proto/randrproto virtual/pkgconfig test? ( sys-apps/dbus ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GNOME power management service
-EAPI=6
-HOMEPAGE=https://projects.gnome.org/gnome-power-manager/
-IUSE=test test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= x11-themes/adwaita-icon-theme
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-power-manager/3.22/gnome-power-manager-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3b0bebcb1d76a19f2f7a442fe87ba6f8
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.22.2 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.22.2
deleted file mode 100644
index 5190f8f3e976..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.22.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=JavaScript extensions for GNOME Shell
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.14.2 media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme x11-wm/mutter[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.22/gnome-shell-extensions-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=367fa2e8545a4a25967a952cac2ec5a4
diff --git a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.22.2 b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.22.2
deleted file mode 100644
index eec90af8ff47..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.22.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.12:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.34:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 ) app-text/yelp-tools >=dev-util/intltool-0.41.0 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The Gnome System Monitor
-EAPI=6
-HOMEPAGE=https://help.gnome.org/users/gnome-system-monitor/
-IUSE=systemd X
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.12:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.34:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-system-monitor/3.22/gnome-system-monitor-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a67da13578ac341247054e7a6585a088
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.22.0 b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.22.0
deleted file mode 100644
index cd431e035180..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.22.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=test? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME end user documentation
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-user-docs
-IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=CC-BY-3.0
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-user-docs/3.22/gnome-user-docs-3.22.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=07c6842fced0df7e849e0d9cfa42e9b0
diff --git a/metadata/md5-cache/gnome-extra/gnome-weather-3.20.2 b/metadata/md5-cache/gnome-extra/gnome-weather-3.20.2
deleted file mode 100644
index 12e4df9c92c4..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-weather-3.20.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libgweather-3.17.2:= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.11.4:3 dev-libs/appstream-glib >=dev-util/intltool-0.26 virtual/pkgconfig test? ( || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.5 dev-util/dogtail[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-util/dogtail[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/dogtail[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A weather application for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Design/Apps/Weather
-IUSE=test test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
-RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libgweather-3.17.2:= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.11.4:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-weather/3.20/gnome-weather-3.20.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=75d566b46af2a68f9cd2b4956decaf36
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.22.0 b/metadata/md5-cache/gnome-extra/zenity-3.22.0
deleted file mode 100644
index 81d136be3c08..000000000000
--- a/metadata/md5-cache/gnome-extra/zenity-3.22.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3[X] x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 ) app-text/yelp-tools gnome-base/gnome-common >=sys-devel/gettext-0.19.4 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Tool to display dialogs from the commandline and shell scripts
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
-IUSE=debug libnotify webkit
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3[X] x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/zenity/3.22/zenity-3.22.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=69056c62ca5810fde2ee8d5274103d2e
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 52fdc7231783..00d4aa208eee 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/katepart-4.14.3 b/metadata/md5-cache/kde-apps/katepart-4.14.3
deleted file mode 100644
index adb577f424c5..000000000000
--- a/metadata/md5-cache/kde-apps/katepart-4.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=Editor KPart by KDE
-EAPI=5
-HOMEPAGE=https://www.kde.org/ http://kate-editor.org/about-katepart/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-RESTRICT=test
-SLOT=4/4.14
-SRC_URI=mirror://kde/stable/4.14.3/src/kate-4.14.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e191949905121dbff9f7640357ef7dee
diff --git a/metadata/md5-cache/kde-apps/kdebase-data-16.04.3 b/metadata/md5-cache/kde-apps/kdebase-data-16.04.3
deleted file mode 100644
index a67ba2855496..000000000000
--- a/metadata/md5-cache/kde-apps/kdebase-data-16.04.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=Icons, localization data and various .desktop files from kdebase
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-themes/hicolor-icon-theme kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-SLOT=4/16.04
-SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b035dd2e9ca298283620d249fffd9845
diff --git a/metadata/md5-cache/kde-apps/konsolepart-4.14.3 b/metadata/md5-cache/kde-apps/konsolepart-4.14.3
deleted file mode 100644
index b2aacf7baa8d..000000000000
--- a/metadata/md5-cache/kde-apps/konsolepart-4.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext >=x11-libs/libxklavier-3.2 x11-libs/libXrender x11-libs/libXtst x11-apps/bdftopcf x11-proto/kbproto x11-proto/renderproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=X terminal kpart for use by konsole and other KDE applications
-EAPI=5
-HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-libs/libxklavier-3.2 x11-libs/libXrender x11-libs/libXtst !<kde-apps/konsole-4.14.3-r2 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-RESTRICT=test
-SLOT=4/4.14
-SRC_URI=mirror://kde/stable/4.14.3/src/konsole-4.14.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6068fe6f11da8e7da1e5a45d6a2b54e
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index fd83330aaf31..fb5b2bc9eb9c 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/evolution-3.22.6 b/metadata/md5-cache/mail-client/evolution-3.22.6
deleted file mode 100644
index ef0251815375..000000000000
--- a/metadata/md5-cache/mail-client/evolution-3.22.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-1.1.7 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.22.6:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.13.90:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] ) x11-libs/libcryptui ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 >=gnome-base/gnome-common-2.12 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Integrated mail, addressbook and calendaring functionality
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
-IUSE=archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 x86
-LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
-RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-1.1.7 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.22.6:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.13.90:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] ) x11-libs/libcryptui ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) !gnome-extra/evolution-exchange
-SLOT=2.0
-SRC_URI=mirror://gnome/sources/evolution/3.22/evolution-3.22.6.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b606af792b4dd891424c01601fcf6960
diff --git a/metadata/md5-cache/mail-client/evolution-3.24.5 b/metadata/md5-cache/mail-client/evolution-3.24.5
deleted file mode 100644
index ea768664da85..000000000000
--- a/metadata/md5-cache/mail-client/evolution-3.24.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-1.1.7 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.24.5:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.13.90:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] ) x11-libs/libcryptui ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.18.3 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Integrated mail, addressbook and calendaring functionality
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
-IUSE=archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
-RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-1.1.7 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.24.5:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.13.90:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] ) x11-libs/libcryptui ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) !gnome-extra/evolution-exchange
-SLOT=2.0
-SRC_URI=mirror://gnome/sources/evolution/3.24/evolution-3.24.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ef4640197584d012df43d03183f8dca0
diff --git a/metadata/md5-cache/mail-client/geary-0.11.3 b/metadata/md5-cache/mail-client/geary-0.11.3
deleted file mode 100644
index ad6e06e99c1b..000000000000
--- a/metadata/md5-cache/mail-client/geary-0.11.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala] app-crypt/libsecret dev-db/sqlite:3 dev-libs/glib:2[dbus] >=dev-libs/libgee-0.8.5:0.8= dev-libs/libxml2:2 dev-libs/gmime:2.6 media-libs/libcanberra >=net-libs/webkit-gtk-1.10.0:3=[introspection] >=x11-libs/gtk+-3.10.0:3[introspection] x11-libs/libnotify app-text/gnome-doc-utils dev-util/desktop-file-utils nls? ( sys-devel/gettext ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A lightweight, easy-to-use, feature-rich email client
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Geary
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala] app-crypt/libsecret dev-db/sqlite:3 dev-libs/glib:2[dbus] >=dev-libs/libgee-0.8.5:0.8= dev-libs/libxml2:2 dev-libs/gmime:2.6 media-libs/libcanberra >=net-libs/webkit-gtk-1.10.0:3=[introspection] >=x11-libs/gtk+-3.10.0:3[introspection] x11-libs/libnotify gnome-base/gsettings-desktop-schemas nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnome/sources/geary/0.11/geary-0.11.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d71bf814c94f9afed9e72984ed709509
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 826d044b7dde..e4eb3c460ef9 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/eog-3.20.5 b/metadata/md5-cache/media-gfx/eog-3.20.5
deleted file mode 100644
index 453d44f3c78e..000000000000
--- a/metadata/md5-cache/media-gfx/eog-3.20.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.42.0:2[dbus] >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-libs/gtk+-3.19.11:3[introspection,X] >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.30.0:2[jpeg?,tiff?] x11-libs/libX11 exif? ( >=media-libs/libexif-0.6.14 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( media-libs/exempi:2 ) >=dev-util/gtk-doc-am-1.16 >=dev-util/intltool-0.50.1 dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The Eye of GNOME image viewer
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome
-IUSE=debug +exif +introspection +jpeg lcms +svg tiff xmp
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.42.0:2[dbus] >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-libs/gtk+-3.19.11:3[introspection,X] >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.30.0:2[jpeg?,tiff?] x11-libs/libX11 exif? ( >=media-libs/libexif-0.6.14 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( media-libs/exempi:2 )
-REQUIRED_USE=exif? ( jpeg )
-SLOT=1
-SRC_URI=mirror://gnome/sources/eog/3.20/eog-3.20.5.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0d7e809872ccf515665f6e7d337148b5
diff --git a/metadata/md5-cache/media-gfx/feh-2.23.1 b/metadata/md5-cache/media-gfx/feh-2.23.1
new file mode 100644
index 000000000000..0bc9152e7162
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/feh-2.23.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install setup
+DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-libs/libXt x11-proto/xproto test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command )
+DESCRIPTION=A fast, lightweight imageviewer using imlib2
+EAPI=6
+HOMEPAGE=https://feh.finalrewind.org/
+IUSE=debug curl exif test xinerama
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=feh
+RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
+SLOT=0
+SRC_URI=https://feh.finalrewind.org/feh-2.23.1.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=2d525eeb59c8c016ee2286e5fd951ee2
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.22-r1 b/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
index 538b0e225690..4e3fd3734f4f 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Image Manipulation Program
 EAPI=5
 HOMEPAGE=https://www.gimp.org/
 IUSE=alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm test debug python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gimp/v2.8/gimp-2.8.22.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5394167c83ab30dc957e7d090380d2bf
+_md5_=84dd52555268a25151d98b9deee36331
diff --git a/metadata/md5-cache/media-gfx/gnome-font-viewer-3.22.0 b/metadata/md5-cache/media-gfx/gnome-font-viewer-3.22.0
deleted file mode 100644
index 949213ffdfe0..000000000000
--- a/metadata/md5-cache/media-gfx/gnome-font-viewer-3.22.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.35.1:2 gnome-base/gnome-desktop:3= media-libs/fontconfig:1.0 media-libs/freetype:2 >=media-libs/harfbuzz-0.9.9 >=x11-libs/gtk+-3.20:3 >=dev-util/intltool-0.40 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Font viewer for GNOME
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-font-viewer
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.35.1:2 gnome-base/gnome-desktop:3= media-libs/fontconfig:1.0 media-libs/freetype:2 >=media-libs/harfbuzz-0.9.9 >=x11-libs/gtk+-3.20:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-font-viewer/3.22/gnome-font-viewer-3.22.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8fe452b5f6f3955c979718523b1095e6
diff --git a/metadata/md5-cache/media-gfx/gnome-photos-3.22.6 b/metadata/md5-cache/media-gfx/gnome-photos-3.22.6
deleted file mode 100644
index 6c86d7d2437c..000000000000
--- a/metadata/md5-cache/media-gfx/gnome-photos-3.22.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-misc/tracker-1:=[miner-fs] >=dev-libs/glib-2.44:2 gnome-base/gnome-desktop:3= >=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts] media-libs/babl >=media-libs/gegl-0.3.5:0.3[cairo,jpeg2k,raw] media-libs/gexiv2 >=media-libs/grilo-0.3.0:0.3= >=media-libs/libpng-1.6:0= >=net-libs/gnome-online-accounts-3.8:= >=net-libs/libgfbgraph-0.2.1:0.2 >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.19.1:3 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/intltool-0.50.1 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/dogtail[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Access, organize and share your photos on GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Photos
-IUSE=flickr test upnp-av test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=app-misc/tracker-1:=[miner-fs] >=dev-libs/glib-2.44:2 gnome-base/gnome-desktop:3= >=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts] media-libs/babl >=media-libs/gegl-0.3.5:0.3[cairo,jpeg2k,raw] media-libs/gexiv2 >=media-libs/grilo-0.3.0:0.3= >=media-libs/libpng-1.6:0= >=net-libs/gnome-online-accounts-3.8:= >=net-libs/libgfbgraph-0.2.1:0.2 >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.19.1:3 net-misc/gnome-online-miners[flickr?] upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] ) flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-photos/3.22/gnome-photos-3.22.6.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9ebc71324ae57ee51257a8c02beaa4c
diff --git a/metadata/md5-cache/media-gfx/hugin-2018.0_rc2 b/metadata/md5-cache/media-gfx/hugin-2018.0
index 2d008871051f..21314e433c93 100644
--- a/metadata/md5-cache/media-gfx/hugin-2018.0_rc2
+++ b/metadata/md5-cache/media-gfx/hugin-2018.0
@@ -9,6 +9,6 @@ LICENSE=GPL-2 SIFT
 RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0
-SRC_URI=mirror://sourceforge/hugin/hugin-2018.0rc2.tar.bz2
+SRC_URI=mirror://sourceforge/hugin/hugin-2018.0.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9f9fe708010a1cb572ba2245c39d2871
diff --git a/metadata/md5-cache/media-gfx/kxstitch-2.1.1 b/metadata/md5-cache/media-gfx/kxstitch-2.1.1
new file mode 100644
index 000000000000..664b792a6dc4
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/kxstitch-2.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-gfx/imagemagick[cxx] x11-libs/libX11 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Program to create cross stitch patterns
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/KXStitch
+IUSE=debug +handbook
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-gfx/imagemagick[cxx] x11-libs/libX11 !media-gfx/kxstitch:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kxstitch/2.1.1/kxstitch-2.1.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f216cc7dd140b9825c87c39c2c7dae36
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.22.0.1 b/metadata/md5-cache/media-gfx/simple-scan-3.22.0.1
deleted file mode 100644
index 7b3c99a545ae..000000000000
--- a/metadata/md5-cache/media-gfx/simple-scan-3.22.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgusb[vala] >=media-gfx/sane-backends-1.0.20:= >=sys-libs/zlib-1.2.3.1:= virtual/jpeg:0= x11-libs/cairo:= >=x11-libs/gtk+-3:3 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Simple document scanning utility
-EAPI=6
-HOMEPAGE=https://launchpad.net/simple-scan
-IUSE=colord
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgusb[vala] >=media-gfx/sane-backends-1.0.20:= >=sys-libs/zlib-1.2.3.1:= virtual/jpeg:0= x11-libs/cairo:= >=x11-libs/gtk+-3:3 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) x11-misc/xdg-utils x11-themes/adwaita-icon-theme
-SLOT=0
-SRC_URI=https://launchpad.net/simple-scan/3.22/3.22.0.1/+download/simple-scan-3.22.0.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b68131eea2d23afb265ad429e43a0b39
diff --git a/metadata/md5-cache/media-gfx/sxiv-1.3.2-r2 b/metadata/md5-cache/media-gfx/sxiv-1.3.2-r2
deleted file mode 100644
index 38e91345a8ac..000000000000
--- a/metadata/md5-cache/media-gfx/sxiv-1.3.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?] x11-libs/libX11 >=sys-apps/sed-4
-DESCRIPTION=Simple (or small or suckless) X Image Viewer
-EAPI=6
-HOMEPAGE=https://github.com/muennich/sxiv/
-IUSE=exif gif savedconfig
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?] x11-libs/libX11
-SLOT=0
-SRC_URI=https://github.com/muennich/sxiv/archive/v1.3.2.tar.gz -> sxiv-1.3.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b152f479fdf650e2b78c202fe8da9e7b
diff --git a/metadata/md5-cache/media-gfx/sxiv-24 b/metadata/md5-cache/media-gfx/sxiv-24
index b10b26188219..ce97a59afef3 100644
--- a/metadata/md5-cache/media-gfx/sxiv-24
+++ b/metadata/md5-cache/media-gfx/sxiv-24
@@ -4,10 +4,10 @@ DESCRIPTION=Simple (or small or suckless) X Image Viewer
 EAPI=6
 HOMEPAGE=https://github.com/muennich/sxiv/
 IUSE=exif gif savedconfig
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?] x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=https://github.com/muennich/sxiv/archive/v24.tar.gz -> sxiv-24.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a8bec5c1bb444a128042228fbc6c6f9c
+_md5_=51e948687e383489b0fae72266e63e4f
diff --git a/metadata/md5-cache/media-gfx/ufraw-0.22-r2 b/metadata/md5-cache/media-gfx/ufraw-0.22-r2
new file mode 100644
index 000000000000..a43cc679ca9e
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/ufraw-0.22-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2= >=media-gfx/exiv2-0.11:0= media-libs/lcms:2= >=media-libs/lensfun-0.2.5:= media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= fits? ( sci-libs/cfitsio:0= ) gimp? ( >=media-gfx/gimp-2 ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=media-gfx/gtkimageview-1.5 >=x11-libs/gtk+-2.6:2 ) jpeg2k? ( media-libs/jasper:= ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<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=RAW Image format viewer and GIMP plugin
+EAPI=6
+HOMEPAGE=http://ufraw.sourceforge.net/
+IUSE=contrast fits gimp gnome gtk jpeg2k openmp timezone
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2= >=media-gfx/exiv2-0.11:0= media-libs/lcms:2= >=media-libs/lensfun-0.2.5:= media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= fits? ( sci-libs/cfitsio:0= ) gimp? ( >=media-gfx/gimp-2 ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=media-gfx/gtkimageview-1.5 >=x11-libs/gtk+-2.6:2 ) jpeg2k? ( media-libs/jasper:= )
+REQUIRED_USE=gimp? ( gtk )
+SLOT=0
+SRC_URI=mirror://sourceforge/ufraw/ufraw-0.22.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cafb12d2f98d28f3ef3bec65e02b82d2
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index e65cbfb4a80d..a91866c931d1 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/exiftool-10.72 b/metadata/md5-cache/media-libs/exiftool-10.72
index 5a7ecf614b51..ff142f1bc8bd 100644
--- a/metadata/md5-cache/media-libs/exiftool-10.72
+++ b/metadata/md5-cache/media-libs/exiftool-10.72
@@ -4,10 +4,10 @@ DESCRIPTION=Read and write meta information in image, audio and video files
 EAPI=6
 HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ppc ppc64 x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.72.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=5ea65bc9ae339e0afab2ede4dd2b0f05
+_md5_=c3c9e1e91c7b8df6e2cf0cfd5be809fc
diff --git a/metadata/md5-cache/media-libs/exiftool-10.68 b/metadata/md5-cache/media-libs/exiftool-10.78
index 3efbe23fd01a..841cce110eec 100644
--- a/metadata/md5-cache/media-libs/exiftool-10.68
+++ b/metadata/md5-cache/media-libs/exiftool-10.78
@@ -4,10 +4,10 @@ DESCRIPTION=Read and write meta information in image, audio and video files
 EAPI=6
 HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
 IUSE=doc
-KEYWORDS=amd64 ppc ppc64 x86 ~x64-macos
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
-SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.68.tar.gz
+SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.78.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=c3c9e1e91c7b8df6e2cf0cfd5be809fc
+_md5_=20d25e5adbde45b4c4c9e8f4871dd23a
diff --git a/metadata/md5-cache/media-libs/libkate-0.3.7-r1 b/metadata/md5-cache/media-libs/libkate-0.3.7-r1
deleted file mode 100644
index fda73f910c84..000000000000
--- a/metadata/md5-cache/media-libs/libkate-0.3.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=media-libs/libogg:= media-libs/libpng:0= virtual/pkgconfig sys-devel/flex sys-devel/bison doc? ( app-doc/doxygen )
-DESCRIPTION=Codec for karaoke and text encapsulation for Ogg
-EAPI=6
-HOMEPAGE=https://code.google.com/p/libkate/
-IUSE=doc wxwidgets python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=media-libs/libogg:= media-libs/libpng:0= wxwidgets? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] =dev-python/wxpython-2.8*[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-libs/liboggz )
-REQUIRED_USE=wxwidgets? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://libkate.googlecode.com/files/libkate-0.3.7.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dfd5e291f66213cfdff3b5699999418f
diff --git a/metadata/md5-cache/media-libs/libkate-0.4.1-r1 b/metadata/md5-cache/media-libs/libkate-0.4.1-r1
deleted file mode 100644
index f8bf881b5576..000000000000
--- a/metadata/md5-cache/media-libs/libkate-0.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=media-libs/libogg:= media-libs/libpng:0= virtual/pkgconfig sys-devel/flex sys-devel/bison doc? ( app-doc/doxygen )
-DESCRIPTION=Codec for karaoke and text encapsulation for Ogg
-EAPI=6
-HOMEPAGE=https://code.google.com/p/libkate/
-IUSE=debug doc wxwidgets python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND=media-libs/libogg:= media-libs/libpng:0= wxwidgets? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] =dev-python/wxpython-2.8*[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-libs/liboggz )
-REQUIRED_USE=wxwidgets? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://libkate.googlecode.com/files/libkate-0.4.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=89fe8525f458df234f7dbeaa03df476e
diff --git a/metadata/md5-cache/media-libs/libmediainfo-0.7.99 b/metadata/md5-cache/media-libs/libmediainfo-0.7.99
deleted file mode 100644
index b12421341ae5..000000000000
--- a/metadata/md5-cache/media-libs/libmediainfo-0.7.99
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<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=MediaInfo libraries
-EAPI=6
-HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib
-IUSE=curl doc mms static-libs
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://mediaarea.net/download/source/libmediainfo/0.7.99/libmediainfo_0.7.99.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=028ff906348adb0f695b6a7c45f3f72b
diff --git a/metadata/md5-cache/media-libs/libmediainfo-17.10 b/metadata/md5-cache/media-libs/libmediainfo-17.10
deleted file mode 100644
index 339fe406a24b..000000000000
--- a/metadata/md5-cache/media-libs/libmediainfo-17.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<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=MediaInfo libraries
-EAPI=6
-HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib
-IUSE=curl doc mms static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://mediaarea.net/download/source/libmediainfo/17.10/libmediainfo_17.10.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5280a855bc6827fa950ca5462f8a466d
diff --git a/metadata/md5-cache/media-libs/libmediainfo-17.12 b/metadata/md5-cache/media-libs/libmediainfo-17.12
index 51a3eba7f8ab..f4841d99af60 100644
--- a/metadata/md5-cache/media-libs/libmediainfo-17.12
+++ b/metadata/md5-cache/media-libs/libmediainfo-17.12
@@ -4,11 +4,11 @@ DESCRIPTION=MediaInfo libraries
 EAPI=6
 HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib
 IUSE=curl doc mms static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/libmediainfo/17.12/libmediainfo_17.12.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5280a855bc6827fa950ca5462f8a466d
+_md5_=028ff906348adb0f695b6a7c45f3f72b
diff --git a/metadata/md5-cache/media-libs/mutagen-1.40.0 b/metadata/md5-cache/media-libs/mutagen-1.40.0
new file mode 100644
index 000000000000..eb23515d57dd
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mutagen-1.40.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/hypothesis[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Audio metadata tag reader and writer implemented in pure Python
+EAPI=6
+HOMEPAGE=https://github.com/quodlibet/mutagen https://pypi.python.org/pypi/mutagen
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.40.0/mutagen-1.40.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=696d90d391f9c0a748111164d28d757b
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index e1d9011755fd..e056169a8e6c 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.22.2-r1 b/metadata/md5-cache/media-sound/gnome-music-3.22.2-r1
deleted file mode 100644
index 38d3e391ba99..000000000000
--- a/metadata/md5-cache/media-sound/gnome-music-3.22.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=app-misc/tracker-1.9.0[introspection(+)] >=dev-python/pygobject-3.21.1:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.3.1:0.3[introspection] media-libs/libmediaart:2.0[introspection] >=x11-libs/gtk+-3.19.3:3[introspection] app-text/yelp-tools >=dev-util/intltool-0.26 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Music management for Gnome
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Music
-IUSE=python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=app-misc/tracker-1.9.0[introspection(+)] >=dev-python/pygobject-3.21.1:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.3.1:0.3[introspection] media-libs/libmediaart:2.0[introspection] >=x11-libs/gtk+-3.19.3:3[introspection] || ( app-misc/tracker[gstreamer] app-misc/tracker[ffmpeg] ) x11-libs/libnotify[introspection] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.3[tracker] x11-misc/xdg-user-dirs
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-music/3.22/gnome-music-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=35265afc259a5618bfef2beff293d6f1
diff --git a/metadata/md5-cache/media-sound/gnome-sound-recorder-3.21.92 b/metadata/md5-cache/media-sound/gnome-sound-recorder-3.21.92
deleted file mode 100644
index 5c5eb9f1f38f..000000000000
--- a/metadata/md5-cache/media-sound/gnome-sound-recorder-3.21.92
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/gjs dev-libs/glib:2 >=dev-libs/gobject-introspection-1.0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.12:3[introspection] >=dev-util/intltool-0.26 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Simple sound recorder
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Design/Apps/SoundRecorder
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/gjs dev-libs/glib:2 >=dev-libs/gobject-introspection-1.0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.12:3[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-sound-recorder/3.21/gnome-sound-recorder-3.21.92.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f018530861342d282164fca875365b1
diff --git a/metadata/md5-cache/media-sound/grip-3.3.1-r3 b/metadata/md5-cache/media-sound/grip-3.3.1-r3
deleted file mode 100644
index 009f47883221..000000000000
--- a/metadata/md5-cache/media-sound/grip-3.3.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.2:2 x11-libs/vte:0 media-sound/lame media-sound/cdparanoia >=media-libs/id3lib-3.8.3 >=gnome-base/libgnomeui-2.2.0 >=gnome-base/orbit-2 net-misc/curl vorbis? ( media-sound/vorbis-tools ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422
-DESCRIPTION=GTK+ based Audio CD Player/Ripper
-EAPI=2
-HOMEPAGE=https://sourceforge.net/projects/grip/
-IUSE=nls vorbis
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.2:2 x11-libs/vte:0 media-sound/lame media-sound/cdparanoia >=media-libs/id3lib-3.8.3 >=gnome-base/libgnomeui-2.2.0 >=gnome-base/orbit-2 net-misc/curl vorbis? ( media-sound/vorbis-tools )
-SLOT=0
-SRC_URI=mirror://sourceforge/grip/grip-3.3.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=59efcd4e27ee3eff225aed1a8cd5104b
diff --git a/metadata/md5-cache/media-sound/grip-3.6.1 b/metadata/md5-cache/media-sound/grip-3.6.3
index da251fdf2d0e..7f4ce6f285eb 100644
--- a/metadata/md5-cache/media-sound/grip-3.6.1
+++ b/metadata/md5-cache/media-sound/grip-3.6.3
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools )
 SLOT=0
-SRC_URI=mirror://sourceforge/grip/grip-3.6.1.tar.gz
+SRC_URI=mirror://sourceforge/grip/grip-3.6.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e1965920283064073f1a9f991de0a6cd
+_md5_=d0ca3b8c9b8c9f8094af0546017f5fe3
diff --git a/metadata/md5-cache/media-sound/sound-juicer-3.22.1 b/metadata/md5-cache/media-sound/sound-juicer-3.22.1
deleted file mode 100644
index 7f162bb1f19d..000000000000
--- a/metadata/md5-cache/media-sound/sound-juicer-3.22.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.49.5:2[dbus] >=x11-libs/gtk+-3.21.6:3 media-libs/libcanberra[gtk3] >=app-cdr/brasero-2.90 sys-apps/dbus gnome-base/gsettings-desktop-schemas >=media-libs/libdiscid-0.4.0 >=media-libs/musicbrainz-5.0.1:5= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[vorbis?] flac? ( media-plugins/gst-plugins-flac:1.0 ) app-text/yelp-tools dev-libs/appstream-glib gnome-base/gnome-common >=sys-devel/gettext-0.19.6 virtual/pkgconfig test? ( ~app-text/docbook-xml-dtd-4.3 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=CD ripper for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/SoundJuicer
-IUSE=debug flac test vorbis
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2.49.5:2[dbus] >=x11-libs/gtk+-3.21.6:3 media-libs/libcanberra[gtk3] >=app-cdr/brasero-2.90 sys-apps/dbus gnome-base/gsettings-desktop-schemas >=media-libs/libdiscid-0.4.0 >=media-libs/musicbrainz-5.0.1:5= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[vorbis?] flac? ( media-plugins/gst-plugins-flac:1.0 ) gnome-base/gvfs[cdda,udev] || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0
-SLOT=0
-SRC_URI=mirror://gnome/sources/sound-juicer/3.22/sound-juicer-3.22.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=da94587a6f555bd268051c2d1e958446
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 51800a288d26..2f1f67496823 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/cheese-3.22.1 b/metadata/md5-cache/media-video/cheese-3.22.1
deleted file mode 100644
index 46b20dab7961..000000000000
--- a/metadata/md5-cache/media-video/cheese-3.22.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.13.4:3[introspection?] >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 media-libs/clutter-gst:3.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50 dev-util/itstool virtual/pkgconfig x11-proto/xf86vidmodeproto test? ( dev-libs/glib:2[utils] ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A cheesy program to take pictures and videos from your webcam
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Cheese
-IUSE=+introspection test test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.13.4:3[introspection?] >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 media-libs/clutter-gst:3.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-good-1.4:1.0 >=media-plugins/gst-plugins-jpeg-1.4:1.0 >=media-plugins/gst-plugins-v4l2-1.4:1.0 >=media-plugins/gst-plugins-vpx-1.4:1.0
-SLOT=0/8
-SRC_URI=mirror://gnome/sources/cheese/3.22/cheese-3.22.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b774724fac2a0e6e00f303830ad2ce3
diff --git a/metadata/md5-cache/media-video/mediainfo-0.7.99 b/metadata/md5-cache/media-video/mediainfo-0.7.99
deleted file mode 100644
index 9e5505fd8b74..000000000000
--- a/metadata/md5-cache/media-video/mediainfo-0.7.99
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-0.7.99[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<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=MediaInfo supplies technical and tag information about media files
-EAPI=6
-HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo
-IUSE=curl mms wxwidgets
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-0.7.99[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
-SLOT=0
-SRC_URI=https://mediaarea.net/download/source/mediainfo/0.7.99/mediainfo_0.7.99.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=55e8a327d5b76515cdc6aac4e9f0c7cd
diff --git a/metadata/md5-cache/media-video/mediainfo-17.10 b/metadata/md5-cache/media-video/mediainfo-17.10
deleted file mode 100644
index a4e831a8c10b..000000000000
--- a/metadata/md5-cache/media-video/mediainfo-17.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-17.10[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<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=MediaInfo supplies technical and tag information about media files
-EAPI=6
-HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo
-IUSE=curl mms wxwidgets
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-17.10[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
-SLOT=0
-SRC_URI=https://mediaarea.net/download/source/mediainfo/17.10/mediainfo_17.10.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=716254fa4dcff77e8c20f8b15ee86e4e
diff --git a/metadata/md5-cache/media-video/mediainfo-17.12 b/metadata/md5-cache/media-video/mediainfo-17.12
index 08c02b6f32fe..6a8ea77ca95f 100644
--- a/metadata/md5-cache/media-video/mediainfo-17.12
+++ b/metadata/md5-cache/media-video/mediainfo-17.12
@@ -4,10 +4,10 @@ DESCRIPTION=MediaInfo supplies technical and tag information about media files
 EAPI=6
 HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo
 IUSE=curl mms wxwidgets
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-17.12[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/mediainfo/17.12/mediainfo_17.12.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=716254fa4dcff77e8c20f8b15ee86e4e
+_md5_=55e8a327d5b76515cdc6aac4e9f0c7cd
diff --git a/metadata/md5-cache/media-video/totem-3.22.1-r1 b/metadata/md5-cache/media-video/totem-3.22.1-r1
deleted file mode 100644
index 6317c3f33e90..000000000000
--- a/metadata/md5-cache/media-video/totem-3.22.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.35:2[dbus] >=dev-libs/libpeas-1.1[gtk] >=dev-libs/libxml2-2.6:2 >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 >=x11-libs/cairo-1.14 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.19.4:3[introspection?] >=media-libs/grilo-0.3.0:0.3[playlist] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango] media-libs/gst-plugins-good:1.0 x11-libs/libX11 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.91.3 ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pygobject-2.90.3:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) app-text/docbook-xml-dtd:4.5 app-text/yelp-tools dev-libs/appstream-glib >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50.1 sys-devel/gettext virtual/pkgconfig x11-proto/xextproto x11-proto/xproto dev-libs/gobject-introspection-common gnome-base/gnome-common >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Media player for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Videos
-IUSE=debug +introspection lirc nautilus +python test python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.35:2[dbus] >=dev-libs/libpeas-1.1[gtk] >=dev-libs/libxml2-2.6:2 >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 >=x11-libs/cairo-1.14 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.19.4:3[introspection?] >=media-libs/grilo-0.3.0:0.3[playlist] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango] media-libs/gst-plugins-good:1.0 x11-libs/libX11 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.91.3 ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pygobject-2.90.3:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) media-plugins/grilo-plugins:0.3 media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-1.1.0[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=x11-libs/gtk+-3.5.2:3[introspection] )
-REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/totem/3.22/totem-3.22.1.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b248aa10ff8be7a53f851512eecf99f9
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 19c0fbee3f55..35956762c41c 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.7 b/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.7
new file mode 100644
index 000000000000..901b87091a66
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Command line interface for testing internet bandwidth using speedtest.net
+EAPI=6
+HOMEPAGE=https://github.com/sivel/speedtest-cli
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/sivel/speedtest-cli/archive/v1.0.7.tar.gz -> speedtest-cli-1.0.7.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b8a132c8019dcab0c72d950fa14a91c2
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 494bd5c69239..2c7b1506b95a 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/iptables-1.6.0-r1 b/metadata/md5-cache/net-firewall/iptables-1.6.2
index 455c9ff5531f..971ea4f219a8 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.6.0-r1
+++ b/metadata/md5-cache/net-firewall/iptables-1.6.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=conntrack? ( net-libs/libnetfilter_conntrack ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0 >=net-libs/libnftnl-1.0.5 ) pcap? ( net-libs/libpcap ) virtual/os-headers virtual/pkgconfig nftables? ( sys-devel/flex virtual/yacc ) virtual/pkgconfig >=app-portage/elt-patches-20170422
+DEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:0= >=net-libs/libnftnl-1.0.5:0= ) pcap? ( net-libs/libpcap ) virtual/os-headers virtual/pkgconfig nftables? ( sys-devel/flex virtual/yacc ) virtual/pkgconfig >=app-portage/elt-patches-20170422
 DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.netfilter.org/projects/iptables/
 IUSE=conntrack ipv6 netlink nftables pcap static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=conntrack? ( net-libs/libnetfilter_conntrack ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0 >=net-libs/libnftnl-1.0.5 ) pcap? ( net-libs/libpcap )
-SLOT=0/11
-SRC_URI=http://www.netfilter.org/projects/iptables/files/iptables-1.6.0.tar.bz2
+RDEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:0= >=net-libs/libnftnl-1.0.5:0= ) pcap? ( net-libs/libpcap )
+SLOT=0/12
+SRC_URI=http://www.netfilter.org/projects/iptables/files/iptables-1.6.2.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=343f90280148c30aa79b3bd4c67fd56b
+_md5_=580f63a5e277c6cd61236a28a420ed4d
diff --git a/metadata/md5-cache/net-firewall/nftables-0.8.2 b/metadata/md5-cache/net-firewall/nftables-0.8.2
new file mode 100644
index 000000000000..0e7ebe0be553
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftables-0.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.0.9:0= >=app-text/docbook2X-0.8.8-r4 doc? ( >=app-text/dblatex-0.3.7 ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
+EAPI=6
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=debug doc +gmp +readline
+KEYWORDS=~amd64 ~arm ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.0.9:0=
+SLOT=0
+SRC_URI=https://git.netfilter.org/nftables/snapshot/v0.8.2.tar.gz -> nftables-0.8.2.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=a4218ed1891544cecec3f51a23bc2775
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 7c459248422a..526454df000e 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/s3ql-1.19 b/metadata/md5-cache/net-fs/s3ql-1.19
deleted file mode 100644
index 2bcc1561af88..000000000000
--- a/metadata/md5-cache/net-fs/s3ql-1.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/apsw-3.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/llfuse-0.37[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptopp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyliblzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-fs/fuse test? ( dev-python/pytest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/rsync[xattr] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A full-featured file system for online data storage
-EAPI=5
-HOMEPAGE=https://bitbucket.org/nikratio/s3ql/
-IUSE=contrib doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/apsw-3.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/llfuse-0.37[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptopp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyliblzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-fs/fuse python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-1.19.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45248670a681974036cc661cf20d5ac3
diff --git a/metadata/md5-cache/net-fs/s3ql-2.11 b/metadata/md5-cache/net-fs/s3ql-2.11
deleted file mode 100644
index cd16841296c9..000000000000
--- a/metadata/md5-cache/net-fs/s3ql-2.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/dugong-3.2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/llfuse-0.39[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pycrypto[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] sys-fs/fuse test? ( dev-python/pytest[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] net-misc/rsync[xattr] ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-DESCRIPTION=A full-featured file system for online data storage
-EAPI=5
-HOMEPAGE=https://bitbucket.org/nikratio/s3ql/
-IUSE=contrib doc test python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/dugong-3.2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/llfuse-0.39[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pycrypto[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] sys-fs/fuse python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.11.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f84e88351137fc190ec188b9e8489e05
diff --git a/metadata/md5-cache/net-fs/s3ql-2.11.1 b/metadata/md5-cache/net-fs/s3ql-2.11.1
deleted file mode 100644
index e0619ffded58..000000000000
--- a/metadata/md5-cache/net-fs/s3ql-2.11.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/dugong-3.2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/llfuse-0.39[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pycrypto[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] sys-fs/fuse test? ( dev-python/pytest[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] net-misc/rsync[xattr] ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-DESCRIPTION=A full-featured file system for online data storage
-EAPI=5
-HOMEPAGE=https://bitbucket.org/nikratio/s3ql/
-IUSE=contrib doc test python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/dugong-3.2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/llfuse-0.39[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pycrypto[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] sys-fs/fuse python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.11.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f84e88351137fc190ec188b9e8489e05
diff --git a/metadata/md5-cache/net-fs/s3ql-2.12 b/metadata/md5-cache/net-fs/s3ql-2.12
deleted file mode 100644
index a42d1e72c629..000000000000
--- a/metadata/md5-cache/net-fs/s3ql-2.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/dugong-3.2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/llfuse-0.39[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pycrypto[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] sys-fs/fuse test? ( dev-python/pytest[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] net-misc/rsync[xattr] ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-DESCRIPTION=A full-featured file system for online data storage
-EAPI=5
-HOMEPAGE=https://bitbucket.org/nikratio/s3ql/
-IUSE=contrib doc test python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/dugong-3.2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/llfuse-0.39[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pycrypto[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] sys-fs/fuse python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.12.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f84e88351137fc190ec188b9e8489e05
diff --git a/metadata/md5-cache/net-fs/s3ql-2.14 b/metadata/md5-cache/net-fs/s3ql-2.14
deleted file mode 100644
index 54e0866e56b2..000000000000
--- a/metadata/md5-cache/net-fs/s3ql-2.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/dugong-3.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/llfuse-0.39[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pycrypto[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] sys-fs/fuse test? ( dev-python/pytest[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] net-misc/rsync[xattr] ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-DESCRIPTION=A full-featured file system for online data storage
-EAPI=5
-HOMEPAGE=https://bitbucket.org/nikratio/s3ql/
-IUSE=contrib doc test python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/dugong-3.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/llfuse-0.39[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pycrypto[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] sys-fs/fuse python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.14.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=20f5a5a8ccd6f425a294fd1651ef252d
diff --git a/metadata/md5-cache/net-fs/s3ql-2.14-r1 b/metadata/md5-cache/net-fs/s3ql-2.14-r1
deleted file mode 100644
index 3a4de6319856..000000000000
--- a/metadata/md5-cache/net-fs/s3ql-2.14-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/dugong-3.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/llfuse-0.39[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pycrypto[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] sys-fs/fuse test? ( dev-python/pytest[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] net-misc/rsync[xattr] ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-DESCRIPTION=A full-featured file system for online data storage
-EAPI=5
-HOMEPAGE=https://bitbucket.org/nikratio/s3ql/
-IUSE=contrib doc test python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/dugong-3.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/llfuse-0.39[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pycrypto[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] sys-fs/fuse python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.14.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ddd538913dee36660d1095e3bdb93e90
diff --git a/metadata/md5-cache/net-fs/s3ql-2.17.1 b/metadata/md5-cache/net-fs/s3ql-2.17.1
deleted file mode 100644
index 38d1bbd872ba..000000000000
--- a/metadata/md5-cache/net-fs/s3ql-2.17.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/dugong-3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/llfuse-1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-fs/fuse test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] net-misc/rsync[xattr] ) 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A full-featured file system for online data storage
-EAPI=5
-HOMEPAGE=https://bitbucket.org/nikratio/s3ql/
-IUSE=contrib doc test python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/dugong-3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/llfuse-1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-fs/fuse 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.17.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c9e097a3d22ea77a80a78b034d8fef1
diff --git a/metadata/md5-cache/net-fs/s3ql-2.20 b/metadata/md5-cache/net-fs/s3ql-2.20
deleted file mode 100644
index c38b1be0169a..000000000000
--- a/metadata/md5-cache/net-fs/s3ql-2.20
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/dugong-3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/llfuse-1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-fs/fuse test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] net-misc/rsync[xattr] ) 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A full-featured file system for online data storage
-EAPI=6
-HOMEPAGE=https://bitbucket.org/nikratio/s3ql/
-IUSE=contrib doc test python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/dugong-3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/llfuse-1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-fs/fuse 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.20.tar.bz2
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6fdc720bc26c3cb317cac3c0419d1c78
diff --git a/metadata/md5-cache/net-fs/s3ql-2.21 b/metadata/md5-cache/net-fs/s3ql-2.21
deleted file mode 100644
index 31ec9adbfdc4..000000000000
--- a/metadata/md5-cache/net-fs/s3ql-2.21
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dugong-3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/llfuse-1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-fs/fuse test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/rsync[xattr] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A full-featured file system for online data storage
-EAPI=6
-HOMEPAGE=https://bitbucket.org/nikratio/s3ql/
-IUSE=contrib doc test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dugong-3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/llfuse-1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-fs/fuse python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.21.tar.bz2
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=872e351c9a652cc8bd9d8d6056965fe2
diff --git a/metadata/md5-cache/net-fs/s3ql-2.23 b/metadata/md5-cache/net-fs/s3ql-2.23
deleted file mode 100644
index 93177fcbff5e..000000000000
--- a/metadata/md5-cache/net-fs/s3ql-2.23
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dugong-3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/llfuse-1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-fs/fuse test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/rsync[xattr] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A full-featured file system for online data storage
-EAPI=6
-HOMEPAGE=https://bitbucket.org/nikratio/s3ql/
-IUSE=contrib doc test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-db/sqlite-3.7.0:3 dev-python/defusedxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/apsw-3.7.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dugong-3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/llfuse-1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-fs/fuse python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.23.tar.bz2
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=872e351c9a652cc8bd9d8d6056965fe2
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index ec0b5cea2103..4bf207dd9246 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/lftp-4.7.5 b/metadata/md5-cache/net-ftp/lftp-4.7.5
index 48bdcc6cd8e7..4d496179b11c 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.7.5
+++ b/metadata/md5-cache/net-ftp/lftp-4.7.5
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://lftp.tech/ftp/lftp-4.7.5.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=67f71a45f021764869286c93ae461f45
+_md5_=fcc56cd63ca526fd94133c84236e1675
diff --git a/metadata/md5-cache/net-ftp/lftp-4.8.2 b/metadata/md5-cache/net-ftp/lftp-4.8.2
index 6a54eb5c927d..478791943a33 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.8.2
+++ b/metadata/md5-cache/net-ftp/lftp-4.8.2
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://lftp.tech/ftp/lftp-4.8.2.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f4116b56d64249b4f9e0b7a5a8bb0e26
+_md5_=b140e3b7a289a0c29672f91c071d0103
diff --git a/metadata/md5-cache/net-ftp/lftp-4.8.3 b/metadata/md5-cache/net-ftp/lftp-4.8.3
index b13a005408af..2783dd9176b5 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.8.3
+++ b/metadata/md5-cache/net-ftp/lftp-4.8.3
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://lftp.tech/ftp/lftp-4.8.3.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f4116b56d64249b4f9e0b7a5a8bb0e26
+_md5_=b140e3b7a289a0c29672f91c071d0103
diff --git a/metadata/md5-cache/net-ftp/lftp-9999 b/metadata/md5-cache/net-ftp/lftp-9999
index fb4020d2ee8b..80996f639543 100644
--- a/metadata/md5-cache/net-ftp/lftp-9999
+++ b/metadata/md5-cache/net-ftp/lftp-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b1fbffca56e5b2ba00451f4432730d03
+_md5_=5d7b71aa1420effce1188f1b75f62da7
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 327e73a1ae14..cfbf3855fdec 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/polari-3.22.2 b/metadata/md5-cache/net-irc/polari-3.22.2
deleted file mode 100644
index 49d64fa38dec..000000000000
--- a/metadata/md5-cache/net-irc/polari-3.22.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-crypt/libsecret[introspection] >=dev-libs/gjs-1.45.3 >=dev-libs/glib-2.43.4:2 >=dev-libs/gobject-introspection-1.50:= net-im/telepathy-logger[introspection] net-libs/libsoup:2.4[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.21.6:3[introspection] app-text/yelp-tools dev-libs/appstream-glib >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An IRC client for Gnome
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Polari
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/libsecret[introspection] >=dev-libs/gjs-1.45.3 >=dev-libs/glib-2.43.4:2 >=dev-libs/gobject-introspection-1.50:= net-im/telepathy-logger[introspection] net-libs/libsoup:2.4[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.21.6:3[introspection] >=net-irc/telepathy-idle-0.2
-SLOT=0
-SRC_URI=mirror://gnome/sources/polari/3.22/polari-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fb67226bccc1769ff9111ecaf14ad3d8
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 8b80b64d1610..55003036a665 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.22.7 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.22.7
deleted file mode 100644
index c62fecfea0d7..000000000000
--- a/metadata/md5-cache/net-libs/gnome-online-accounts-3.22.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 net-libs/telepathy-glib >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.19.12:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) kerberos? ( app-crypt/gcr:0=[gtk] app-crypt/mit-krb5 ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.3 >=dev-util/gdbus-codegen-2.30.0 >=dev-util/intltool-0.50.1 sys-devel/gettext virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME framework for accessing online accounts
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineAccounts
-IUSE=debug gnome +introspection kerberos vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2+
-PDEPEND=gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )
-RDEPEND=>=dev-libs/glib-2.40:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 net-libs/telepathy-glib >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.19.12:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) kerberos? ( app-crypt/gcr:0=[gtk] app-crypt/mit-krb5 )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0/1
-SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.22/gnome-online-accounts-3.22.7.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0403cb012fb0eef1edc447cbf629d23d
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.0.20180203 b/metadata/md5-cache/net-libs/miniupnpc-2.0.20180203
new file mode 100644
index 000000000000..4611d0ec0582
--- /dev/null
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.0.20180203
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=kernel_linux? ( sys-apps/lsb-release sys-apps/which )
+DESCRIPTION=UPnP client library and a simple UPnP client
+EAPI=6
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=ipv6 kernel_linux static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD
+SLOT=0/16
+SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.0.20180203.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b7a8a8cb7aa87b9f5fa89089dc9e38ea
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.10.0 b/metadata/md5-cache/net-libs/nghttp2-1.10.0
deleted file mode 100644
index 58553a3d15d2..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=cxx? ( dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=6
-HOMEPAGE=https://nghttp2.org/
-IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=MIT
-RDEPEND=cxx? ( dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/1.14
-SRC_URI=https://github.com/tatsuhiro-t/nghttp2/releases/download/v1.10.0/nghttp2-1.10.0.tar.gz
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=18056e0417e686375f967362f6a3b6c7
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.28.0 b/metadata/md5-cache/net-libs/nghttp2-1.28.0
deleted file mode 100644
index 7f28d8303e45..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.28.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=cxx? ( dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=6
-HOMEPAGE=https://nghttp2.org/
-IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=cxx? ( dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/1.14
-SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.28.0/nghttp2-1.28.0.tar.xz
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d2601c2e3ac6d19023128137efa6dad3
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.30.0 b/metadata/md5-cache/net-libs/nghttp2-1.30.0
new file mode 100644
index 000000000000..d49bb6f3037f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.30.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=6
+HOMEPAGE=https://nghttp2.org/
+IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/1.14
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.30.0/nghttp2-1.30.0.tar.xz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=5fc8dbfdc7c911a551d5fcd5cd02fdb3
diff --git a/metadata/md5-cache/net-libs/qxmpp-0.9.3-r1 b/metadata/md5-cache/net-libs/qxmpp-0.9.3-r1
index dd85bbc0a5f8..dcc5135bd600 100644
--- a/metadata/md5-cache/net-libs/qxmpp-0.9.3-r1
+++ b/metadata/md5-cache/net-libs/qxmpp-0.9.3-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 opus? ( media-lib
 SLOT=0
 SRC_URI=https://github.com/qxmpp-project/qxmpp/archive/v0.9.3.tar.gz -> qxmpp-0.9.3.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2b2c7625882c0e085b5109d326dd1715
+_md5_=5969f8ad93f730208900fb79226998da
diff --git a/metadata/md5-cache/net-libs/qxmpp-9999 b/metadata/md5-cache/net-libs/qxmpp-9999
index 09e4de6e9239..de8d93ef201d 100644
--- a/metadata/md5-cache/net-libs/qxmpp-9999
+++ b/metadata/md5-cache/net-libs/qxmpp-9999
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 opus? ( media-libs/opus ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vpx? ( media-libs/libvpx )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=557fe45d683ea1eb6f3c81c5388deeca
+_md5_=8958775b1eb4370043aabd766661a824
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 8afef865593a..cb0e9eff5d02 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/gnome-online-miners-3.22.0 b/metadata/md5-cache/net-misc/gnome-online-miners-3.22.0
deleted file mode 100644
index 6649fb195cdd..000000000000
--- a/metadata/md5-cache/net-misc/gnome-online-miners-3.22.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-misc/tracker-1:0= >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] media-libs/grilo:0.3 >=net-libs/gnome-online-accounts-3.13.3:= >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins:0.3[flickr] ) virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Crawls through your online content
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineMiners
-IUSE=flickr
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-misc/tracker-1:0= >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] media-libs/grilo:0.3 >=net-libs/gnome-online-accounts-3.13.3:= >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-online-miners/3.22/gnome-online-miners-3.22.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b5ede52d6964faa187e04bc7c44f69fd
diff --git a/metadata/md5-cache/net-misc/keychain-2.8.5 b/metadata/md5-cache/net-misc/keychain-2.8.5
new file mode 100644
index 000000000000..5bd9a52ca15c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/keychain-2.8.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/perl
+DESCRIPTION=Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
+EAPI=6
+HOMEPAGE=http://www.funtoo.org/Keychain
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/funtoo/keychain/archive/2.8.5.tar.gz -> keychain-2.8.5.tar.gz
+_md5_=c80e503a05c26f70c93b63d008aed6a6
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.5.20180203 b/metadata/md5-cache/net-misc/minissdpd-1.5.20180203
new file mode 100644
index 000000000000..4b97483803ed
--- /dev/null
+++ b/metadata/md5-cache/net-misc/minissdpd-1.5.20180203
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=net-libs/libnfnetlink
+DESCRIPTION=MiniSSDP Daemon
+EAPI=6
+HOMEPAGE=http://miniupnp.free.fr/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=net-libs/libnfnetlink || ( net-misc/miniupnpd net-libs/miniupnpc )
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/minissdpd-1.5.20180203.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=2b309864472005ca1c5671c8c6ff82d6
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.0.20180203 b/metadata/md5-cache/net-misc/miniupnpd-2.0.20180203
new file mode 100644
index 000000000000..0cb8d7ea4ec0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.0.20180203
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux dev-libs/openssl:0= sys-apps/lsb-release
+DESCRIPTION=MiniUPnP IGD Daemon
+EAPI=6
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=+leasefile igd2 ipv6 pcp-peer portinuse strict
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux dev-libs/openssl:0=
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.0.20180203.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=347d4254f733ab1583c67e072ef51faf
diff --git a/metadata/md5-cache/net-misc/rygel-0.32.1 b/metadata/md5-cache/net-misc/rygel-0.32.1
deleted file mode 100644
index 7d696a142c1c..000000000000
--- a/metadata/md5-cache/net-misc/rygel-0.32.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gupnp-dlna-0.9.4:2.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmediaart-0.7:2.0 media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-0.13 >=net-libs/gupnp-0.20.14 >=net-libs/gupnp-av-0.12.8 >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( >=app-misc/tracker-0.16:= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) X? ( >=x11-libs/gtk+-3:3 ) dev-util/gtk-doc-am >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Rygel is an open source UPnP/DLNA MediaServer
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Rygel
-IUSE=X +introspection +sqlite tracker test transcode test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gupnp-dlna-0.9.4:2.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmediaart-0.7:2.0 media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-0.13 >=net-libs/gupnp-0.20.14 >=net-libs/gupnp-av-0.12.8 >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( >=app-misc/tracker-0.16:= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) X? ( >=x11-libs/gtk+-3:3 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/rygel/0.32/rygel-0.32.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bdc798f6b38efb7fdb90acabe2c7c80d
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 5c0c84bc4358..e5920ae13c60 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-3.3.10 b/metadata/md5-cache/net-p2p/qbittorrent-3.3.10
index f76a38c411f9..cefa4b0aef4b 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-3.3.10
+++ b/metadata/md5-cache/net-p2p/qbittorrent-3.3.10
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.0.6 sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=BitTorrent client in C++ and Qt
 EAPI=6
-HOMEPAGE=http://www.qbittorrent.org/
+HOMEPAGE=https://www.qbittorrent.org/
 IUSE=+dbus debug webui +X
 KEYWORDS=amd64 arm ~ppc64 x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=dbus? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/qbittorrent/qbittorrent-3.3.10.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8624fe612e6a2a47a3c4f0b23ea080cd
+_md5_=09986e162d4a33f694ff68d1df460cd8
diff --git a/metadata/md5-cache/net-voip/Manifest.gz b/metadata/md5-cache/net-voip/Manifest.gz
index 898868793ba2..5daf399dc325 100644
--- a/metadata/md5-cache/net-voip/Manifest.gz
+++ b/metadata/md5-cache/net-voip/Manifest.gz
diff --git a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1 b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1
deleted file mode 100644
index 20843e66ea97..000000000000
--- a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.61 dev-libs/libxml2 >=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.1.0 >=net-libs/telepathy-glib-0.17.1 >=net-dns/avahi-0.6.22[dbus] net-libs/libsoup:2.4 sys-apps/util-linux gnutls? ( >=net-libs/gnutls-2.10.2 ) !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/libxslt virtual/pkgconfig test? ( >=dev-libs/check-0.9.4 net-libs/libgsasl dev-python/twisted-words )
-DESCRIPTION=A link-local XMPP connection manager for Telepathy
-EAPI=5
-HOMEPAGE=https://telepathy.freedesktop.org/wiki/CategorySalut
-IUSE=gnutls test
-KEYWORDS=alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/dbus-glib-0.61 dev-libs/libxml2 >=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.1.0 >=net-libs/telepathy-glib-0.17.1 >=net-dns/avahi-0.6.22[dbus] net-libs/libsoup:2.4 sys-apps/util-linux gnutls? ( >=net-libs/gnutls-2.10.2 ) !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] )
-SLOT=0
-SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-0.8.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e9c7a84ca1df162114e05f4f3616e1ab
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 89dca77b1f33..b4a4af7bad92 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/geocode-glib-3.20.1 b/metadata/md5-cache/sci-geosciences/geocode-glib-3.20.1
deleted file mode 100644
index ea25dea24ab1..000000000000
--- a/metadata/md5-cache/sci-geosciences/geocode-glib-3.20.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/json-glib-0.99.2[introspection?] gnome-base/gvfs[http] >=net-libs/libsoup-2.42:2.4[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.3:= ) >=dev-util/gtk-doc-am-1.13 >=sys-devel/gettext-0.18 virtual/pkgconfig test? ( sys-apps/dbus ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GLib geocoding library that uses the Yahoo! Place Finder service
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/geocode-glib
-IUSE=+introspection test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/json-glib-0.99.2[introspection?] gnome-base/gvfs[http] >=net-libs/libsoup-2.42:2.4[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/geocode-glib/3.20/geocode-glib-3.20.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d2a7d248bfa02627582eabf613d49680
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-3.22.2 b/metadata/md5-cache/sci-geosciences/gnome-maps-3.22.2
deleted file mode 100644
index a99ca6516804..000000000000
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-3.22.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/folks-0.10 >=dev-libs/gjs-1.44.0 >=dev-libs/gobject-introspection-0.6.3:= >=dev-libs/glib-2.39.3:2 >=dev-libs/libgee-0.16:0.8[introspection] dev-libs/libxml2:2 >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] net-libs/rest:0.7[introspection] >=sci-geosciences/geocode-glib-3.15.2[introspection] >=x11-libs/gtk+-3.15.9:3[introspection] >=dev-util/intltool-0.40 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A map application for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Maps
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
-RDEPEND=>=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/folks-0.10 >=dev-libs/gjs-1.44.0 >=dev-libs/gobject-introspection-0.6.3:= >=dev-libs/glib-2.39.3:2 >=dev-libs/libgee-0.16:0.8[introspection] dev-libs/libxml2:2 >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] net-libs/rest:0.7[introspection] >=sci-geosciences/geocode-glib-3.15.2[introspection] >=x11-libs/gtk+-3.15.9:3[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] media-libs/cogl:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection] x11-libs/gdk-pixbuf:2[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-maps/3.22/gnome-maps-3.22.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4572fb466eaf8129bc882f166d681fc7
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 3705d99b9649..f0019a5361ad 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/gdal-2.0.3 b/metadata/md5-cache/sci-libs/gdal-2.0.3
deleted file mode 100644
index b7ab908d1835..000000000000
--- a/metadata/md5-cache/sci-libs/gdal-2.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:= media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( >=app-text/poppler-0.24.3:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numpy[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(-)] ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.7:* ) perl? ( dev-lang/swig:0 ) python? ( dev-lang/swig:0 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
-EAPI=6
-HOMEPAGE=http://www.gdal.org/
-IUSE=armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads xls python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD Info-ZIP MIT
-RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:= media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( >=app-text/poppler-0.24.3:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numpy[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(-)] ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) java? ( >=virtual/jre-1.7:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) spatialite? ( sqlite )
-SLOT=0/2
-SRC_URI=http://download.osgeo.org/gdal/2.0.3/gdal-2.0.3.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=99e54e09b4fa70532bb63fcf2850e062
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 46671e69b5e3..6c5207ebddbf 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/ack-2.22 b/metadata/md5-cache/sys-apps/ack-2.22
new file mode 100644
index 000000000000..f2c82c25dfea
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ack-2.22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/File-Next-1.160.0 test? ( dev-perl/IO-Tty ) dev-lang/perl:=
+DESCRIPTION=ack is a tool like grep, optimized for programmers
+EAPI=6
+HOMEPAGE=https://beyondgrep.com/ http://search.cpan.org/dist/ack/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=Artistic-2
+RDEPEND=>=dev-perl/File-Next-1.160.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/ack-2.22.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=2987b38a2a97c719d823a1a5478be7b3
diff --git a/metadata/md5-cache/sys-apps/baobab-3.22.1 b/metadata/md5-cache/sys-apps/baobab-3.22.1
deleted file mode 100644
index fa5d3192371c..000000000000
--- a/metadata/md5-cache/sys-apps/baobab-3.22.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.19.1:3 app-text/yelp-tools dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Disk usage browser for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Baobab
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.19.1:3 gnome-base/gsettings-desktop-schemas x11-themes/adwaita-icon-theme !<gnome-extra/gnome-utils-3.4
-SLOT=0
-SRC_URI=mirror://gnome/sources/baobab/3.22/baobab-3.22.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7253fda566137b34889c8e895822ae90
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.22.1 b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.22.1
deleted file mode 100644
index 235351b82daf..000000000000
--- a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.22.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-arch/xz-utils-5.0.5 >=app-crypt/libsecret-0.7 >=dev-libs/glib-2.31:2[dbus] dev-libs/libpwquality >=media-libs/libcanberra-0.1[gtk3] >=media-libs/libdvdread-4.2.0 >=sys-fs/udisks-2.1.1:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7:= systemd? ( >=sys-apps/systemd-209:0= ) >=dev-util/intltool-0.50.2 dev-libs/appstream-glib dev-libs/libxslt virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Disk Utility for GNOME using udisks
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-disk-utility
-IUSE=fat gnome systemd
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=app-arch/xz-utils-5.0.5 >=app-crypt/libsecret-0.7 >=dev-libs/glib-2.31:2[dbus] dev-libs/libpwquality >=media-libs/libcanberra-0.1[gtk3] >=media-libs/libdvdread-4.2.0 >=sys-fs/udisks-2.1.1:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7:= systemd? ( >=sys-apps/systemd-209:0= ) x11-themes/adwaita-icon-theme fat? ( sys-fs/dosfstools ) gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-disk-utility/3.22/gnome-disk-utility-3.22.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ddde961fc6a64390b33db4fe5c6035f9
diff --git a/metadata/md5-cache/sys-apps/moreutils-0.60-r1 b/metadata/md5-cache/sys-apps/moreutils-0.62
index 6d11c02c4c99..b727ff7aae4f 100644
--- a/metadata/md5-cache/sys-apps/moreutils-0.60-r1
+++ b/metadata/md5-cache/sys-apps/moreutils-0.62
@@ -4,10 +4,10 @@ DESCRIPTION=a collection of tools that nobody thought to write when Unix was you
 EAPI=6
 HOMEPAGE=https://joeyh.name/code/moreutils/
 IUSE=+doc +perl
-KEYWORDS=~alpha amd64 hppa ~ppc ~ppc64 x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=perl? ( dev-lang/perl dev-perl/IPC-Run dev-perl/Time-Duration dev-perl/TimeDate )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~radhermit/dist/moreutils-0.60.tar.gz
+SRC_URI=https://dev.gentoo.org/~radhermit/dist/moreutils-0.62.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=11fae499726433c1d517b779b935e7a6
+_md5_=66632dc04da4948b5b7f5d1b88a56edd
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.24 b/metadata/md5-cache/sys-apps/portage-2.3.24
index 8888893ff167..c70bb84f0b62 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.24
+++ b/metadata/md5-cache/sys-apps/portage-2.3.24
@@ -3,7 +3,7 @@ DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_tar
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=build doc epydoc +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.24.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.24.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bf2580de946a39b5e73fb10ec81ec107
+_md5_=d978605b9ac7091637d5cbe0d4b7a391
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index ae9859bb3b4c..dc89789cd82e 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -3,11 +3,11 @@ DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_tar
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=build doc epydoc +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 rsync-verify? ( >=app-portage/gemato-10 app-crypt/gentoo-keys app-crypt/gnupg[ssl(-)] ) selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a84fc97883ac00c0ed0ad478d1048ee
+_md5_=568ffab994e709aaf86751108140a3fc
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 3a687072ce84..bf8f3f459804 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.71 b/metadata/md5-cache/sys-block/tgt-1.0.71
deleted file mode 100644
index f898830fb301..000000000000
--- a/metadata/md5-cache/sys-block/tgt-1.0.71
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets
-DESCRIPTION=Linux SCSI target framework (tgt)
-EAPI=5
-HOMEPAGE=http://stgt.sourceforge.net
-IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets dev-libs/libaio sys-apps/sg3_utils
-SLOT=0
-SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.71 -> tgt-1.0.71.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b38f1382ab889c45f9786010b27898d6
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.73 b/metadata/md5-cache/sys-block/tgt-1.0.73
index fa9b62ce33f2..4ebce0985c5a 100644
--- a/metadata/md5-cache/sys-block/tgt-1.0.73
+++ b/metadata/md5-cache/sys-block/tgt-1.0.73
@@ -4,10 +4,10 @@ DESCRIPTION=Linux SCSI target framework (tgt)
 EAPI=6
 HOMEPAGE=http://stgt.sourceforge.net
 IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets dev-libs/libaio sys-apps/sg3_utils
 SLOT=0
 SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.73 -> tgt-1.0.73.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=acb87ccf59d171ed16f6ba9cd8fe6f2d
+_md5_=afb2662951c837e11268630c7804d941
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 4d072c3972ab..96b7c9c0ee03 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-4.15_rc1 b/metadata/md5-cache/sys-fs/btrfs-progs-4.15
index 0ec77bdc482f..63f0f87ba4d1 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-4.15_rc1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-4.15
@@ -4,10 +4,11 @@ DESCRIPTION=Btrfs filesystem utilities
 EAPI=6
 HOMEPAGE=https://btrfs.wiki.kernel.org
 IUSE=+convert reiserfs static static-libs +zstd
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) zstd? ( app-arch/zstd:0= )
 RESTRICT=test
 SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.15-rc1.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.15.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=6ea741b371fc3c1ebf14d0d32c531a65
diff --git a/metadata/md5-cache/sys-fs/exfat-utils-1.2.8 b/metadata/md5-cache/sys-fs/exfat-utils-1.2.8
new file mode 100644
index 000000000000..faf5c9f45164
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/exfat-utils-1.2.8
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=exFAT filesystem utilities
+EAPI=6
+HOMEPAGE=https://github.com/relan/exfat
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://github.com/relan/exfat/releases/download/v1.2.8/exfat-utils-1.2.8.tar.gz
+_md5_=b7f92696e8cb20d853d24e365fc67bd8
diff --git a/metadata/md5-cache/sys-fs/fuse-exfat-1.2.8 b/metadata/md5-cache/sys-fs/fuse-exfat-1.2.8
new file mode 100644
index 000000000000..c8b1f0ba1212
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fuse-exfat-1.2.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=sys-fs/fuse:0 virtual/pkgconfig
+DESCRIPTION=exFAT filesystem FUSE module
+EAPI=6
+HOMEPAGE=https://github.com/relan/exfat
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=sys-fs/fuse:0
+SLOT=0
+SRC_URI=https://github.com/relan/exfat/releases/download/v1.2.8/fuse-exfat-1.2.8.tar.gz
+_md5_=4b5b153bf4a437ef53cc7f8f5d19050a
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index db1b4ed27944..ccfdd510fa14 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.17 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.17
new file mode 100644
index 000000000000..1cf95e3674fe
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.14.17
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-22.base.tar.xz mirror://gentoo/genpatches-4.14-22.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-22.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=881b0611bae13bc54f2c818d7ab2cfe6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.1
new file mode 100644
index 000000000000..cfec571d454d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.15 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.15.1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz mirror://gentoo/genpatches-4.15-2.base.tar.xz mirror://gentoo/genpatches-4.15-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-2.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=80d4f7d96806386060ce18c79ca2e303
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.115 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.115
new file mode 100644
index 000000000000..9183f1ebcc05
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.115
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.115
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-119.base.tar.xz mirror://gentoo/genpatches-4.4-119.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-119.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=8ad7f7278a37f8b3ed5e559f0bcb8d7c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.80 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.80
new file mode 100644
index 000000000000..843aa829109c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.80
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.80
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-83.base.tar.xz mirror://gentoo/genpatches-4.9-83.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-83.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=dc52dc90440aa503043662b633131ac9
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index e741beed9dc7..7812a72ca82f 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.2.2 b/metadata/md5-cache/sys-libs/freeipmi-1.2.2
deleted file mode 100644
index 153e23445424..000000000000
--- a/metadata/md5-cache/sys-libs/freeipmi-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libgcrypt:0 virtual/os-headers >=app-portage/elt-patches-20170422 !<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=Provides Remote-Console and System Management Software as per IPMI v1.5/2.0
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/freeipmi/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0
-SLOT=0
-SRC_URI=mirror://gnu/freeipmi/freeipmi-1.2.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=95e74a914ea755eade8c8e0c3875945a
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.4.3 b/metadata/md5-cache/sys-libs/freeipmi-1.4.3
deleted file mode 100644
index 0e2af69b37c1..000000000000
--- a/metadata/md5-cache/sys-libs/freeipmi-1.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libgcrypt:0 virtual/os-headers >=app-portage/elt-patches-20170422 !<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=Provides Remote-Console and System Management Software as per IPMI v1.5/2.0
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/freeipmi/
-IUSE=debug nagios
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0 nagios? ( || ( net-analyzer/icinga net-analyzer/nagios ) dev-lang/perl )
-SLOT=0
-SRC_URI=mirror://gnu/freeipmi/freeipmi-1.4.3.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1be6ad0c1b56470cca8f80a06eaacd83
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.4.8 b/metadata/md5-cache/sys-libs/freeipmi-1.4.8
index 8971f74042ad..2e82278a63ad 100644
--- a/metadata/md5-cache/sys-libs/freeipmi-1.4.8
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.4.8
@@ -4,10 +4,10 @@ DESCRIPTION=Provides Remote-Console and System Management Software as per IPMI v
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/freeipmi/
 IUSE=debug nagios
-KEYWORDS=~amd64 hppa ~x86
+KEYWORDS=amd64 hppa x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:0 nagios? ( || ( net-analyzer/icinga net-analyzer/nagios ) dev-lang/perl )
 SLOT=0
 SRC_URI=mirror://gnu/freeipmi/freeipmi-1.4.8.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e11cfbb5bc14d17a13797515099c00e9
+_md5_=6d71c730548c8479cb8ea63fbdaf1c48
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.6.1 b/metadata/md5-cache/sys-libs/freeipmi-1.6.1
new file mode 100644
index 000000000000..f8d93b3fff40
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install test
+DEPEND=dev-libs/libgcrypt:0 virtual/os-headers
+DESCRIPTION=Provides Remote-Console and System Management Software as per IPMI v1.5/2.0
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/freeipmi/
+IUSE=debug nagios
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:0 nagios? ( || ( net-analyzer/icinga net-analyzer/nagios ) dev-lang/perl )
+SLOT=0
+SRC_URI=mirror://gnu/freeipmi/freeipmi-1.6.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=5193037d18c0a8c08c61e31799f4efe1
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index a8d2fe0fe895..98e2f9dad5a7 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/parallel-20170822 b/metadata/md5-cache/sys-process/parallel-20170822
deleted file mode 100644
index 8e181fd1eb84..000000000000
--- a/metadata/md5-cache/sys-process/parallel-20170822
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/parallel/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-SLOT=0
-SRC_URI=mirror://gnu/parallel/parallel-20170822.tar.bz2
-_md5_=d90d6489817cb50f8de4b2216029db65
diff --git a/metadata/md5-cache/sys-process/parallel-20171022 b/metadata/md5-cache/sys-process/parallel-20171022
deleted file mode 100644
index 0ab209534884..000000000000
--- a/metadata/md5-cache/sys-process/parallel-20171022
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/parallel/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-SLOT=0
-SRC_URI=mirror://gnu/parallel/parallel-20171022.tar.bz2
-_md5_=218d2e29557fd1c18099e3e1d2906ace
diff --git a/metadata/md5-cache/sys-process/parallel-20171222 b/metadata/md5-cache/sys-process/parallel-20171222
index a99125315c8d..fbe1f0937411 100644
--- a/metadata/md5-cache/sys-process/parallel-20171222
+++ b/metadata/md5-cache/sys-process/parallel-20171222
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl
 DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/parallel/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20171222.tar.bz2
-_md5_=218d2e29557fd1c18099e3e1d2906ace
+_md5_=4f19bd728b2220436998f7b8de8452ec
diff --git a/metadata/md5-cache/sys-process/parallel-20171122 b/metadata/md5-cache/sys-process/parallel-20180122
index f2d74665c17d..3f5c0a41f19b 100644
--- a/metadata/md5-cache/sys-process/parallel-20171122
+++ b/metadata/md5-cache/sys-process/parallel-20180122
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
-SRC_URI=mirror://gnu/parallel/parallel-20171122.tar.bz2
-_md5_=218d2e29557fd1c18099e3e1d2906ace
+SRC_URI=mirror://gnu/parallel/parallel-20180122.tar.bz2
+_md5_=7e04a92f3119ed37eba7950f3b52021a
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index a60c1da67efd..1f427dd2526b 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/epiphany-3.22.7 b/metadata/md5-cache/www-client/epiphany-3.22.7
deleted file mode 100644
index 8b521a870de7..000000000000
--- a/metadata/md5-cache/www-client/epiphany-3.22.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-crypt/gcr-3.5.5:=[gtk] >=app-crypt/libsecret-0.14 >=app-text/iso-codes-0.35 >=dev-libs/glib-2.44.0:2[dbus] >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=net-dns/avahi-0.6.22[dbus] >=net-libs/webkit-gtk-2.14.2:4= >=net-libs/libsoup-2.48:2.4 >=x11-libs/gtk+-3.19.1:3 >=x11-libs/libnotify-0.5.1:= gnome-base/gnome-desktop:3= dev-db/sqlite:3 x11-libs/libX11 app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-apps/paxctl sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GNOME webbrowser based on Webkit
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Web
-IUSE=test test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=app-crypt/gcr-3.5.5:=[gtk] >=app-crypt/libsecret-0.14 >=app-text/iso-codes-0.35 >=dev-libs/glib-2.44.0:2[dbus] >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=net-dns/avahi-0.6.22[dbus] >=net-libs/webkit-gtk-2.14.2:4= >=net-libs/libsoup-2.48:2.4 >=x11-libs/gtk+-3.19.1:3 >=x11-libs/libnotify-0.5.1:= gnome-base/gnome-desktop:3= dev-db/sqlite:3 x11-libs/libX11 x11-themes/adwaita-icon-theme !www-client/epiphany-extensions
-SLOT=0
-SRC_URI=mirror://gnome/sources/epiphany/3.22/epiphany-3.22.7.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9fa832efd05462253d57da8d0c2e463
diff --git a/metadata/md5-cache/www-client/google-chrome-64.0.3282.119-r1 b/metadata/md5-cache/www-client/google-chrome-64.0.3282.140
index 3124526f1f36..7c5a020decae 100644
--- a/metadata/md5-cache/www-client/google-chrome-64.0.3282.119-r1
+++ b/metadata/md5-cache/www-client/google-chrome-64.0.3282.140
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_64.0.3282.119-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_64.0.3282.140-1_amd64.deb
 _eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=04f8808b0bcacf84b0f30489dbb2f7dd
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.119-r1 b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.140
index 9dff89d9d04b..74c32409e51e 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.119-r1
+++ b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.140
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.119-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.140-1_amd64.deb
 _eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=54fa6ff17ca56ea965a42d0dc632591f
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index d4c5fef68e9e..b907fb309d87 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.119 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.140
index a61fe70075d4..3a31d542a44b 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.119
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.140
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_64.0.3282.119-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_64.0.3282.140-1_amd64.deb
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
 _md5_=1d7d85b29380275bca17735b05c995a4
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.119_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.140_beta
index 468cff0c3c7d..fef17fd67fbf 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.119_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.140_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.119-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.140-1_amd64.deb
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
 _md5_=961944dc038e342d0f63b365c993ebb1
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 9bb10a6cc472..2796966c23fb 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.84 b/metadata/md5-cache/www-servers/tomcat-7.0.84
new file mode 100644
index 000000000000..8bdfa26453d4
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.84
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jdk:1.8 test? ( dev-java/ant-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=Tomcat Servlet-3.0/JSP-2.2 Container
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jre !<dev-java/tomcat-native-1.1.24 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=7
+SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.84/src/apache-tomcat-7.0.84-src.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=355a89abe85afdcdf942a4d45b87c69a
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.49 b/metadata/md5-cache/www-servers/tomcat-8.0.49
new file mode 100644
index 000000000000..c29b0d3df220
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.49
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.1 app-admin/pwgen >=virtual/jdk-1.7 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=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=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.1 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=8
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.49/src/apache-tomcat-8.0.49-src.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=cfd71f570161242677f629a33c800b8f
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.27 b/metadata/md5-cache/www-servers/tomcat-8.5.27
new file mode 100644
index 000000000000..b83527d4c6ab
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.27
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 app-admin/pwgen >=virtual/jdk-1.7 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=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=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.27/src/apache-tomcat-8.5.27-src.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=45b97e4ca7b430f4d1e0b70f71dd2f32
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 299f02cad553..fc6ba3109f90 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/cairo-1.14.12 b/metadata/md5-cache/x11-libs/cairo-1.14.12
index d945f3ef816a..1389200eb4c4 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.14.12
+++ b/metadata/md5-cache/x11-libs/cairo-1.14.12
@@ -4,7 +4,7 @@ DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=6
 HOMEPAGE=https://www.cairographics.org
 IUSE=X aqua debug gles2 +glib opengl static-libs +svg valgrind xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/binutils-libs:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pixman-0.32.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(-)?] gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 REQUIRED_USE=gles2? ( !opengl )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.cairographics.org/releases/cairo-1.14.12.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=09474b1482b0c8a2724e33762eade75d
+_md5_=43ea77d00471473f410ca8ff3630ae10
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
index 9a4ab21cc5a5..fdeae5dc9574 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
@@ -4,10 +4,10 @@ DESCRIPTION=Image loading library for GTK+
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
 IUSE=X debug +introspection jpeg jpeg2k tiff 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg: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(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.11.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7660206ac3736fd5222d3e9d86816740
+_md5_=0469966411e4c374b46d8f989f50ba40
diff --git a/metadata/md5-cache/x11-libs/vte-0.48.3 b/metadata/md5-cache/x11-libs/vte-0.48.3
deleted file mode 100644
index db3ce7a4080f..000000000000
--- a/metadata/md5-cache/x11-libs/vte-0.48.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40:2 >=dev-libs/libpcre2-10.21 >=x11-libs/gtk+-3.16:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= sys-libs/zlib crypt? ( >=net-libs/gnutls-3.2.7:0= ) glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) dev-util/gperf dev-libs/libxml2 >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Library providing a virtual terminal emulator widget
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Terminal/VTE
-IUSE=+crypt debug glade +introspection vala vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.40:2 >=dev-libs/libpcre2-10.21 >=x11-libs/gtk+-3.16:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= sys-libs/zlib crypt? ( >=net-libs/gnutls-3.2.7:0= ) glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !x11-libs/vte:2.90[glade]
-REQUIRED_USE=vala? ( introspection )
-SLOT=2.91
-SRC_URI=mirror://gnome/sources/vte/0.48/vte-0.48.3.tar.xz !vanilla? ( https://dev.gentoo.org/~leio/distfiles/vte-2.91-command-notify.patch.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2a0ee7a8b71b91129f890794ef393e0a
diff --git a/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1-r1 b/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1-r1
deleted file mode 100644
index c5e5039c56f5..000000000000
--- a/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-libs/expat odbc? ( dev-db/unixODBC ) sdl? ( media-libs/libsdl ) X? ( dev-libs/glib:2 media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0= x11-libs/gtk+:2 x11-libs/libSM x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] gnome? ( gnome-base/libgnomeprintui:2.2 ) gstreamer? ( gnome-base/gconf:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) opengl? ( virtual/opengl ) tiff? ( media-libs/tiff:0 ) ) aqua? ( x11-libs/gtk+:2[aqua=] virtual/jpeg:0= tiff? ( media-libs/tiff:0 ) ) virtual/pkgconfig opengl? ( virtual/glu ) X? ( x11-proto/xproto x11-proto/xineramaproto x11-proto/xf86vidmodeproto )
-DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
-EAPI=5
-HOMEPAGE=https://wxwidgets.org/
-IUSE=+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=wxWinLL-3 GPL-2 odbc? ( LGPL-2 ) doc? ( wxWinFDL-3 )
-PDEPEND=>=app-eselect/eselect-wxwidgets-0.7
-RDEPEND=dev-libs/expat odbc? ( dev-db/unixODBC ) sdl? ( media-libs/libsdl ) X? ( dev-libs/glib:2 media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0= x11-libs/gtk+:2 x11-libs/libSM x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] gnome? ( gnome-base/libgnomeprintui:2.2 ) gstreamer? ( gnome-base/gconf:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) opengl? ( virtual/opengl ) tiff? ( media-libs/tiff:0 ) ) aqua? ( x11-libs/gtk+:2[aqua=] virtual/jpeg:0= tiff? ( media-libs/tiff:0 ) )
-SLOT=2.8
-SRC_URI=mirror://sourceforge/wxpython/wxPython-src-2.8.12.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9038b93e0fa711c15a2c1b75033b1f49
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 79bb33f453fb..a40d7a724bc8 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.22.2 b/metadata/md5-cache/x11-terms/gnome-terminal-3.22.2
deleted file mode 100644
index 0b2040686062..000000000000
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.22.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.42:2[dbus] >=x11-libs/gtk+-3.20:3[X] >=x11-libs/vte-0.46.1:2.91 >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 ) app-text/yelp-tools dev-libs/libxml2 dev-util/gdbus-codegen >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The Gnome Terminal
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/
-IUSE=debug +gnome-shell +nautilus vanilla
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.42:2[dbus] >=x11-libs/gtk+-3.20:3[X] >=x11-libs/vte-0.46.1:2.91 >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-terminal/3.22/gnome-terminal-3.22.2.tar.xz !vanilla? ( https://dev.gentoo.org/~mgorny/dist/gnome-terminal-3.22.0-transparency.patch.xz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c10eaca5d07bfb06c0770744a3e92aad
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 6e34f8ebeb86..99c67fa33173 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.22.1 b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.22.1
deleted file mode 100644
index 8525b3f088c2..000000000000
--- a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.22.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-util/intltool-0.40.0 sys-devel/gettext >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A set of backgrounds packaged with the GNOME desktop
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-backgrounds
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=!<x11-themes/gnome-themes-standard-3.14
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-backgrounds/3.22/gnome-backgrounds-3.22.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bf28af965ffa96f56f86883c9e8e0139
diff --git a/metadata/md5-cache/x11-themes/zuki-themes-3.20 b/metadata/md5-cache/x11-themes/zuki-themes-3.20
deleted file mode 100644
index d30711253f8d..000000000000
--- a/metadata/md5-cache/x11-themes/zuki-themes-3.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Zuki themes for GTK, gnome-shell and more
-EAPI=6
-HOMEPAGE=http://gnome-look.org/content/show.php/Zukitwo?content=140562
-IUSE=gnome-shell mate xfce
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=x11-themes/gnome-themes-standard-3.6 >=x11-themes/gtk-engines-murrine-0.98.1.1 gnome-shell? ( media-fonts/roboto ) !<x11-themes/zukitwo-2016.08.08 !<x11-themes/zukitwo-shell-2016.08.08
-SLOT=0
-SRC_URI=https://github.com/lassekongo83/zuki-themes/archive/v3.20-1.tar.gz -> zuki-themes-3.20.tar.gz
-_md5_=89598c899583335b59daff9bcd9c5d80
diff --git a/metadata/md5-cache/x11-themes/zuki-themes-3.24.2 b/metadata/md5-cache/x11-themes/zuki-themes-3.24.2
deleted file mode 100644
index 9c4c386ba0a0..000000000000
--- a/metadata/md5-cache/x11-themes/zuki-themes-3.24.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Zuki themes for GTK, gnome-shell and more
-EAPI=6
-HOMEPAGE=http://gnome-look.org/content/show.php/Zukitwo?content=140562
-IUSE=gnome-shell mate xfce
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=x11-themes/gnome-themes-standard-3.6 >=x11-themes/gtk-engines-murrine-0.98.1.1 gnome-shell? ( media-fonts/roboto ) !<x11-themes/zukitwo-2016.08.08 !<x11-themes/zukitwo-shell-2016.08.08
-SLOT=0
-SRC_URI=https://github.com/lassekongo83/zuki-themes/archive/v3.24-2.tar.gz -> zuki-themes-3.24.2.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=82ed429c316f20041b7e3f0dddaa4637
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 77740c2d5b2e..2eb94820031b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 19210 BLAKE2B ef1f48dd093e1998551b0b59e75894e45eb7ca46c1a209056e180347c77c96964d5ad0ad9fb97af17a3dc4b5e22e7a68a01179290c2f353189c8e372de002ca6 SHA512 c6dea10b94a1651479a6ecf044fbeebd1514365c2d442a51f76fbb3537f37b434ac895c1042ca2d48fa1ef69ea3a2d992f9142e08c893c09c4c4157458ca9547
-TIMESTAMP 2018-02-03T07:38:15Z
+TIMESTAMP 2018-02-04T11:38:15Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlp1ZudfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlp28KhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBx5BAAs2aAFcE6nFy4yoqY6lIsvkl8OtMVRP6UsjcQvhwjiO2EP6hIrMJ+obMl
-7D+Fu/JKEquOTzQkFwxN1j6GU8C7UfF8XSO7bCr1BBORZDEFT+jWMHfDKBa3fAG8
-ts7VI+JNlyWYMvQMzN/YhO8b87N+ZHeiVP6pHg2NB9r+IopStGcyDA6P+Qy0Yyr/
-MxuqJI0PPNS4KrVJrUh6yDKe35HY9Vn8ysnka6GQ1Xxv3+49Y1C2MCESvB+x2+Mq
-L7gbbTtYZhHm6gHxdIUEdTKrbHa0G0qUhYUvjGFNrlnTnxpgkmjQ9kvkUXM+iEs8
-JolhaMMZ2zwLtkr8QVuMq0hwzlTUCo8SLXfx8oALq/2aBzjh5Jqzm/8SZAu6L8zr
-4N0tFsYCC74PpQrIm8L6l8IVPYXQbfGQjmMo5gqp4L1zNGOnS4yfP2r81MLGn3ST
-at42mQ2KcFXXhRnTwIskztNaLfRsEPm4F4LDstGxuTAyCySdgEqh69cync5GUWsS
-hCpA6cvjhZriih/Mngvz1Kmf0qIrdK7DG5c0twunDlrSkoUOYureUYRgzypyI+iZ
-ad+HcaC140BChgGyzxIiVDS5NEiGSgNg4yLE8uigwk/SU7lkv10I6ZD1td45LLCa
-jlRTzlphJ7rJMEXMutD/1+XVDSu35yh4GHJffs9YyYlztlGNWNA=
-=PxxZ
+klCUtg/9FzPanKexujzzMpTxkuGmAA1sMg28DfHDXz6fKQ6uf6KJh87ZZHTlTK8c
+BZ1faiT3Ugfzf+uNBa9XpXOpDOyZ7UdsoQoceUVjQJ/ERJ9LNjS2uSlIl6ZT93Nb
+f9A4ceLRt5nuAyNTJfRa4nFQQWRQ7OoYiosdrpazYOhAaVRGcOAzAMbVG1ofFAsg
+GtQ8oY5yAsCv/myQKL+XibcKB7VmUlRiOarPVHShH7h9NHYyXUPlnDbhNacL/PhT
+B8yQhMKbo+PLR1uwunVW+JeXesBjTfSA9C0fPARe4wtlIYJMLSIjyQzPnOBqHe6I
+P1KtnxoCU6uJChCx1vlhyyIVUakPiZLq7j+ZRXyeAtxNvBpkE2AEuqL5o9178+sn
+LYKZ7X+nLQqIbc9PzTAqrL9x0BkCQw4S/+F1DeVUXVJUC/f7hNeZEleGroP3j5EF
+h1xkm6WfeDW/nNfauBBX22oP7d1HyyJn7vYXgqV0/ERYipRYqyq24QVVY/ZlyetL
+J5jTneefmizTsHXjbn5Ep8N9xN5KvkvFcTELeDUv+yMp4oUKrHWYyCaERztUZGAs
+JyRqXCJXPYNlg1EstzQwwCvJwTVlwhJnevEenlCRguVPoRkvIr0XnEAU4xbqRAW3
+bOQp6F4UYYAQWS7+n3FCHyYsB4XfeH/cASxrV5UqkZWH5n1ZD/s=
+=csmr
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3dbedec1f4b4..328d4feb559a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Feb 2018 07:38:11 +0000
+Sun, 04 Feb 2018 11:38:12 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index f324b6513be9..3105428b5fbc 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -2732,11 +2732,6 @@ developers and volunteer mentors.</description>
       <role>Mutlilib liaison</role>
     </member>
     <member>
-      <email>ulm@gentoo.org</email>
-      <name>Ulrich Müller</name>
-      <role>PMS liaison</role>
-    </member>
-    <member>
       <email>vapier@gentoo.org</email>
       <name>Mike Frysinger</name>
       <role>Member, Sandbox developer, Documenter</role>
diff --git a/metadata/timestamp b/metadata/timestamp
index 360df99ec9ae..90bd48e16571 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Feb  3 07:38:11 UTC 2018
+Sun Feb  4 11:38:12 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d35afcb4592d..955a19a22bd9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Feb 2018 07:45:01 +0000
+Sun, 04 Feb 2018 11:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 21b1eb294a07..043f2873cdf0 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-392aea421136122a05d246b40f690b9945f550b8 1517629010 2018-02-03T03:36:50+00:00
+15e1a401aa171ceaa01c99e8cabf6e6fb6c211dd 1517741119 2018-02-04T10:45:19+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3e24d51f76a7..bc68b2e29992 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1517643301 Sat 03 Feb 2018 07:35:01 AM UTC
+1517744101 Sun 04 Feb 2018 11:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 3dbedec1f4b4..328d4feb559a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Feb 2018 07:38:11 +0000
+Sun, 04 Feb 2018 11:38:12 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 4fcf35319be2..6410844fe80a 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index 4d48352732e5..3bd6485f8668 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -2,7 +2,9 @@ AUX speedtest-cli-0.3.4-fix-unicode-py3.patch 1253 BLAKE2B ac3b81ddc8dacb457e57b
 DIST speedtest-cli-0.3.4.tar.gz 14452 BLAKE2B be95f51bca648c2e9a545f8e5f6b473777b5e43150c7ce12e23a73578f9662e15b68b89af2628015776aac5aea36bf808fc958490476c57770e8db6be86dcf78 SHA512 fb22ba9e17a30c172b8f751020d7117caf8b573dee112506917f24c5173e2901e0f0198b4946798daf3a27839519025f4a7f8f8942034bc19356b32d6a0f6851
 DIST speedtest-cli-1.0.1.tar.gz 20114 BLAKE2B 539df6569b33a77232f30c4d59f16dab887f462c3a8ab3d1e2175202473beb743315b2f8ae3bf42fddbc2ca9f70dcfcba76d771fd2c1854a1d8dda0aa003fa72 SHA512 f6e78945f47779dfdadc0328468f3fb20999a011da3c832cca58a4703c083f9d73ea3bd06bc85aba5cce5b63db70a6d3b496ef1037ca377e7699a6cd1e42ed24
 DIST speedtest-cli-1.0.2.tar.gz 20251 BLAKE2B 0fe3efcedee5de207bb102a999d6bdf227a3a2e9512b5a4c48fcca26836cce825bb8cdb6c617be166eb58dd9fffd80f8e1fb7ecec54259f7228936e826055927 SHA512 aa2dad2d9c1246af332c63437be171c0c0d138f16604d246f9f5b8b36b456fbb02376b166c75491211369d6b61220be7669f0b0487235f74dc2db95014e8d349
+DIST speedtest-cli-1.0.7.tar.gz 21077 BLAKE2B 8bbb9b73f21f9252763461230053bac5d890d19d3f80a81f616bb4535c5e386b70b43c6ee0688ca813fab21f8387fd93df65b1b0254613efbdec93b1807d3caa SHA512 c06c0e80ec00adebc04fb2bdab5b45ec84a32d9dbf2e4fbe7b0461f4b3b1fdcf29048b8c7a906c03dcea0771417317394243bdc6f1bc8fb763e13eafae31a42b
 EBUILD speedtest-cli-0.3.4-r1.ebuild 699 BLAKE2B 6cb165c21660fbe6380ad7e7a173d60cf14a247e75e91d5fe9726eeb12cd24b78497d8a574780d874b040770f75aca301caee66954266dfdec9ac266a6dfab61 SHA512 7e551453dd1db6ca4ff3497c2f123c2798329f692a983d05b7c16bcf44e27ddae7743f01e791bba743149c389570e11f534cc5a582db5ac495aa8e05647c20d6
 EBUILD speedtest-cli-1.0.1.ebuild 660 BLAKE2B e7edbdddc005fc76c6f3a8dda9fb4b0255d45a1af8733383b500269b292af1e8a1e856f5ac1d48cf94aeef2a684ef1e46eaaf62ecb12433c50ac49588fe594ea SHA512 fde1118057c3d36b660ade21cb0821b62c4a39d7d797a206f76ae096f7c7ab093e62c1779a97a93d7725682baf11dff3ec698844297597227c511721faf75237
 EBUILD speedtest-cli-1.0.2.ebuild 660 BLAKE2B e7edbdddc005fc76c6f3a8dda9fb4b0255d45a1af8733383b500269b292af1e8a1e856f5ac1d48cf94aeef2a684ef1e46eaaf62ecb12433c50ac49588fe594ea SHA512 fde1118057c3d36b660ade21cb0821b62c4a39d7d797a206f76ae096f7c7ab093e62c1779a97a93d7725682baf11dff3ec698844297597227c511721faf75237
+EBUILD speedtest-cli-1.0.7.ebuild 664 BLAKE2B e7a99e1d91e1de89eabfe8b481835c822973e9161da4bde276044088bb430b07f5d880fa86c4c4f20b1b940e504534660c54217325d830d322a851243914080a SHA512 70f27e8f337e173384c973b0c574d45942b9b5c39602c687a0df6a32693729cb36ef2c3bcb016e173b2e97c4ecbc2f24c9d3706d4cb5b3bf9e81a85f861c70b0
 MISC metadata.xml 460 BLAKE2B 488a43d888cbc4baa7d74bcf4b8852054037be8227f380d43f187baba239e253c2a0aa3ce1d8c2c672a4947be9e4268a2d1fa8adbb3db38fee9e2334851bc7eb SHA512 6e911380a7bc75a4f5726f4bb8f864a2660e93cb07be2cdf55b428fe8615e9e31c7a78f978064ed73fdc1133d6611b3bc3a39966439bb249e4f8a69dbae88f1c
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild
new file mode 100644
index 000000000000..0bf6c921ff5b
--- /dev/null
+++ b/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
+HOMEPAGE="https://github.com/sivel/speedtest-cli"
+SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=( CONTRIBUTING.md README.rst )
+
+python_install_all() {
+	doman ${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index a0beb2d4e5a8..9edbc0027632 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 657f2393005e..ba3e16f31370 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -11,10 +11,10 @@ AUX systemd/iptables-restore.service 394 BLAKE2B a1f0f75a20f55b13d6ed658b6028f6d
 AUX systemd/iptables-store.service 240 BLAKE2B 7ddb4425e63cd41f421767fab25a7b055087fddde5927291b3fce6e0e978f0cb3b734bcacf02f78257eec99274056b69058436a847dcb366f5fb70032e410355 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e
 AUX systemd/iptables.service 130 BLAKE2B 1b4881253eae9fd24c831931e5836efc3d3bb6f7ebb1762ca5aabb31813e3298e02d66d557efa73e6f252bf3f67898a2b646c863879dd993a613796b4c057019 SHA512 87114ccc7eb079d1ed43d77be35cf4c91702ca960883a4bbca5dfcf74aa6f086e44f4a4251441ac3a277c93eb10e7482157caf2d62bbf2a7f5327947ede25bef
 DIST iptables-1.4.21.tar.bz2 547439 BLAKE2B e30f25581a118b91781dcc02761d4c8c420fb19876ec9e8ade3aff22b574931065f9a1c1ec31983a444c406dd928c47673d02698553da85c3db4f31484b1597d SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b
-DIST iptables-1.6.0.tar.bz2 608288 BLAKE2B 4272860f434b4c6951d9ea32219e96c6907e4bcafaf0429d671d109b73b52aead4f17577f0a148a87e51b33708ca8c9b48ab6d11321e2baf138c0e6bdd636c78 SHA512 60360910db76e3265fb7b6456a55b91708263bde9c4e5b9cadf3832d2e2a9db3e6cb60c82e278ea0672618bd5c9566c374e00d19d35a2e8f330116c3ab6aaf51
 DIST iptables-1.6.1.tar.bz2 620890 BLAKE2B b45ac26e1fb7e8b17a6df0afab3b6c0e2f0a5df9191367548136b3ce9aadc1bcb875b8bc0403e6f12fcf487054e96418f4ef34da827af8989fd4dcf83cd3cd8d SHA512 12280db6e6ef8e68da2537e9da59fc601790fd02b1ba38a37c90dbb56272018329dccb8be995f96ecd5d94fafa6043204f3e8f8ee96531685d9e3c55359d2ee8
+DIST iptables-1.6.2.tar.bz2 639785 BLAKE2B 3d129756fd33c8c73d56d57e3c5595896db86ded14834a45db21b964d82840b62216ce3cea4ae4960e8c5f0671df3cc6bfb222f68d29cf3a8c99e0eee14bf017 SHA512 04f22e969c794246b9aa28055b202638081cfb0bb4a5625c049a30c48ac84cdd41db12a53c5831398cfe47c8f5691aa02b30b0ae3b5afe0f20ec48cf86a799c0
 EBUILD iptables-1.4.21-r1.ebuild 2440 BLAKE2B 2461853963f0ea8a513b3a5a461cf6e442c43d89bfec47e65589e6dd37dbf8120789840cc97ca27cb285d16857acd400fa3f9b04cf30502d56b194d8f4ce22df SHA512 b8cc233407d3cdec4ac916c61f7dcacd0ab23ca344205d48be9ab1a6be52275e595c1a64ba48b0e2e122d6ad762b8ae73883cb3c98c646e0d2ec233a8ccc8155
 EBUILD iptables-1.4.21-r4.ebuild 2973 BLAKE2B 8ff2eb8f918305868dc7cba0b513f6b52b993458c41e5870be29e5940cad400d5f4b6aae333859ed1505b8db7ded733ba2179b5473038ad2da10a7949d83ab27 SHA512 a8ac1de33f16d4d5b2b21aa145ec33a05dae62ba045d269a84e5f58539900d23d39b9a923dab9a1b61514009a263ecacb50563eeb0b6e4e1b3ba673d76fb0594
-EBUILD iptables-1.6.0-r1.ebuild 3097 BLAKE2B eda1a758c28636ea541c775e8998fcadb054c985c998fdce425de4cfbc14c29d6adea7a8bdf243285ca8ff8fe2e8fb4130064569476be378fff676fb55fed03b SHA512 8c30729a0c00a78a53960034748016717210c977fca971efbb68fb5c188c4ba9fbcffb4c0c84396ccfcb0f0045c8ece8f2b7e213d61c05b6cd5b8701cfbbfbdc
 EBUILD iptables-1.6.1-r2.ebuild 3106 BLAKE2B d274cdef11246ea65582f7e6d3a8ee93528f95e268b621e3210bc48ebefb58dbbfe8d3b408c92a78fb9bcfbc58de915f69494951ccd5b3326168af273cee5028 SHA512 bc2a83e6c80c4a200a1fcba808fec62f9985a67a08a3293dd70554fbd0652aca6c63b624b89eac7f75735ae81d8152c3b5dad621a7e39588c5a3ef6ee66e9bfb
+EBUILD iptables-1.6.2.ebuild 3136 BLAKE2B dbe3dcb2b92c8130e3b51e97b9ed59058db61efa7530206a2cc83c40ab2d10abcc1132a06f9a1e1b3cece9cf9c323d92462132673f90bdb9b188c3c5e4622c65 SHA512 cc88a0e1e271049f21422fc65410be25a39ef6d0dc986f97d71dbf2de33703ba225f8a3fafa3199144278f4475d47086c0062228d9ab68ba2aa4b6ce789e141c
 MISC metadata.xml 1465 BLAKE2B c60f98672fb6153499b700a436b26b63c0f271c8f8519a3391e486b761ba673c362a7dc5e23b86e3af887270596a1682ea993e643a08215f670f7e3804f095bd SHA512 26bf7e3008dfd705995b15eccaaaa8c79fd488be191570a874b76571a2f9d4648a7c19eb576399ca7bbe849336d7d193f5b6b58a3ff83f87f3c157c53333e987
diff --git a/net-firewall/iptables/iptables-1.6.0-r1.ebuild b/net-firewall/iptables/iptables-1.6.2.ebuild
index 11aff3774610..b6c9ab99f6ba 100644
--- a/net-firewall/iptables/iptables-1.6.0-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.6.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 # Force users doing their own patches to install their own tools
 AUTOTOOLS_AUTO_DEPEND=no
 
-inherit eutils multilib systemd toolchain-funcs autotools flag-o-matic
+inherit ltprune multilib systemd toolchain-funcs autotools flag-o-matic
 
 DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
 HOMEPAGE="http://www.netfilter.org/projects/iptables/"
@@ -15,16 +15,16 @@ SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Subslot tracks libxtables as that's the one other packages generally link
 # against and iptables changes.  Will have to revisit if other sonames change.
-SLOT="0/11"
+SLOT="0/12"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="conntrack ipv6 netlink nftables pcap static-libs"
 
 RDEPEND="
-	conntrack? ( net-libs/libnetfilter_conntrack )
+	conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
 	netlink? ( net-libs/libnfnetlink )
 	nftables? (
-		>=net-libs/libmnl-1.0
-		>=net-libs/libnftnl-1.0.5
+		>=net-libs/libmnl-1.0:0=
+		>=net-libs/libnftnl-1.0.5:0=
 	)
 	pcap? ( net-libs/libpcap )
 "
@@ -42,7 +42,7 @@ src_prepare() {
 	rm -f include/linux/{kernel,types}.h
 
 	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
+	eapply_user && eautoreconf || elibtoolize
 }
 
 src_configure() {
@@ -57,16 +57,18 @@ src_configure() {
 		-e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
 		configure || die
 
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-shared \
-		$(use_enable nftables) \
-		$(use_enable pcap bpf-compiler) \
-		$(use_enable pcap nfsynproxy) \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		--sbindir="${EPREFIX}/sbin"
+		--libexecdir="${EPREFIX}/$(get_libdir)"
+		--enable-devel
+		--enable-shared
+		$(use_enable nftables)
+		$(use_enable pcap bpf-compiler)
+		$(use_enable pcap nfsynproxy)
+		$(use_enable static-libs static)
 		$(use_enable ipv6)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 4acf6f2703b9..313857f57452 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -3,7 +3,9 @@ AUX nftables.confd 655 BLAKE2B 5512be1edd43e270941de3d9b66fda69e4afd7c7e6e970b23
 AUX nftables.init 3069 BLAKE2B 68c6b2b81995bd909c00cc3527f891f04d0dd30532cd821c89b59fc7e3ea0dff0e98d767cee2c00a5462023fdf6f59e813dec7063768a34187f2404377e498f7 SHA512 ca761be0440945b21d5b002468baffb3299d0a3ac244aa895734dfdfaf442e7a73b757bcda99d958582064411d1b80b2cbcb4eb532bb219b4df407c9ed892661
 AUX systemd/nftables-restore.service 394 BLAKE2B 1c1f358eb2eff789e68c051098c971f11a8df6621c3c919e30a1ec1213f6db822c390609c01827fe9fc75c540effa3e3a7b6f93bd24e16ea19841bbfaab796ed SHA512 18da6a770bb3e94fd6b2c9e6f033450aaff9fe886c8846f780d08a21e2fc884ac078652743b50b3d4ea8c9500f92d272bdd27e2881e438c2b223d40816c100a0
 DIST nftables-0.8.1.tar.gz 329098 BLAKE2B d6e5803e146ed5883761d620ef1549e883a2947b495a9b1ff2a40c70794ab5125596e0802fb60bff6d1a21e666c94338b92a22ef3c4c1b66e0b4521cd3dfb78d SHA512 5cae3a411f24adc17786b45d4ed8256eb44fd90f044f7f5d7ddebb1875d0317197e13128d9b22115cd7fcdfa21dba3c539de325ecedce707f8766c93e03efc75
+DIST nftables-0.8.2.tar.gz 332736 BLAKE2B 9730735a7112a80e257ee2dc4f7f957b6d62964d5bbf85bbed8d375e07ef86021f21f027e889b913bc5862ccda57942a4411fda7e642c949d1fbf37e640e5b5a SHA512 cc97937014c65bb2489759ac2f603d354be8d3b60f6e0f0f8c2598dc59a66d8701f426c9f91bc4b17d0f574832835ffc38de054a554bda02e09c617fd2a8129b
 DIST nftables-0.8.tar.gz 327629 BLAKE2B a484c22ac010f68fc7458c12cabd0c35e474a0bf81fa4edbefba12d75b424898d38adb11a7fbb4542efbbb2d14be823701b3d9ced7b9fd669338366733fa169b SHA512 90ffebc338c121334ca42822793b6fdeff48390e755c690308919de47064b53f9af735a2c2914e5255f1bddec90484599337d4cdd67f7a01a3956deefcef9fcb
 EBUILD nftables-0.8-r3.ebuild 1959 BLAKE2B a029fd4444f5aeddedfbdcb3659f879c4a8f6246c25042449cb5ffa7809401a7ef512275dc1f45c50b51bc2807b3679d1c386bcb2470522ba1a338dc728bdb15 SHA512 6bd510183e9d1cec3fa05970adccf28ac21c7ad839f3a6236ee584d1308c48988ee2b006630ecd558954cb80a7a8faf6e78ab9b06b29df4b2a69161a9e848c71
 EBUILD nftables-0.8.1.ebuild 1963 BLAKE2B 338d254fcee930198bc5aa570ba0fd407e4a6e8d03c57c58de26da89077153b476dd5441e578a2f90115935c24385177d5a0787ee0225f375d3095f1991fde7f SHA512 db701128d4066a419164e3e9b26fb2442dffa5a93b69ecd2285cfd21a712da06e4763f80d43208be367bdac18d9914d60eb7d4420be91eff5acbf7a54d53fbe9
+EBUILD nftables-0.8.2.ebuild 1963 BLAKE2B 338d254fcee930198bc5aa570ba0fd407e4a6e8d03c57c58de26da89077153b476dd5441e578a2f90115935c24385177d5a0787ee0225f375d3095f1991fde7f SHA512 db701128d4066a419164e3e9b26fb2442dffa5a93b69ecd2285cfd21a712da06e4763f80d43208be367bdac18d9914d60eb7d4420be91eff5acbf7a54d53fbe9
 MISC metadata.xml 372 BLAKE2B c1733809892af8497a3a0340d5877ec99b856083c8e16804f2129779e8065c1bd8b93f10b4c37c25e089ca474be5e18eb4344ce4e83c95c646fb9252f1451d0d SHA512 13f7b219a6a043a047b4be99f69cadf76b2a0c20800c1622f08dc9626ebc1115db79a3866fb19c1c00a98b66a692b42d42c2c3e66da654ff83e44d193da8a511
diff --git a/net-firewall/nftables/nftables-0.8.2.ebuild b/net-firewall/nftables/nftables-0.8.2.ebuild
new file mode 100644
index 000000000000..a38042ed9a69
--- /dev/null
+++ b/net-firewall/nftables/nftables-0.8.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+IUSE="debug doc +gmp +readline"
+
+RDEPEND=">=net-libs/libmnl-1.0.3:0=
+	gmp? ( dev-libs/gmp:0= )
+	readline? ( sys-libs/readline:0= )
+	>=net-libs/libnftnl-1.0.9:0="
+
+DEPEND="${RDEPEND}
+	>=app-text/docbook2X-0.8.8-r4
+	doc? ( >=app-text/dblatex-0.3.7 )
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+
+S="${WORKDIR}/v${PV}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable doc pdf-doc)
+		$(use_enable debug)
+		$(use_with readline cli)
+		$(use_with !gmp mini_gmp)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dodir /usr/libexec/${PN}
+	exeinto /usr/libexec/${PN}
+	doexe "${FILESDIR}"/libexec/${PN}.sh
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	keepdir /var/lib/nftables
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
+	systemd_enable_service basic.target ${PN}-restore.service
+}
+
+pkg_postinst() {
+	local save_file
+	save_file="${EROOT%/}/var/lib/nftables/rules-save"
+
+	# In order for the nftables-restore systemd service to start
+	# the save_file must exist.
+	if [[ ! -f ${save_file} ]]; then
+		touch ${save_file}
+	fi
+
+	elog "If you are creating firewall rules before the next system restart "
+	elog "the nftables-restore service must be manually started in order to "
+	elog "save those rules on shutdown."
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index b808410d7325..c3bb2234a285 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/s3ql/Manifest b/net-fs/s3ql/Manifest
index d33d09299817..ed046fa76be0 100644
--- a/net-fs/s3ql/Manifest
+++ b/net-fs/s3ql/Manifest
@@ -1,23 +1,3 @@
-AUX s3ql-2.14-ceph.patch 3323 BLAKE2B d99fee824b6dc06053b634f589bcd58857574036f7ef7c5c4a581f8f541435439c3a01ebb8095c7d19f1e28359739b570dd0263c0150670474f3fac3beda2880 SHA512 cead3e2ab677d25a892ba834a0f18162843849f623fbb9be67798059518b7984aa3abecd5572371a188fb6e00534c6d6006147b0f98c32025567f794510f5b37
-DIST s3ql-1.19.tar.bz2 641689 BLAKE2B d9b878b79d60a02de652898e080bdeed8df09d6d3414e51030b09f941044ec00bc7819085370398f054baf78f834cc103e0a77cabab379ecf0ef55f105f6bc7c SHA512 5751f4d21abdc3996d877785bb07752fca75ec60ad716a102f666b5329e9b225519c4365c93031e056db78e3bffc80a7a1afe227c375e1c19e35b8bdffe5a0bf
-DIST s3ql-2.11.1.tar.bz2 897259 BLAKE2B 58aa0a166084d209a553f21a05dc6aa1e896ebd85f36e49dcb4580ad44f15b3ddf87ff2459a4fdf301955abaf277a118803aa154d78304378815c3606e918818 SHA512 72e873f0d23dd86ca5f7a65809189225feff0f6f14bb046dcc8117f3eb725c3327408fe504ffd80566d70bad620b5f5c34174784f1d318bf1f7e6abf4edcb1a7
-DIST s3ql-2.11.tar.bz2 867710 BLAKE2B 2a0db6ac704691ed909ceb952dfd1d2dd6609b7d0cc8160deae2a3947717811b3dac9096ec0b5970d0c978b20d7cf9f27ed6c2803698d8b0c3498c8ba8dd3c57 SHA512 86f3cb3294f38ab25ddf593dae2ea36af6d4df8871e15b3c99bddd7c8c5c038ab5cd0adaf067afb508dd3f7e163e8b86ab7994f2401cf33543cdeb43bc9fdb9d
-DIST s3ql-2.12.tar.bz2 906837 BLAKE2B af86076647918a85d07536a34c0a045e2d77e1bcedc5a1b79009870dfcc21e2d23a0b8d962c4ce8c9c877013465f20d30db0500002d7bd098e2036fb8d427a11 SHA512 51c90a983a6b076fd70468406e6a1c74592b85458068bc07325d43b75d1ca50fb80694fcab83e6c41a1e3ac8209a203716624971be1cecc9cad75a8f3f4761d9
-DIST s3ql-2.14.tar.bz2 907415 BLAKE2B 72648f2f28981cf585e6b978197b92f4ae3843561f205ff4639db15a64777989434786d26a0a39ca2fdf42fec1875767e944821be53a7843b03c92c1eb7e432f SHA512 8ada75934e438928bca03f59fc6b08f013887dfc926bfe1069108cf9172c1fbf20229db4c6248022b9af1e7f52ec9cf1ab536acddcc8993ca55f59a7be43c218
-DIST s3ql-2.17.1.tar.bz2 957313 BLAKE2B 1849cabd1cf0d88c6ee9474b67d5294cfb83cbf3847be45316c2ffe4732548d01592044086a1a44e07a8eb25ad0fae5e075875d650ac7159c7de262a7c471218 SHA512 dd2c16dd30c0f103e0cdd42329b2cf242dad7edf2aed773746a8e00cbfd3e4735174293347fa68bceacb2a8379099356b32b2c35e9f1c2524740e92929185611
-DIST s3ql-2.20.tar.bz2 726268 BLAKE2B 5751b7c8c68ca52fc98f1929fc50fc1967005fe80c61046950f62d86301a0e6e602cef6bf4c692bbfb55c10e6f6f95eb73ff73b8396e26f512c234344e2171f3 SHA512 a5a25a7b02c3d7bf5f87ad0130d24b8e0b95f20a269d74b35edeaec1a47011e30a3d1416c3d8332075be82dc09733321da8e7e4200893d893f37d1e4970cf7fb
-DIST s3ql-2.21.tar.bz2 726450 BLAKE2B 74d70d687e1b67f5b758c04cc8b4073575c04871908b6c5b9f259c0146c5829777867e45d4eaa2cb8be97fb5dc74faee6c0ed4db769068817d78ecefd62b948f SHA512 2aa5324d529feb73d9c562f42d5bcb49e4c605315e032924bec8005ee6cba24b8bd100a8ca6ab559dde4e7d4b25db9458b49bd8421bfeb74609ce32a6cdf7055
-DIST s3ql-2.23.tar.bz2 770488 BLAKE2B 44d7b0e67397db187932f7561bbaffab6e1a579919ff5024de2272d5a0c484213d6aa6a6727e74a98eac49e506e50bdec70e60ab413cf97004588fba508c7a88 SHA512 99863394002c5f941e1e8dabce606703a20a2614e316484c9d5b3de774ff2864284911283573dcebbcd10c4a3aefc1a3c12f1ae511af3f0c42be88ba8f6f1f7d
 DIST s3ql-2.24.tar.bz2 773766 BLAKE2B e780bc7d3376241d9b04ba0b09b064050f1ecaf22a44eac6e793ac4a01cc0ae7c44f1c40d39cc2984bb62f52dac9b55be22cfc63309dc4af4a1f93784303865f SHA512 20f32fcde425e2e5f07f1b52a5399bc6c1aaf8d6ad866e3496f7608a590f6a9bfa2ccf7c0ee18be7e8d6e374d1a2679ae72c5438775ca3b0b0c214735d26c9dc
-EBUILD s3ql-1.19.ebuild 1350 BLAKE2B 55bfdd48ca5431695d9403965a38af1c875e3ab044ab49c092a97e251362cff7ab178efa5a43712227704951530e4bbe02b3f429de4b14c1fb511691b82cd74c SHA512 5be50b779d5ead6da27f1a4f268dc97436e2cbabc16e3623d382200a1d8dff80a4d2640c58e33951757b66f27af8d5c15c228b1727ea8eb5d49e4e60c86d9462
-EBUILD s3ql-2.11.1.ebuild 1255 BLAKE2B 3beb91abb759f4bda60a9fe9a857ff18704b088b3070d172c0bcd2fe5ef7bef6d5e19b15f898fe7a2d7ae74c9fcb3ac468761c6edcf4a936746af75d53bd9728 SHA512 0075b0089fe1a778ba2d4d77f5c1ad9c69100c5dbad81ce7481e15f5bd00e6aad739a98bbb3ad123eb1ec30ac9c3c73b087d797d4753706c6aa9f798509e8d8d
-EBUILD s3ql-2.11.ebuild 1255 BLAKE2B 3beb91abb759f4bda60a9fe9a857ff18704b088b3070d172c0bcd2fe5ef7bef6d5e19b15f898fe7a2d7ae74c9fcb3ac468761c6edcf4a936746af75d53bd9728 SHA512 0075b0089fe1a778ba2d4d77f5c1ad9c69100c5dbad81ce7481e15f5bd00e6aad739a98bbb3ad123eb1ec30ac9c3c73b087d797d4753706c6aa9f798509e8d8d
-EBUILD s3ql-2.12.ebuild 1255 BLAKE2B 3beb91abb759f4bda60a9fe9a857ff18704b088b3070d172c0bcd2fe5ef7bef6d5e19b15f898fe7a2d7ae74c9fcb3ac468761c6edcf4a936746af75d53bd9728 SHA512 0075b0089fe1a778ba2d4d77f5c1ad9c69100c5dbad81ce7481e15f5bd00e6aad739a98bbb3ad123eb1ec30ac9c3c73b087d797d4753706c6aa9f798509e8d8d
-EBUILD s3ql-2.14-r1.ebuild 1317 BLAKE2B 794d7d98bb3044c6f1c1b5831edc119be74cf135460cb8cd291f875a8b2977846b097999d5e0838e532d60ad4059bb04e5a12445753984837e89fcc313fc2da6 SHA512 c15832c2e13a945f06e59521b294a1c101daf3a4b9db1d95f6c915e19384a13525685fc4ac2394d0c157fae7521b5bb9a123da7ca74450fee9d67e55fe4a002a
-EBUILD s3ql-2.14.ebuild 1255 BLAKE2B 1a591b13fbbb7a1f1f53ff962e777e95e81d8f8c54f9228b8540211cedff201ab06887ecf9a3fdd4440e3535415512e2957ef350623034174ba4d1b5322a173f SHA512 4cb03ba91c19233ea7bccf93c489f0aa047946ec714b6709a6ef99bbcedff242abf27dc0619e217e1168bf2aed0131e6eff4bdc43ee0083decae79918f2f82fd
-EBUILD s3ql-2.17.1.ebuild 1258 BLAKE2B 468b6b10d1a5ddaae654012ed393e075258d490b1ff11b95edbc6eee73e8dbeff5faee24c67ffd2debf719c2fba986b78336a4015372491e0b210a96b4a71406 SHA512 4f6f6cbba1c77e225ee2cc188b91e6ef2a2b342ac716b8ce436fd6fcfbff1b323733a622d49fdf8edef2ba03923566f60f0067d79e668d7e3d162ca3827da2cb
-EBUILD s3ql-2.20.ebuild 1255 BLAKE2B 99a7aa1e6341aab307aee961572d5a0da3f0bd67e15eb1223bf8cc8e4c1dec3a6f0c101c10430c30cbe14f33acb0ecd4a85f14b9fcf2a126227dd0703ae1c02a SHA512 ba52467b66905b9bf3b0792b3a85a3a1bf64738d53ac989bf4b32d68051cfdd6a478f1f136b54e29db07433ca6a4036d795049aa6e47287f7cde578cc3f4607f
-EBUILD s3ql-2.21.ebuild 1257 BLAKE2B eaa53d39e6684f98b44c51a2228eb671be5171d7381b7bdecb5bb68a0a1d38ab9a5642b7fbf109eadf4887543a29eb1fd1404ede193501e6e8959cef87b4f4d6 SHA512 f136079f7cb351cd9bee25f9d78023e187c03dc696664fd66c13af27e33a65815d74744c23163638da7ccbe603621f99acd875dd3e75f32b0f07f0048600c2dc
-EBUILD s3ql-2.23.ebuild 1257 BLAKE2B eaa53d39e6684f98b44c51a2228eb671be5171d7381b7bdecb5bb68a0a1d38ab9a5642b7fbf109eadf4887543a29eb1fd1404ede193501e6e8959cef87b4f4d6 SHA512 f136079f7cb351cd9bee25f9d78023e187c03dc696664fd66c13af27e33a65815d74744c23163638da7ccbe603621f99acd875dd3e75f32b0f07f0048600c2dc
 EBUILD s3ql-2.24.ebuild 1259 BLAKE2B 70fcff067f9dd5ecb42d8ee4487017ad17151407dbf88c78c0e18233955e9efefe1b414f94a2fdb256d7064a3f1ae11d8c64c0ae494c8cdfbb9411988f6b82d3 SHA512 56629a8387e72e4b345f57174f1ad722c012b86655f0e4a6fead7dfc800430859f84799dd6de28e2035d280abd18d6fd58fe41887ca83af9eaf20bfb907d89cb
 MISC metadata.xml 463 BLAKE2B e1b6d823fd6696f0c18592981f399b884e4aa2987cfebbf4c3f071d815d3d3260fbf4b1e68a8de80ce8135a8f593ed3fd40bbcbf8387cbf9658c2f0a9334e073 SHA512 7021866874fac865898c724916b0b455f3416351aba40ce8eeef55436e93c8616786be656101bcc693ec0762626e60b44814f9dba788ff5e17b2b22f3daf5f88
diff --git a/net-fs/s3ql/files/s3ql-2.14-ceph.patch b/net-fs/s3ql/files/s3ql-2.14-ceph.patch
deleted file mode 100644
index f5b4c3b123e5..000000000000
--- a/net-fs/s3ql/files/s3ql-2.14-ceph.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://bitbucket.org/nikratio/s3ql/issues/190/sq3l-should-not-rely-on-xmlns-declarations
-https://bitbucket.org/nikratio/s3ql/pull-requests/5/s3c-be-more-lenient-about-xml-namespaces
-
---- s3ql-2.14/src/s3ql/backends/s3c.py	2015-07-20 19:41:07.000000000 -0700
-+++ s3ql-2.14/src/s3ql/backends/s3c.py	2016-01-21 22:41:33.000000000 -0800
-@@ -126,6 +126,15 @@
-         conn.timeout = int(self.options.get('tcp-timeout', 20))
-         return conn
- 
-+    @staticmethod
-+    def _tag_xmlns_uri(elem):
-+        '''Extract the XML namespace (xmlns) URI from an element'''
-+        if elem.tag[0] == '{':
-+            uri, ignore, tag = elem.tag[1:].partition("}")
-+        else:
-+            uri = None
-+        return uri
-+
-     # This method is also used implicitly for the retry handling of
-     # `gs.Backend._get_access_token`. When modifying this method, do not forget
-     # to check if this makes it unsuitable for use by `_get_access_token` (in
-@@ -215,7 +224,6 @@
-         keys_remaining = True
-         marker = self.prefix + start_after
-         prefix = self.prefix + prefix
--        ns_p = self.xml_ns_prefix
- 
-         while keys_remaining:
-             log.debug('requesting with marker=%s', marker)
-@@ -232,16 +240,27 @@
-             try:
-                 itree = iter(ElementTree.iterparse(self.conn, events=("start", "end")))
-                 (event, root) = next(itree)
-+                
-+                root_xmlns_uri = self._tag_xmlns_uri(root)
-+                if root_xmlns_uri is None:
-+                    root_xmlns_prefix = ''
-+                else:
-+                    # Validate the XML namespace
-+                    root_xmlns_prefix = '{%s}' % (root_xmlns_uri, )
-+                    if root_xmlns_prefix != self.xml_ns_prefix:
-+                        log.error('Unexpected server reply to list operation:\n%s',
-+                                  self._dump_response(resp, body=None))
-+                        raise RuntimeError('List response has %s as root tag, unknown namespace' % root.tag)
- 
-                 for (event, el) in itree:
-                     if event != 'end':
-                         continue
- 
--                    if el.tag == ns_p + 'IsTruncated':
-+                    if el.tag == root_xmlns_prefix + 'IsTruncated':
-                         keys_remaining = (el.text == 'true')
- 
--                    elif el.tag == ns_p + 'Contents':
--                        marker = el.findtext(ns_p + 'Key')
-+                    elif el.tag == root_xmlns_prefix + 'Contents':
-+                        marker = el.findtext(root_xmlns_prefix + 'Key')
-                         yield marker[len(self.prefix):]
-                         root.clear()
- 
-@@ -404,9 +423,12 @@
-             return
-         body = self.conn.readall()
-         root = self._parse_xml_response(resp, body)
--        if root.tag == self.xml_ns_prefix + 'CopyObjectResult':
-+
-+        # Some S3 implemenentations do not have a namespace on
-+        # CopyObjectResult.
-+        if root.tag in [self.xml_ns_prefix + 'CopyObjectResult', 'CopyObjectResult']:
-             return
--        elif root.tag == 'Error':
-+        elif root.tag in [self.xml_ns_prefix + 'Error', 'Error']:
-             raise get_S3Error(root.findtext('Code'), root.findtext('Message'),
-                               resp.headers)
-         else:
diff --git a/net-fs/s3ql/s3ql-1.19.ebuild b/net-fs/s3ql/s3ql-1.19.ebuild
deleted file mode 100644
index ba871ca91224..000000000000
--- a/net-fs/s3ql/s3ql-1.19.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-0.37[${PYTHON_USEDEP}]
-	dev-python/pycryptopp[${PYTHON_USEDEP}]
-	dev-python/pyliblzma[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-python_prepare_all() {
-	# use system setuptools
-	sed -i '/use_setuptools/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EUID} -ne 0 ]] ; then
-		ewarn "Skipping tests: root privileges are required so userpriv must be disabled"
-	else
-		addwrite /dev/fuse
-		esetup.py test
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.11.1.ebuild b/net-fs/s3ql/s3ql-2.11.1.ebuild
deleted file mode 100644
index 5ab6fccd8527..000000000000
--- a/net-fs/s3ql/s3ql-2.11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.2[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-0.39[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.11.ebuild b/net-fs/s3ql/s3ql-2.11.ebuild
deleted file mode 100644
index 5ab6fccd8527..000000000000
--- a/net-fs/s3ql/s3ql-2.11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.2[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-0.39[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.12.ebuild b/net-fs/s3ql/s3ql-2.12.ebuild
deleted file mode 100644
index 5ab6fccd8527..000000000000
--- a/net-fs/s3ql/s3ql-2.12.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.2[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-0.39[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.14-r1.ebuild b/net-fs/s3ql/s3ql-2.14-r1.ebuild
deleted file mode 100644
index fac9efee1de3..000000000000
--- a/net-fs/s3ql/s3ql-2.14-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-0.39[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/s3ql-2.14-ceph.patch
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.14.ebuild b/net-fs/s3ql/s3ql-2.14.ebuild
deleted file mode 100644
index e651e50c86e8..000000000000
--- a/net-fs/s3ql/s3ql-2.14.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-0.39[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.17.1.ebuild b/net-fs/s3ql/s3ql-2.17.1.ebuild
deleted file mode 100644
index d19cb3ff1f2d..000000000000
--- a/net-fs/s3ql/s3ql-2.17.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.20.ebuild b/net-fs/s3ql/s3ql-2.20.ebuild
deleted file mode 100644
index 9c3d9019d5a6..000000000000
--- a/net-fs/s3ql/s3ql-2.20.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dodoc -r doc/html
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.21.ebuild b/net-fs/s3ql/s3ql-2.21.ebuild
deleted file mode 100644
index e0e4b6b43963..000000000000
--- a/net-fs/s3ql/s3ql-2.21.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dodoc -r doc/html
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.23.ebuild b/net-fs/s3ql/s3ql-2.23.ebuild
deleted file mode 100644
index e0e4b6b43963..000000000000
--- a/net-fs/s3ql/s3ql-2.23.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dodoc -r doc/html
-	fi
-}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index e2d4ca9e4910..3a32357f64d5 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index a264feb2d0e2..34ba8e893c18 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -4,8 +4,8 @@ AUX lftp-4.7.0-gettext.patch 421 BLAKE2B 3d1583173e610983d93e44c8411729a0ed90f64
 DIST lftp-4.7.5.tar.xz 1567232 BLAKE2B 6ff7d264102ee25e989136b67b0587c025fd29a2573b25e4b9baac63c0ff0e9e40a4444b61ad50f8b892eb2f16dd31266056840aec0fb260686eb3b1714e4326 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960
 DIST lftp-4.8.2.tar.xz 1598920 BLAKE2B 2946a0ac3e915983e85f08f4c8a293cfd76b837dff007c60230522f4633dac9f9f198ee1d0e9e0d13217b83a55e46bd024d18d863e44bc17071561da6ec917a6 SHA512 582775c27f020a6864b960a06681698522842e147deee6dba18115738af56fc0094c2b21ed1eb4984626276472f707be795fcf4b23f451ba17a60e4bf8facd5e
 DIST lftp-4.8.3.tar.xz 1602324 BLAKE2B 196a9a08f97512952ea8c9e95b85c7222765a9df05d300d6c2cc3bd934b746d0c62a3d4c93a5c6eb3f1eca138495ae1c09edc31ad4f5516128c44fd3b8bbf2de SHA512 16d0ddc36ac00db009fd4e634a2eaa575bd1c690ea7e1af396317ccc677704d2a4dfa19ea0c46dab83450072714086ed2b15ac00ffe51ec5c9bb900e5e744583
-EBUILD lftp-4.7.5.ebuild 2216 BLAKE2B 670c49f7842629a237aa6681fe43ac619d7901b7f2cc44f5a0942dc0aa044536ddfa3d419ce4ce898afefe53c1317839ca198e3e9aed117bc34ff1c987eaca43 SHA512 d60cf04b48d0cbe304ecdd992498daecbf41676527ab9b077de372d24c1bc911e3eaaca9fb93446b38394360e1624d1a2703b16051b85b5b395845573026040d
-EBUILD lftp-4.8.2.ebuild 2231 BLAKE2B 86ea2e95f38363b752bebba735d430f876e6462d4f43a923f73288dca7d38fe591cb234ebce38edd957f5b092635598d3d8adaf8c546434a068bc6aa16e05dbf SHA512 551403c91d808b0663632cc9c234a69f3c2b77c8e9c03c171a658bf959ed2c3efdc87d0ed9d6bab0834c17c0b5665f9c8a4c46e455459f22907fd82563f1947b
-EBUILD lftp-4.8.3.ebuild 2231 BLAKE2B 86ea2e95f38363b752bebba735d430f876e6462d4f43a923f73288dca7d38fe591cb234ebce38edd957f5b092635598d3d8adaf8c546434a068bc6aa16e05dbf SHA512 551403c91d808b0663632cc9c234a69f3c2b77c8e9c03c171a658bf959ed2c3efdc87d0ed9d6bab0834c17c0b5665f9c8a4c46e455459f22907fd82563f1947b
-EBUILD lftp-9999.ebuild 2063 BLAKE2B 1d1cfe0a113347da4ff6abe33835caf308823e26254c755f6c6c5326b0418cfc65d8b6a63e576fa9e10af42c0101ac71370935e9df3676770dbf73b926ca7315 SHA512 03c489b52a31ae0f534f916c682577125aac10448d782fc06aa3ab242fc40ed980448bce578306efab264bc5fd5c0d47f32e8c344a1f29fadbe9f73f05ef1d7b
+EBUILD lftp-4.7.5.ebuild 2269 BLAKE2B 8f348d351cae5412394c1777e36063d3685943e0c3cb44b09120c56bd0e2b5e1ba4fda03e772aeeeba9dcd4152e2ad401646530397f3fe8a5bb935b9e82c6ec8 SHA512 27d83d091cd46c48137de0583057f0d445a45eddf17fb9ff360480201dd1f78c7ad5b0d960b122040fa1b001f69861a4d214bbdf52a6500a5c45564b965134e0
+EBUILD lftp-4.8.2.ebuild 2284 BLAKE2B 3713451e8236956ad11f510b78e31148123a4b4defd85125750642eb242bcb5777e37644541da17539976579509a69e1a1464488df65805b295ef71c786e7479 SHA512 7a941a664539a477beead174842d370bed190419eae9a161555aeb7e89ccd849527dd528f34cb729c3e593f6fe2020581188f413a53a4089e61eda8e7d67909d
+EBUILD lftp-4.8.3.ebuild 2284 BLAKE2B 3713451e8236956ad11f510b78e31148123a4b4defd85125750642eb242bcb5777e37644541da17539976579509a69e1a1464488df65805b295ef71c786e7479 SHA512 7a941a664539a477beead174842d370bed190419eae9a161555aeb7e89ccd849527dd528f34cb729c3e593f6fe2020581188f413a53a4089e61eda8e7d67909d
+EBUILD lftp-9999.ebuild 2116 BLAKE2B 55eb53dee393078094cdd2a00bf9c0c29025429e5f8581b624a9a24e0b1c909f0b6cc7c2181ff005eef0fc962591e2e67177250e04053e06b3dfa89c188270f2 SHA512 515aab6d64d4b74753b942b2b5bee0eff09d8efa4bed27c2473e075dc70180a6c4c8c6cdbefc68de52b2dc893217181cc5f3bd1bd00f9dbf76cedb6f7d45bda6
 MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd
diff --git a/net-ftp/lftp/lftp-4.7.5.ebuild b/net-ftp/lftp/lftp-4.7.5.ebuild
index 087b60b4d88a..138bce2efdea 100644
--- a/net-ftp/lftp/lftp-4.7.5.ebuild
+++ b/net-ftp/lftp/lftp-4.7.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils libtool
+inherit autotools eutils libtool multilib
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="https://lftp.tech/"
@@ -76,6 +76,7 @@ src_configure() {
 		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
 		--enable-packager-mode \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--with-modules \
 		--with-readline="${EPREFIX}"/usr \
diff --git a/net-ftp/lftp/lftp-4.8.2.ebuild b/net-ftp/lftp/lftp-4.8.2.ebuild
index ca93056b2641..a6577ffe126d 100644
--- a/net-ftp/lftp/lftp-4.8.2.ebuild
+++ b/net-ftp/lftp/lftp-4.8.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils libtool
+inherit autotools eutils libtool multilib
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="https://lftp.tech/"
@@ -79,6 +79,7 @@ src_configure() {
 		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
 		--enable-packager-mode \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--with-modules \
 		--with-readline="${EPREFIX}"/usr \
diff --git a/net-ftp/lftp/lftp-4.8.3.ebuild b/net-ftp/lftp/lftp-4.8.3.ebuild
index ca93056b2641..a6577ffe126d 100644
--- a/net-ftp/lftp/lftp-4.8.3.ebuild
+++ b/net-ftp/lftp/lftp-4.8.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils libtool
+inherit autotools eutils libtool multilib
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="https://lftp.tech/"
@@ -79,6 +79,7 @@ src_configure() {
 		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
 		--enable-packager-mode \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--with-modules \
 		--with-readline="${EPREFIX}"/usr \
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index c6930de30ea4..75206b992406 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils git-r3 libtool
+inherit autotools eutils git-r3 libtool multilib
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="https://lftp.tech/"
@@ -74,6 +74,7 @@ src_configure() {
 		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
 		--enable-packager-mode \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--with-modules \
 		--with-readline="${EPREFIX}"/usr \
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index e4a75c592357..4e8d4d8425d9 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index 7255ac7e5245..537515f432ef 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,5 +1,3 @@
-DIST polari-3.22.2.tar.xz 617316 BLAKE2B 3eca7e01270f02973e90188a81a15215e5fc8cca19b684dec7185d906d6312a5188a0b67c7b664c708a6cac4ab58516c20f3c47efa2db0d0324ad86d145cdc42 SHA512 36bc3b506c73f5d27c32430a19134c2b147f6344840d3cd3ee2bee14369f4c8fc87b30445fbb8186e0dc79fbc8336985d6ef2e018c9a1f8809f06ee7ac68c876
 DIST polari-3.24.2.tar.xz 804160 BLAKE2B c0e651d478cf814d1e055ef196ea725a17c50ee4836df7939b73dc59bbea0f74d8dbf6ceebd07b3748b6814fa52ae8a300515ac8f6952f59546e7c27ed35d6da SHA512 23a475d657556e7f4e93dde8e545bf7bede227635d540bd006b85b068923d87e713bd05f14d8ccde458bf6efd4920665bca02ea41c4de870680581ebfa595f0e
-EBUILD polari-3.22.2.ebuild 795 BLAKE2B b4143a1f794a399ffeb0f894e0d6a7b58ec5be374b55f6f93bfc09900ce396a829fc77af04e04842592f0257cef05595a13a41a272188473f6453e4040c120a8 SHA512 863e10ad80d9a587a7bdc02dfad147d9c873dc0895d60de71bd4d682a1690c2d5b83e437658af6fedb33ba3d1251568954eeb893acaf1dda48b6e17bdba2fbbe
 EBUILD polari-3.24.2.ebuild 866 BLAKE2B b17a5c9cdbbcc9b81de2585570104dc0472916805a8a86c1e414bd9dccabe3db0500f2e0188abc2fe24d5a709a647c0f408f4a19952d0e25893520f82a95a636 SHA512 a27466f037ee91f9cd3ab512bb586a5df13fd50da3b6fa30354316dbf4918ee8190b80113e015049b878b3a11b3efbd8acce852946b1e65d0831cb4be2b6b953
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-irc/polari/polari-3.22.2.ebuild b/net-irc/polari/polari-3.22.2.ebuild
deleted file mode 100644
index 247adce60aeb..000000000000
--- a/net-irc/polari/polari-3.22.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="An IRC client for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	app-crypt/libsecret[introspection]
-	>=dev-libs/gjs-1.45.3
-	>=dev-libs/glib-2.43.4:2
-	>=dev-libs/gobject-introspection-1.50:=
-	net-im/telepathy-logger[introspection]
-	net-libs/libsoup:2.4[introspection]
-	net-libs/telepathy-glib[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.21.6:3[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=net-irc/telepathy-idle-0.2
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 9ffe6a6c8d77..45433a7d5886 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 106c73c54c4b..22a532facb73 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-online-accounts-3.22.7.tar.xz 1404820 BLAKE2B 7a9bd80c5a240ff7172dda5cfe93fa7410b83e7f3b14c615a465b322d5ee07b220773c7424e8dd4c2e0dcacbd11545cfa968f247e545a9eaa530e6d2ecebfb72 SHA512 76a5b6897540f05126786caeddd392d465063571e3884484aa68cd66de851f2f72351afe74dd7e38d8fb8a628d57bd8dde0c8379f909f9de19e451cdf9112b67
 DIST gnome-online-accounts-3.24.4.tar.xz 1412004 BLAKE2B 96e92eefeedb94563af755367b4932469d8a55bd545324bb1ebffb4798bd0a499aafe9523abc7c707342b1c78f912c499335708dfb3f9a149567b64877f0bbd9 SHA512 6e12f03d3ff9b9c831705f0310923b2c3e0daeee1304bb3dfa52fd17d6df49656f3380a1ffd9f30f75890340fb7ee23f53789e4df357a0aeba4e31667fd9c45a
-EBUILD gnome-online-accounts-3.22.7.ebuild 2471 BLAKE2B 91861dafa0a3d5a4bca7664fcbd4a0f4b75942babd2763e5e2b0e2932a6c803597bd1869a22bd6a96d032f197aee5c33ece56e45acd2bc1f21cfa78fc9ba9a8a SHA512 b41c1207d37f821942ea448cc9cb69aee186b16888c2da5177790eac7cbd76a1d8672dfe2711d95903c87428616853aacdaae6bdc2711b3518dd20a069786005
 EBUILD gnome-online-accounts-3.24.4.ebuild 2471 BLAKE2B d5748c5b547daaba2a7eddd8141219d00f102f3522bfd3e7d03547db3a7114a9fb739a7d93a642fdcca6a549734ca4c20bd724fbd2d72b9453d8eae407f143fb SHA512 a7356397015414a0a4908eef03f38cb96286268bda14a82bb996ef2df1bdfde5969b0761b0f4a7ded9c4e4d065f682f16f60559b3af6b946fdb53cfc6b56531d
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.22.7.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.22.7.ebuild
deleted file mode 100644
index 77b22c15dc76..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.22.7.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="debug gnome +introspection kerberos vala" # telepathy"
-REQUIRED_USE="vala? ( introspection )"
-
-# pango used in goaeditablelabel
-# libsoup used in goaoauthprovider
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/json-glib-0.16
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/rest:0.7
-	net-libs/telepathy-glib
-	>=net-libs/webkit-gtk-2.7.2:4
-	>=x11-libs/gtk+-3.19.12:3
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
-	kerberos? (
-		app-crypt/gcr:0=[gtk]
-		app-crypt/mit-krb5 )
-"
-#	telepathy? ( net-libs/telepathy-glib )
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend) )
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.3
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf needs gobject-introspection-common, gnome-common
-
-# Due to sub-configure
-QA_CONFIGURE_OPTIONS=".*"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# TODO: Give users a way to set the G/FB/Windows Live secrets
-	# telepathy optional support is really a badly one, bug #494456
-	gnome2_src_configure \
-		--disable-static \
-		--enable-backend \
-		--enable-documentation \
-		--enable-exchange \
-		--enable-facebook \
-		--enable-flickr \
-		--enable-foursquare \
-		--enable-imap-smtp \
-		--enable-lastfm \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-pocket \
-		--enable-telepathy \
-		--enable-windows-live \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable kerberos) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-		#$(use_enable telepathy)
-	# gudev & cheese from sub-configure is overriden
-	# by top level configure, and disabled so leave it like that
-}
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 9077bf767c24..dc2b7a59fe32 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,7 @@
 DIST miniupnpc-2.0.20170509.tar.gz 86055 BLAKE2B 7da640c4baac58aa26965a670877953b4c2d27aff08b604366bad6913b30c152d52120099f37c6250eeed97396ff412a4dd6000179070a82eebd3c052596b0d0 SHA512 71ec052ef6c8ad0d529e467ddae6eae19a93b9816174eeac753aa90e036cc2f00cf7e8d1cdb188ef8280849a988fe2995e37b63f8e2a361e021c1d1b306bff6f
 DIST miniupnpc-2.0.20171212.tar.gz 86607 BLAKE2B fce582c4125192f74f6ffb174295020af1c9b574b2094f5565a5e49641820a2d9cef719de59cb94bfd207182505237c22cf58425e1a7b47f5dfe2eb84c07d3c5 SHA512 d25708f4e2ef7311878ba6d17cb506f4bfe5c9cc6b7a79e4168f143ca9da8b96beb018c42dd735f0b23806668eba2308b7de26d1b506d91c23f79c7ed77399a0
+DIST miniupnpc-2.0.20180203.tar.gz 86772 BLAKE2B 6959d7033f12d3cbe52bbe1ec2178c068a448441d22501f44a7228b2050b53ff5e955d390ff03071e6f34df2a652040bf5ab23c59aca16dc4379e380dd46fea8 SHA512 b8ebf02ed01c5217a789397b7c224ba21d233cb544ccdfd907fb9c6f49adae6864eb17963b9b9f654ecf3fde864c191fd7d00c5cf614771a7137a030f341f226
 EBUILD miniupnpc-2.0.20170509.ebuild 1266 BLAKE2B 275a77b2813007c8055df57d2e8d74c05c02e7f81af1b1ad766a4c9f274f955c7d56779184983a1e45962bbc38e9ff58f15f4bfc076ed86cc1400eabac4f2dcb SHA512 aeeaba172f38162342256afc17223e1efce42f149561ca0e19bcd8336d32dd74d51a55951f4df79663d1999702930eb4dcd6ceebeea9afe82d9f376432dd7271
 EBUILD miniupnpc-2.0.20171212.ebuild 1273 BLAKE2B 2fff06efc3482305a3a45a9e94bf1dca939c234d66d26ed9649d547b0e98c517cb1018bb1bd14209b88129fd113a4b64fce712f782da10dcb4a860e1d8d1497e SHA512 9de720f270d9a5d214ce314b85722b0b8a0db75d2e6624a7528d0fee12e993ac40ee5442ce0ec89bf65d03a018015b86894425b43a2d547e98e6ac25a99e1012
+EBUILD miniupnpc-2.0.20180203.ebuild 1339 BLAKE2B be0965e64f83087fffb495b3c3de74d691b2575fd8d14b36c56284404e912b623baea93027c61d58d354ef00c8fb31f4581b01959606683e1d23563e75b72891 SHA512 af3b05b0af780f4b8707209b7d1bbd26c8952c0f9314f613569f6da6e03a5bac9961d19e16e6c0876abee7006401c909b02e5c058daba7e2dbd6922aba98110e
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180203.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180203.ebuild
new file mode 100644
index 000000000000..3a1c24a1b100
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.0.20180203.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/16"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 kernel_linux static-libs"
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+	eapply_user
+
+	# These bins are not installed, upnpc-static requires building static lib
+	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+
+	if ! use static-libs; then
+		sed -i \
+			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
+			Makefile || die
+	fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake upnpc-shared $(usex static-libs upnpc-static '')
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6) check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 0b9d7bd8020b..c8d8a2b5822a 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,10 +1,8 @@
-DIST nghttp2-1.10.0.tar.gz 2086580 BLAKE2B 207b3906ec3a9e38fbac6331cdb2300c6bf440ee9704d14cf0068c192e1aa95f8ba70e1fbbb9bd9d10a4dcc18d3e3ab52f2305771be7fa3f4c38362b1db533dd SHA512 4341f76ead38ba30e0dfda492e2e0f4c842f453e235fa90ee55b1e556092828236f21c6b212d0099cea005f149e4be3e63ad007009dd5228999101e563009a6f
 DIST nghttp2-1.19.0.tar.gz 2159530 BLAKE2B 09e71408e527f5cd42ed224377042d4b68ff869e86c8727f63f2a4777253da9d03bd2cadfafd655b9984c7b71a52f928906db7b73d3adf74f36e69e28dba5618 SHA512 50f45082f725c237a0e1d25af57992b9cded6c9b68f0aa95c44c16eb4448e05b14e06c853032924d03034115286163de0ad684827cfa5d70896656868fdb4e01
-DIST nghttp2-1.28.0.tar.xz 1553032 BLAKE2B 81991f7b2ebd74c9a730e22b1f220ef9dbd60f38221313b83db71f92d32590c2a8387412a494be7e33adb2f855b82ed2a9f12c1df40e4602662874f5b1881620 SHA512 c49d4e02ec8e894e01aff0b3573e5ce6a33e37ddbd777f6363a2890681a2d09d9e29794c7a6aaf20dd094b4b6da4b535f3e81ac58ef4164b1f8cca9e0da26ee9
 DIST nghttp2-1.29.0.tar.xz 1544736 BLAKE2B 1708d2c787e27d722aec27890a21e752a9fe66cdcff481615ac0bd9dcc92099946d9e5563a70137029dec54f8cc4244ef22813e0c2010572cd070ff272120bdb SHA512 a518ff1dcc9ae93f8228f4fa9110b9cbc460260a794d455530218c66317c6b96a5b14971aff25428e37326b5ce9f4d8480eefe6fcba17af23efa4ebceb56f23e
-EBUILD nghttp2-1.10.0.ebuild 1772 BLAKE2B 06a02aa841f53f66fa01ad309041510f1deb98afef97894b6784e4b05f4e4fbe36f60a33c2033cbde16e9835a29df4f77f42b37a8c53fac961937a47b43fff19 SHA512 65a431e382cc6b7494674b0c662f1f18d0c3fa0b6ca7bb16dc3ad0f60213f51113a73aa1252680c63d687424bae54bfa2fc813501e90ded0cd08e06cb6088809
+DIST nghttp2-1.30.0.tar.xz 1545352 BLAKE2B 0d52f973a63632dc1ad235f1b535c24053a8dde52dfbda957c3e40548b4de5db5975639140f207cd9ffe564b6151ed6d97de45ff070eb2cfa3d6b41f52254430 SHA512 4b79f46947777627f0a9e1384ec51ac70e273aef6d46d322aa448731726b8ca606e73dcb171170bbe91fce93c28170ff04e11da56ee90fa28d642e7bc37b50be
 EBUILD nghttp2-1.19.0.ebuild 1811 BLAKE2B 7931aa1b1477275b7efb6f174bbcd5a7c18ef6df4d69d4097d4b199d9debe43a9de9a4ef3ffee66d7bd7b7895289fddb69707a69e6eb3da49210109b5d87ea39 SHA512 5ed6ebd9d727a4803878bade7f3abd7fdf61b53ce7e04259e3c07290fd48f8a26a4b61d64aa533afa9eaaf37d4c7a7376e9f37b6bbc04637e61d6d07f603857b
-EBUILD nghttp2-1.28.0.ebuild 1815 BLAKE2B 0e9dd0e955b6e595ef5177078b3653554014ae22e58e5400c419bd465bfe8804235a5e4ef1a1f37f04c1792d1982fc8856259560cd5f97926d5b769b83a82db7 SHA512 fd44ab40a68379bbef08e3471a38db2509b0f8f6fd29db8928e0310ee758a35c1c6b5c032b442aff437020df1e079af59e849aa83e3a019dc9ea6d7fb1c564c6
 EBUILD nghttp2-1.29.0.ebuild 1860 BLAKE2B a47893c442eca9d6702eb2763547c49b8357986b57f0b3643f1a8868e85dd74b65c92c628f4176a8b1dc3b9f911e44eb255c13ea4565f7b90e628b056c50adf7 SHA512 abcd9982970c135d1babd197a41a8978578797575997c94feb623ec12f296a91aaf80899169f837f020a3810af344e1dafa6c41b72465423d26526aacf303fdd
+EBUILD nghttp2-1.30.0.ebuild 1860 BLAKE2B 1921255023f5cf1ed11003ff073094c50427849fe965440ad361a86515f75d11825b04097d4c4728a7f3158f60b94a3cdf086297c2c54f68ba25699be7dca7d7 SHA512 b3a7e529a1c7d303e47d8440a673f5ec9a72f111c5473f3a7c5cb22610ca007d260d626a6f480ae1d9cbffece42cb7ecdb21535714ef74dd1f8d087e829026c1
 EBUILD nghttp2-9999.ebuild 1934 BLAKE2B 091fa366b740f254c371d075bf24dc126f8d86f66315816b16b3c4c0177c9d2fff66d4ba916adbc203bb2d92ca6a070e80d58d6a4f30cea6bc8fa71eb3718616 SHA512 7e157bcc44e80ca78a85fe1b0e97b293646a30aedbfe7d918f5e16b96d061e9303636053675021af5ca97f84f38fabe0e54c63348f40fe9a52b00e20b0717c4d
 MISC metadata.xml 578 BLAKE2B a210790f12a0149240e59fee7702570c81a026851cfe8fdc2ce015bfb56c73150937a06e26dfabf896118a4d566b33d94ace7a622d751c0455629bf02061fcdb SHA512 a8948265c469d936a699b42978f7e8b2fdd6a7d016094242763730f75f285e6b8ed2a26d66ae8597f1c0ca9d45d47f3e2893005c0cd101e13fd4f62c6e937e28
diff --git a/net-libs/nghttp2/nghttp2-1.10.0.ebuild b/net-libs/nghttp2/nghttp2-1.10.0.ebuild
deleted file mode 100644
index 8eb853b435c9..000000000000
--- a/net-libs/nghttp2/nghttp2-1.10.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=6
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-RDEPEND="
-	cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
-	utils? (
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		!libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-examples \
-		--disable-failmalloc \
-		--disable-werror \
-		--without-cython \
-		--disable-python-bindings \
-		--without-spdylay \
-		$(use_enable cxx asio-lib) \
-		$(use_enable debug) \
-		$(multilib_native_use_enable hpack-tools) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(multilib_native_use_enable utils app) \
-		$(multilib_native_use_with jemalloc) \
-		$(multilib_native_use_with xml libxml2)
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/nghttp2/nghttp2-1.28.0.ebuild b/net-libs/nghttp2/nghttp2-1.30.0.ebuild
index 73177fc62199..e578deb7b24b 100644
--- a/net-libs/nghttp2/nghttp2-1.28.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: Add python support.
@@ -22,14 +22,20 @@ LICENSE="MIT"
 SLOT="0/1.14" # <C++>.<C> SONAMEs
 IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
 
+SSL_DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+"
 RDEPEND="
-	cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+	)
 	hpack-tools? ( >=dev-libs/jansson-2.5 )
 	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
 	utils? (
+		${SSL_DEPEND}
 		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		!libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
 		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
 		net-dns/c-ares:=[${MULTILIB_USEDEP}]
 	)
@@ -39,24 +45,24 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-examples \
-		--disable-failmalloc \
-		--disable-werror \
-		--without-cython \
-		--disable-python-bindings \
-		--without-spdylay \
-		$(use_enable cxx asio-lib) \
-		$(use_enable debug) \
-		$(multilib_native_use_enable hpack-tools) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(multilib_native_use_enable utils app) \
-		$(multilib_native_use_with jemalloc) \
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-werror
+		--without-cython
+		--disable-python-bindings
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
 		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
+	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
 }
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 988510f7854d..77435326501c 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,6 +1,6 @@
 DIST qxmpp-0.8.0.tar.gz 1115730 BLAKE2B 57ca5d5a9f2ce625e78572ef52210defbcdab8da69cd785f14f41e155c4239213b4d70855cb18b9c3389c679469a194e2425ff3ad0084fd31aaab871b65c45ec SHA512 b4e3afa9a4ffdc03d2baf9660986d0cf4de5c2c7d1518ad83cd9b252ff7822da66d9356eab49ce9bd642884a41ec3b72f8d4e2cda964a9276d525d4895c6165f
 DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71
 EBUILD qxmpp-0.8.0.ebuild 1544 BLAKE2B 9d0672f5ecfee702623c5d0adeb22aa9cdaaf70c45c24006e05721e6779fa29126a99acc1c05555b04b24b7c1a6366e385ed08d0f6e1456dd4902e91aba70d53 SHA512 6d6c09eae7acb85bdc6f8f03a0962c71f02fb4f669aff259aff601d00c8b3be17670ba44ec72cd08a488d065c882c6538eda7bcb7bd6021a12dcf8e0581d925f
-EBUILD qxmpp-0.9.3-r1.ebuild 1831 BLAKE2B f6106a674a8cc99c5cf98704b235fadde290d8d9fc82cb4178b87fcfa7cabecb29fb8f475ce4985e7471ce3e2f680daa19e0dd8248dbe6d25f34f410be5b88bf SHA512 7d96a9e6e247d2e8c6ea1d1c8edf552fee0530b7e328357f02d2082e66b53d6dfc9826657449351eca1007aff85666f695008e61b5c1c379284e68c6a5932e58
-EBUILD qxmpp-9999.ebuild 1784 BLAKE2B ba5eaaec2434eb1cd27da015f449cb5bb25f2afc2dd9e1894ca883fe6e4eb405a493122dc7cc2bb6a5f91695b8d22310560a37d295cb4845acff4b8a7e3b468e SHA512 40e0c2b35ed81dd304df95feb634164ab69012641504df03e3dd9dfeba76437644e3d9125d33535a31e7e80ec39db6ca5efdbaa49f885e405bf9b650dc79a576
+EBUILD qxmpp-0.9.3-r1.ebuild 1811 BLAKE2B 871c93e3d047f22c0fdc34a2f8959ce6a23318ea3da8a06de2d24a585f4a18d39353277479460f24f71d89a1052c99be6f2de7047d85182d8d81d1c7398ca2b0 SHA512 722a51edb36ef19736e0d6ccc77c1435d1384d1b961ca86f22ea31d30da9eb5e3a16380d29e7014982b50dc59605352adc8391725799202d60480756412c3350
+EBUILD qxmpp-9999.ebuild 1764 BLAKE2B 95e41847555283e64dc393f9f5c5e67ea5b834472f097fbc7d7cda91b1b83b83952a68bbd13f77288ce7f402a2fc2fb67dad189293c41980d954f421b24ced11 SHA512 3f3ea1f1e22b136a79ff4c8b43ae978dff96b2c6652a1a80a91f534053707182649176728e928cf6c8e6be0f8639d4433b4979c9e4acc9a61edc88af49d20531
 MISC metadata.xml 794 BLAKE2B 039cc3d356927e6f18091e93f9c39a5bd07ee255eb71d588e417bfc9d446c2d00121a316f0c86e68296631c428358bdecab8877226ffd982f82ef8d001391402 SHA512 0486690da78f6876a4dc81eec34dbcfdb63df109ed9135c9fce5fe8355f3adb216e7766def8d87870a9ece522f57b295ed48aa7cca36f7bb2a64eef7f77bb74d
diff --git a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild
index 688a4490a702..a8bd6e94ae7d 100644
--- a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild
+++ b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,34 +27,35 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-src_prepare(){
+src_prepare() {
+	default
+
 	if ! use doc; then
-		sed -i \
-			-e '/SUBDIRS/s/doc//' \
+		sed -e '/SUBDIRS/s/doc//' \
 			-e '/INSTALLS/d' \
-			qxmpp.pro || die "sed for removing docs failed"
+			-i qxmpp.pro || die "failed to remove docs"
 	fi
 	if ! use test; then
-		sed -i -e '/SUBDIRS/s/tests//' \
-			qxmpp.pro || die "sed for removing tests failed"
+		sed -e '/SUBDIRS/s/tests//' \
+			-i qxmpp.pro || die "failed to remove tests"
+	else
+		# requires network connection, bug #623708
+		sed -e "/qxmppiceconnection/d" \
+			-i tests/tests.pro || die "failed to drop single test"
 	fi
 	# There is no point in building examples. Also, they require dev-qt/qtgui
-	sed -i -e '/SUBDIRS/s/examples//' \
-			qxmpp.pro || die "sed for removing examples failed"
-	default_src_prepare
+	sed -e '/SUBDIRS/s/examples//' \
+		-i qxmpp.pro || die "sed for removing examples failed"
 }
 
-src_configure(){
-	local conf_speex
-	local conf_theora
-	local conf_vpx
-
-	use opus && conf_opus="QXMPP_USE_OPUS=1"
-	use speex && conf_speex="QXMPP_USE_SPEEX=1"
-	use theora && conf_theora="QXMPP_USE_THEORA=1"
-	use vpx && conf_vpx="QXMPP_USE_VPX=1"
-
-	eqmake5 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_opus}" "${conf_speex}" "${conf_theora}" "${conf_vpx}"
+src_configure() {
+	eqmake5 "${S}"/qxmpp.pro \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="$(get_libdir)" \
+		QXMPP_USE_OPUS=$(usex opus 1 0) \
+		QXMPP_USE_SPEEX=$(usex speex 1 0) \
+		QXMPP_USE_THEORA=$(usex theora 1 0) \
+		QXMPP_USE_VPX=$(usex vpx 1 0)
 }
 
 src_install() {
diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild
index 21806f48a186..fc67feb3c99a 100644
--- a/net-libs/qxmpp/qxmpp-9999.ebuild
+++ b/net-libs/qxmpp/qxmpp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,34 +28,35 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-src_prepare(){
+src_prepare() {
+	default
+
 	if ! use doc; then
-		sed -i \
-			-e '/SUBDIRS/s/doc//' \
+		sed -e '/SUBDIRS/s/doc//' \
 			-e '/INSTALLS/d' \
-			qxmpp.pro || die "sed for removing docs failed"
+			-i qxmpp.pro || die "failed to remove docs"
 	fi
 	if ! use test; then
-		sed -i -e '/SUBDIRS/s/tests//' \
-			qxmpp.pro || die "sed for removing tests failed"
+		sed -e '/SUBDIRS/s/tests//' \
+			-i qxmpp.pro || die "failed to remove tests"
+	else
+		# requires network connection, bug #623708
+		sed -e "/qxmppiceconnection/d" \
+			-i tests/tests.pro || die "failed to drop single test"
 	fi
 	# There is no point in building examples. Also, they require dev-qt/qtgui
-	sed -i -e '/SUBDIRS/s/examples//' \
-			qxmpp.pro || die "sed for removing examples failed"
-	default_src_prepare
+	sed -e '/SUBDIRS/s/examples//' \
+		-i qxmpp.pro || die "sed for removing examples failed"
 }
 
-src_configure(){
-	local conf_speex
-	local conf_theora
-	local conf_vpx
-
-	use opus && conf_opus="QXMPP_USE_OPUS=1"
-	use speex && conf_speex="QXMPP_USE_SPEEX=1"
-	use theora && conf_theora="QXMPP_USE_THEORA=1"
-	use vpx && conf_vpx="QXMPP_USE_VPX=1"
-
-	eqmake5 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_opus}" "${conf_speex}" "${conf_theora}" "${conf_vpx}"
+src_configure() {
+	eqmake5 "${S}"/qxmpp.pro \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="$(get_libdir)" \
+		QXMPP_USE_OPUS=$(usex opus 1 0) \
+		QXMPP_USE_SPEEX=$(usex speex 1 0) \
+		QXMPP_USE_THEORA=$(usex theora 1 0) \
+		QXMPP_USE_VPX=$(usex vpx 1 0)
 }
 
 src_install() {
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 274032d75170..5af282e44875 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index 80c5fcdf2095..8fc27ca97f53 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-online-miners-3.22.0.tar.xz 272832 BLAKE2B 67e56662dc74e35f23f7db5ae586a761a0043e01c07cb3ac9d3dd43b2f978e1472155748ac1c67498c1f30f0b342cab40d35a9934eff28ac31493778a8fc0c6f SHA512 91fafb41523b239fae6dda6dbbf0a1c64dba6089f70b2336574604c996c2e09e1f64445621c170ec70a98736362633443aea5ed7028cd8347d9beaaeb7f4aed4
 DIST gnome-online-miners-3.24.0.tar.xz 272572 BLAKE2B 6331e72f65510041cc278670df328ab6ec5336bb76ec1c6681136c6731c70b9d343ef296062da6de302cfea195d1b99c0040e1e016394b2fe3bbbe077915cd76 SHA512 96c6aa99b99553c399ecef754d10a918d8ef3bdf6369a77357241091edc9c2ff7a8350f8a064bb011deddac75b25bdde8006e8d72b6562f9cdcf3b373e693253
-EBUILD gnome-online-miners-3.22.0.ebuild 894 BLAKE2B 952812eaf8755bd1ba2ee159c87cbfc3e898cc6fc72d8163d24afa56319042082ab68e68cbdbcd79c2fffd45a228ceac74df747df87b2aa88d2e71322fd584fb SHA512 2d8df1e94072b071be24a5498baa901842163112f16edebb81784e8d86b4efd77120093e349df31a4d1a1a2306a332f3e1d0a098d4608c11631c84d427db9b46
 EBUILD gnome-online-miners-3.24.0.ebuild 894 BLAKE2B 7237aa4f222c2da2b888cdfd2809941ed5264114ee54961b11d330bdc576c2f8e9fefb1436dfb12cb59a0497438baa85807c90203d35fdaa07959b79d095239c SHA512 e484cf9af3528388c9dd8ea6f7fcd04311830d2a4715dc6283d8b428427d1b803e0f43169d85eadcd6d5d6cb03420eda8d867d0df717b5831d8056b37863e7f1
 MISC metadata.xml 312 BLAKE2B 4529eb2ea76ee2c88700e8d551c726424ce4338361eb87c39599d1ee263914d9861cc8f93e1d8e667bdba186c40afbf1376bd9b530edbdab32ec4f961a60f00b SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.22.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.22.0.ebuild
deleted file mode 100644
index d8ce960d90d3..000000000000
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.22.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Crawls through your online content"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="flickr"
-KEYWORDS="amd64 x86"
-
-# libgdata[gnome] needed for goa support
-RDEPEND="
-	>=app-misc/tracker-1:0=
-	>=dev-libs/glib-2.35.1:2
-	>=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts]
-	media-libs/grilo:0.3
-	>=net-libs/gnome-online-accounts-3.13.3:=
-	>=net-libs/libgfbgraph-0.2.2:0.2
-	>=net-libs/libzapojit-0.0.2
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable flickr) \
-		--disable-static \
-		--enable-facebook \
-		--enable-google \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-windows-live
-}
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index cb9698503266..d3e5628c07b2 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -2,8 +2,10 @@ DIST keychain-2.8.1.tar.gz 43866 BLAKE2B 7b861d9ded273341da47ee8db77b5b665a81cbb
 DIST keychain-2.8.2.tar.gz 44211 BLAKE2B 0916ffebbfa682480e7599d7a07a74e916ab780af47f2c4094fff42147ad461a23bdae81cf18ca5ebba8f21b3917f74cfa3503026fe1f58beff2946173c45cba SHA512 741cffb5affaeaf2cea701d76e3bae8a0cbc2b781bf5d578001e763cee531011aacfb1754974afcb63e6d46588716e62e5f96fff63eff76dd5ad8ee7e16ac196
 DIST keychain-2.8.3.tar.gz 44205 BLAKE2B dcdddaa31d28a401ba4aaca842a8a0c50f18feab3ecd4e2d917eb4f7c2f7c7602c369d82dc82ddf788984b94e95ce4006ee3777995d8ab48cbe9797e39f5bb52 SHA512 493f376fff386069202eadcbef61140e8e66d195e7f73574948e69d8e778bd8f2c2926a174cd25b4380c17f0fb769d423a3b36af4a98aa39f55db22c45216447
 DIST keychain-2.8.4.tar.gz 66143 BLAKE2B eee39aa4f6d0e14277cc005247fe69ba9e83fc49427e3947c5ecaaf4d9d25c92f0ff22eb5fc7cca38c86dd6320c7b7c068841a960816ed97e20ab31c77dc2fa9 SHA512 182d6c6bc1f278839b1127eb0b0b7d094a06251c86a5ebb10410e657d3cb2e7207c75aa9d1f655a5fd4b4f2290f4bdcf00b3714cb0f825e6ef9eecfc486c6abe
+DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
 EBUILD keychain-2.8.1.ebuild 693 BLAKE2B 6bce0f8e4cfad5ac866fb3e231f91abf47e573f7314ae1eeaf388608f930f6815984b276950d5d7eb4b3eb255b82d2effe8700b927b0950a140877798b2811f9 SHA512 40acd5eac90e0fd03e3ba37b3d1754800a0646d0a5a2f076f2ad2c38b07a30c7ede8e29f510a55f083f308032d18328a6a925163e24610d465b1ad05f2dc9e2b
 EBUILD keychain-2.8.2.ebuild 706 BLAKE2B 0440f24f9cdc23431ff7547a09549b15240d3234520abfe723e6b3f888946998c8ff22a8d8baa4eeb4f1e6d3de390b60cfca0419d0c4012bdee4749732fb7554 SHA512 412c3fb3acdc422c7b5bece95f4448cad628d5eca7c4209a4158fd14c28cf19b0d6299f2e5e1fb8fe9bb3a85d453f4432531b2ee9533db37eacb75d879811427
 EBUILD keychain-2.8.3.ebuild 703 BLAKE2B 41c7bbbac5cd9cb0e877893360bbbde5a359d6c3aa84f76a2906e83d03c52f7af4524f6f0c7ebd472226f70ae7ff20021928db85bf968b5a180efb5a928376c8 SHA512 1683d01f4b272b0711c10c456f957fcde079d169fc7677eaf1e3b29f90ede4109b72d9a85248d34335e3b9c138a98d3855bde0d0e890749ef6e343499acb3257
 EBUILD keychain-2.8.4.ebuild 703 BLAKE2B 41c7bbbac5cd9cb0e877893360bbbde5a359d6c3aa84f76a2906e83d03c52f7af4524f6f0c7ebd472226f70ae7ff20021928db85bf968b5a180efb5a928376c8 SHA512 1683d01f4b272b0711c10c456f957fcde079d169fc7677eaf1e3b29f90ede4109b72d9a85248d34335e3b9c138a98d3855bde0d0e890749ef6e343499acb3257
+EBUILD keychain-2.8.5.ebuild 703 BLAKE2B 41c7bbbac5cd9cb0e877893360bbbde5a359d6c3aa84f76a2906e83d03c52f7af4524f6f0c7ebd472226f70ae7ff20021928db85bf968b5a180efb5a928376c8 SHA512 1683d01f4b272b0711c10c456f957fcde079d169fc7677eaf1e3b29f90ede4109b72d9a85248d34335e3b9c138a98d3855bde0d0e890749ef6e343499acb3257
 MISC metadata.xml 512 BLAKE2B 4f4829139a7ab1a24310dd9993a70525809fe24255213e17e98619d0b068798329f35c0dd4e40a47023582c58d80e4124fd0f393286b3e268aeedda189c69028 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a
diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5.ebuild
new file mode 100644
index 000000000000..6f06f6475bd1
--- /dev/null
+++ b/net-misc/keychain/keychain-2.8.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG"
+HOMEPAGE="http://www.funtoo.org/Keychain"
+SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND=""
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog README.md
+}
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index f39227fd251a..593339f9ad9b 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -2,5 +2,7 @@ AUX minissdpd-1.2-remove-initd.patch 595 BLAKE2B 420f456bcd5d0e1df0d857a142d4630
 AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46764c5b7b59a62776c16c93d4112821159835e9d9f174f2af443c0d07a10823b41182910d12899947 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296
 AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191e29fa99ebb7d37b302578e492f705d4f724744ec3a9ca455730f01294e2a781529c3750193fd8e84cf50 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade
 DIST minissdpd-1.5.20161216.tar.gz 35078 BLAKE2B c8e681e812869ddc15cece499356e7852a4b2e86b661bd80d62a840c8a9a01f321d4616013fec49d4abd834c75378014b52e605ad3fa116c0dc863e5a389a9fc SHA512 4fe1dbc14a39a18bcc834c73cc0150cda656b2be7ffcc0a72dc2854dbd698f3528bfdcd80af741124546f916d914921ffc428bb4f19b34e7493f0cbf9ff54928
+DIST minissdpd-1.5.20180203.tar.gz 35848 BLAKE2B 2a784bf6c8cf2e656d86f60802d11823d15ad0d7ca4b941c4cf71ffb0433be81b1f12fc11eaa84585d0cc77f1710b24336962e4242a957c49e7ca957e38c0a55 SHA512 2ad8964cd9893b29318659d39adf006cb3df2b97260b6b93a9b71b8f318941fd569cd6de02d34347cab75d4f556e89aa1b3f727561d1b6805c22ed9a3183f6ce
 EBUILD minissdpd-1.5.20161216.ebuild 694 BLAKE2B a1e1cd336d2993c5384f923f7d74e021d0f5e8db1b437fb7610fdc5858254c2d0f0f8707870bc8f7971ea99e6da1c0d84367c4ee1cffd339fb11f176b9942275 SHA512 7d5738d4fec110c526ea32aa830b2dda2f0c4a8dfecbb77e5e5fd1201be01063ff32cec1206e4b635f35592d51b800e006fe096abd4e8d65aad56d3526f5933d
+EBUILD minissdpd-1.5.20180203.ebuild 679 BLAKE2B ac75807e2d3a75b631af3ce3d90674e37cbe61a94fffc5e72bf5bf50f9f420d7d95b895c90035d081e83863082416f37f0d129199c9a941dcf644e99ffe9401d SHA512 c4d8bf10a23fdee9575f802b362ec59c8b20b805a37f2bf8a278555e11861632a92b89a688ab92d0ffbd250441b8ae5d5b3be937ff20b326f7a6266b65af5251
 MISC metadata.xml 360 BLAKE2B 7e083fa0362b52310ab298a0684308dbe220a6f6acb7b99c99cf6bf22cb9406da9d34e021a367d50eaefa67f133c5b57f01d4b63aa46887ea15bf4c66ad5e5e4 SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855
diff --git a/net-misc/minissdpd/minissdpd-1.5.20180203.ebuild b/net-misc/minissdpd/minissdpd-1.5.20180203.ebuild
new file mode 100644
index 000000000000..dea4e3034612
--- /dev/null
+++ b/net-misc/minissdpd/minissdpd-1.5.20180203.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit toolchain-funcs
+
+DESCRIPTION="MiniSSDP Daemon"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+HOMEPAGE="http://miniupnp.free.fr/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/libnfnetlink"
+
+RDEPEND="$DEPEND
+	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	emake PREFIX="${ED}" install
+	# note: we overwrite upstream's init.d
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	dodoc Changelog.txt README
+	doman minissdpd.1
+}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 580a6038c719..0a59db551013 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,5 +1,7 @@
 AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b
 AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771
 DIST miniupnpd-2.0.20171212.tar.gz 222617 BLAKE2B 6ac33048b18d9f8aeb5103f57c9982fec956a61155f8592118c38dea70801597d9e867690ef2f1cdfaf848a25d7ddb4891b3ebf37cd391b33518d6b02e6f9b4a SHA512 3ab81c840953736c662bcb6f074421052a846c7827768acd7a961a23906b9e3d3389f5b593fb6f8011c8e717dae6cd3907b6d34e7904d560378671a7fc1dd3b2
+DIST miniupnpd-2.0.20180203.tar.gz 223084 BLAKE2B 14d7b1f8136be5e211ee2e5374b8ee77dfeb3e64e1308f918d9334a8600234e38581caa293b613cd3736d4a8cfc196a54839cffa8091a36961f4e0e79c727455 SHA512 ef02e33cd93225992c193a13be2320de02255610532de77cf704573384c777d82a4cb89c295982bb660ce056e38ef341223ab362bab74b2cb6954ed4e62b0219
 EBUILD miniupnpd-2.0.20171212.ebuild 1468 BLAKE2B 646f5b6e83f38035a0658a43659645fe1df0ce75b29e2422c758c2240d73f74bdab91abd7ebdb78b030808285edd73aba09e284058e159405292b096dbda6f31 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e
+EBUILD miniupnpd-2.0.20180203.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
 MISC metadata.xml 1043 BLAKE2B 1ea4668279d5b43c5ffa7a2c95f3fec6532a2a6918fa0f1a9b6fc60f37af5524929d434da3a346aa093bc7ba8e5bde644342500606d753f43499f0df164e4782 SHA512 2f825098e0257d3242abfdbaa0ba3ae7e669912a1b81e7c0f559e208297e2bc0e82c07698f1e63c01b15170eae3560e27e8a67c3fc91598cf81b5b70f8e5101d
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20180203.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20180203.ebuild
new file mode 100644
index 000000000000..9f786c4d43a2
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.0.20180203.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
+
+RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
+	net-libs/libnfnetlink:=
+	net-libs/libmnl:=
+	dev-libs/gmp:0=
+	sys-apps/util-linux
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+src_prepare() {
+	default
+	mv Makefile.linux Makefile || die
+}
+
+src_configure() {
+	local -a opts
+	opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+	)
+
+	emake CONFIG_OPTIONS="${opts[*]}" config.h
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index da479c979a96..85f07054543d 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,3 @@
-DIST rygel-0.32.1.tar.xz 3977648 BLAKE2B 8d1777bb0092779ca545ee561e80504180cd3aeb4add0f0a41bcd8001a8130b0e52a31216414f9d4ee949fe3aaf4e607faf718c250680085692e0e262dfb0639 SHA512 55aaed85a44496792bf9bc34d150f1f9d79b7c440da4351c730580200cc7e3a19f378dd93fdf2ab5b4c19cd793a25481c2bf15f3e7043595e6971eca983f0767
 DIST rygel-0.34.0.tar.xz 3997364 BLAKE2B 2906bcdea61caddd93a7fa0363c7957ce3c0443581a625b40712d2c75f25d05c693b745f72392c917190f754533c03c524fefa80799a5e8163f44eb22c1d33da SHA512 90e582f42e73376bbe6b06f33d44c6a70969961728dc512523bcc578b5b7c3f826cb425b469ade87d3fdf82117309f8589c30b1cdd8ba74cc14424c7f2efdb21
-EBUILD rygel-0.32.1.ebuild 2473 BLAKE2B 62467c9f94cd0a587a70d41d567cbd19d96fc0955e28c15b713d9a0a0441f5f134bd9d35ee169a9c6bf3d037ad3cbb06b5dac2d099e68099bda9645d3a41d41f SHA512 8388da9196641fa5dc2e744546634718b7e733e80b6eb338828d693f5a1789416355db295da6da3b9ecd9af072b30df1d43e0b48adec9d120c87c9336557fd89
 EBUILD rygel-0.34.0.ebuild 2769 BLAKE2B e4e60beff945f8fa6901d4e6d378faa6bd669225daf055b360bdc03aaf7216d3fde8abd06a03654dc1c609936e8a99e0cc7c76a2bcf7478c12110e6fcdfbc13f SHA512 a9c9077cd0068eadf25f49ef56afd21bf6f778e4bedd92ccfdc71d90482a4eb1d2c30359d2e4f8f96ae1fc03171380299007b10d7e67238375884a2dbeca4e60
 MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce
diff --git a/net-misc/rygel/rygel-0.32.1.ebuild b/net-misc/rygel/rygel-0.32.1.ebuild
deleted file mode 100644
index 3a2cff597a19..000000000000
--- a/net-misc/rygel/rygel-0.32.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 systemd versionator virtualx
-
-DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X +introspection +sqlite tracker test transcode"
-
-# The deps for tracker? and transcode? are just the earliest available
-# version at the time of writing this ebuild
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libgee-0.8:0.8
-	>=dev-libs/libxml2-2.7:2
-	>=media-libs/gupnp-dlna-0.9.4:2.0
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmediaart-0.7:2.0
-	media-plugins/gst-plugins-soup:1.0
-	>=net-libs/gssdp-0.13
-	>=net-libs/gupnp-0.20.14
-	>=net-libs/gupnp-av-0.12.8
-	>=net-libs/libsoup-2.44:2.4
-	>=sys-apps/util-linux-2.20
-	x11-misc/shared-mime-info
-	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
-	sqlite? (
-		>=dev-db/sqlite-3.5:3
-		dev-libs/libunistring:=
-		x11-libs/gdk-pixbuf:2
-	)
-	tracker? ( >=app-misc/tracker-0.16:= )
-	transcode? (
-		media-libs/gst-plugins-bad:1.0
-		media-plugins/gst-plugins-twolame:1.0
-		media-plugins/gst-plugins-libav:1.0
-	)
-	X? ( >=x11-libs/gtk+-3:3 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-# Maintainer only
-#   app-text/docbook-xsl-stylesheets
-#	>=dev-lang/vala-0.22
-#   dev-libs/libxslt
-
-src_configure() {
-	# We set xsltproc because man pages are provided by upstream
-	# and we do not want to regenerate them automagically.
-	gnome2_src_configure \
-		XSLTPROC=$(type -P false) \
-		--enable-gst-launch-plugin \
-		--with-media-engine=gstreamer \
-		--enable-nls \
-		--with-systemduserunitdir=$(systemd_get_userunitdir) \
-		$(use_enable introspection) \
-		$(use_enable sqlite media-export-plugin) \
-		$(use_enable sqlite lms-plugin) \
-		$(use_enable test tests) \
-		$(use_enable tracker tracker-plugin) \
-		$(use_with X ui)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 0.28.2-r1 ${v}; then
-			elog "This version stops forcing the automatical starting of"
-			elog "rygel as upstream pretends. This way, it will honor the"
-			elog "user settings at Sharing section in gnome-control-center."
-			elog "If you desire to keep getting rygel autostarting always"
-			elog "you will need to configure your desktop to do it."
-			break
-		fi
-	done
-}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 64d3295c49dc..959dc59378a8 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 7665ac3b7b80..2c58bcd0fcf9 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -6,7 +6,7 @@ DIST qbittorrent-3.3.12.tar.xz 2989604 BLAKE2B c30fff7ee01a3e509a434dd6c537098f3
 DIST qbittorrent-3.3.16.tar.xz 2961420 BLAKE2B 3704e6575b1a321e04b0b9c1feee9acaf2e0ab5e0815c2cbb496265c8407c5b27111265e929ea3a516cba20acacc3b954579b5904de3411ae81726f2461dfbe0 SHA512 518ddbf8e657b3549800b5587924a8a34826895183f199b79aac72de81e6b5c009cb3b8d4fbb19151da0d96c21eb1c2f05d6ed061608cc8f589ec6fe62ce8117
 DIST qbittorrent-4.0.1.tar.xz 4256588 BLAKE2B 579e850c34c62f515807a3fb2619740442c275e9de74cd7338a9e2d72340c78a2b7f484a3ee911094cbb3b551d61a927be454466637eac2d2355e84ebec0dbd4 SHA512 76eae32ebe82953e3164a8a292132a33ccc93f5a33ce7e1ce3253f4697939b73d21e1823bada7d3b1fe7401538a7f407ebeb86c281a34e261aec0aa02d7bef80
 DIST qbittorrent-4.0.3.tar.xz 4274292 BLAKE2B c6f6a87d26f01db318ac021a8ab9f8d1ada2f7cb0d2819dfbd41e57ddbcda8a077161c78bcf8210e3571572872c13aa2255973e842c07b6b538d94ac2501c841 SHA512 d439e5428ff43ec9317bfa70b365a912a33fa12eeaad72c6916514e7b04509bf3d2e35ef9c07a36e42e7fc80f4e019f6a299fd2f93df9ec10af4a95257096ecd
-EBUILD qbittorrent-3.3.10.ebuild 1143 BLAKE2B 331fceae3e8c931e9eabb5c4c20330a73b4eb95535c7fef888e3e888c3a6897cfeefefc5efb252c8b90e71460ac09a695a06d9244c9abdea6d989a77d79d693b SHA512 61cb17043dbce205655b77e1c0012b7666b15cb48427344b57c17ad770fe95225eabcffd1d09fe4043bd9a10a9c448938a8f10802f89453bce8b884ba698fa1e
+EBUILD qbittorrent-3.3.10.ebuild 1144 BLAKE2B 93798ac8039e5a76033d7bba62ba313cd4b16a85ea97ce648e086b56d06954b98a2aa3ec6fcb924084d99a504163824ec4b5eaf64f0db8fd40e6fedecb9c2c4c SHA512 85cc4dada69a3ca2288571c0a9ba187369a3ad1bedb62a241c76de17861b24391c0ad47c1565631654772af1ac67cf058a4e3bcf707fc8078a9f17f827b5ebb2
 EBUILD qbittorrent-3.3.12.ebuild 1271 BLAKE2B 138dfc012815365b0e664395136ba19f8ad02744a1bbfa9324c90e9f714a7cb89fc0502165e7477aa8cd182bce8a9274eae95be9721171cce269fbe636c29c13 SHA512 d9c51c941f70188ece4a0eccdcb72520c04fb0e08270aa3dff9cc7d44f7033d0e4bd9ac45d8a0231c6a7287bc26fff6f084b51390de36ef704855e107436ce3f
 EBUILD qbittorrent-3.3.16.ebuild 1427 BLAKE2B 710e1375e511e52b1da0f8466a03b311b510b722b6452fb80525517e6858fbda6f535097a5d1d26fb93c5f74f5de59f8733a10a19fe835c09f2a0f0dd779631d SHA512 c658f61dc584c05ef36b7e13c115448acbb9cdf048c4a3406e2647209eaa97ee3dd0c7a71e4407b7413b9635f72766c17d9f89a3df7ae7d9c468b7107fb313bc
 EBUILD qbittorrent-4.0.1.ebuild 1353 BLAKE2B aed8773456f37a72bcbb071d66b8ee308056c7404b8b93e48f05d537fe568a8e8da49279fa15e11684b26a24ab0ddc9def215d4749347759508dac0451bc1a45 SHA512 58c97dbef3ec0faed7c60e1e120ffe0ace7a2aaed2ba4682a44b7ba5c69d50cb17961044823df46a75dab825344883a4e0624d5c05446aa5d83a2c3115e5659e
diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.10.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.10.ebuild
index 8ae2e0ecdeef..55a7a9cbfe1b 100644
--- a/net-p2p/qbittorrent/qbittorrent-3.3.10.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-3.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="http://www.qbittorrent.org/"
+HOMEPAGE="https://www.qbittorrent.org/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 6fbfc2241d49..0f29d94be8fa 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest
index 731dcc9316d9..c69448aa4103 100644
--- a/net-voip/telepathy-salut/Manifest
+++ b/net-voip/telepathy-salut/Manifest
@@ -1,5 +1,4 @@
 AUX telepathy-salut-0.5.0-uninitialized.patch 496 BLAKE2B f697051628069c6a8c6339ddee37133eab9b90b4f43553b501c611d02de4c63c14d3e4e15896987acd6d4b275a6416a777fbbfac962f90e1dd55c10872ff3939 SHA512 a6365b18b5c1f876c990ec4bbf522b2c8708ca73c201e9bac9447e3fc8d8979b3882c977e9393e34031ca2659b0519c841645280a03d11b4bac8e907db816ce9
 DIST telepathy-salut-0.8.1.tar.gz 1823482 BLAKE2B 22f93d48cc749ed74ac1ee4103ea0bf5b1f93b2d14c95a4bd2edde977a5c43db5d5fe54dd246c561ee94f13b4030ab42c011f537a0e6688e8be3ac0aa0f1ca67 SHA512 34537ac9ce0b78015e184963ea79beaa7332ac11803f9683ff34577d9f0a14f7ed287aacb2c00059f2ff2f300c325a09a78a320e83d0a0031ad976da2c197a90
 EBUILD telepathy-salut-0.8.1-r1.ebuild 1829 BLAKE2B 6434dc12ef7b7b193e5d246746e5d18f32c84d30fd73f4485d756cbee28ee52bddcf5431a52f632dd9097ff4f800a3f13e6daff60b41c82539c96b734b19aeaf SHA512 383b6c78ed67e26037f5d94d330c1b413929557c47746299ebaf5c22fc5dc3b46db82ae973f8a63d2b86da511a79ad556a5412c6546762b8942a5ff78428bc37
-EBUILD telepathy-salut-0.8.1.ebuild 1503 BLAKE2B f0e04fe612dd54f0b0598ac01edb369c8d2dea9d5185f6de57779d471c02d78996a6388c68ca5f390e416b2ce65a6b775ec8e7b5a4f3573e8e1c90555b45c30d SHA512 3090476a726d41a10546efe18c39d4425ba460bf1adf2efc7de523bb0d1ff01fca7712e2f8e77dd95263f0fd92dee05c91d30c40383b3eb969a21cad298037a0
 MISC metadata.xml 468 BLAKE2B d56336ab823a1c78eec90379dba336d33b3f0876dba77a95b3b2f8020a50903216c2ee90a77165b182b53d6c11d2a4b85a6f9acb8feff78cf6853ffd9178b612 SHA512 937c35bb0de62fd4a47e937123a16622806383ddc34e3ff1296791942a23fd81db4874c1b37cf2bbc69ece84ad37f9d36cebed328b55a633579712424eea2da0
diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
deleted file mode 100644
index 99d3cba79ec7..000000000000
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1
-
-DESCRIPTION="A link-local XMPP connection manager for Telepathy"
-HOMEPAGE="https://telepathy.freedesktop.org/wiki/CategorySalut"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~x86-linux"
-IUSE="gnutls test"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.61
-	dev-libs/libxml2
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1.1.0
-	>=net-libs/telepathy-glib-0.17.1
-	>=net-dns/avahi-0.6.22[dbus]
-	net-libs/libsoup:2.4
-	sys-apps/util-linux
-	gnutls? ( >=net-libs/gnutls-2.10.2 )
-	!gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? (
-		>=dev-libs/check-0.9.4
-		net-libs/libgsasl
-		dev-python/twisted-words )
-"
-# FIXME: needs xmppstream python module
-#               >=net-dns/avahi-0.6.22[python]
-
-src_prepare() {
-	# Fix uninitialized variable, upstream bug #37701
-	epatch "${FILESDIR}/${PN}-0.5.0-uninitialized.patch"
-}
-
-src_configure() {
-	econf \
-		--disable-coding-style-checks \
-		--disable-plugins \
-		--disable-Werror \
-		--disable-static \
-		--disable-avahi-tests \
-		--docdir=/usr/share/doc/${PF} \
-		--with-tls=$(usex gnutls gnutls openssl)
-		#$(use_enable test avahi-tests)
-}
-
-src_install() {
-	MAKEOPTS+=" -j1" default # bug 413581
-	prune_libtool_files
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b07e4273e853..e36751f41d28 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index caca20667638..c84854b4a226 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -84,7 +84,6 @@ dev-python/PyQt5 bluetooth location webengine
 # Requires unkeyworded dependencies
 dev-vcs/subversion kwallet
 games-arcade/jumpnbump kde
-kde-apps/katepart handbook
 kde-frameworks/kdelibs handbook policykit
 net-irc/quassel kde
 net-libs/libproxy kde
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index aa24aa01a74c..a93f1e7d4b71 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -71,13 +71,6 @@ sci-geosciences/qgis grass
 # This is stable masked as g-sorcery is being not actively developed.
 app-portage/layman g-sorcery
 
-# Mart Raudsepp <leio@gentoo.org> (13 Feb 2017)
-# No stable multilib supporting sys-libs/libunwind yet,
-# temporarily masked to let stabilization #601354 proceed.
-# The feature provided by this is also only useful for a
-# leak tracer, which is mostly useful for upstream CI testing.
-media-libs/gstreamer unwind
-
 # David Seifert <soap@gentoo.org> (12 Feb 2017)
 # Unknown future, stable deps are hopelessly
 # broken, only allow for unstable keywords
diff --git a/profiles/default/linux/musl/package.use.mask b/profiles/default/linux/musl/package.use.mask
index 2bb6d0614b8a..76e6603a6026 100644
--- a/profiles/default/linux/musl/package.use.mask
+++ b/profiles/default/linux/musl/package.use.mask
@@ -15,8 +15,5 @@ sys-devel/llvm sanitize
 sys-devel/gettext nls
 sys-fs/e2fsprogs nls
 
-# Broken
-dev-vcs/git gpg
-
 # See bug #576928
 media-libs/mesa nptl
diff --git a/profiles/package.mask b/profiles/package.mask
index 85ae7a0a3378..be5f49d2ba0f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Feb 2018)
+# Dead upstream, depends on deprecated Qt4.
+# Masked for removal in 30 days. Bug #644370
+media-libs/hupnp-ng
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Feb 2018)
+# Depends on deprecated Qt4, unmaintained, no one bothers to bump.
+# Masked for removal in 30 days. Bug #464658
+sys-apps/ultracopier
+
 # Andreas Sturmlechner <asturm@gentoo.org> (31 Jan 2018)
 # Dead upstream, depends on deprecated Qt4.
 # Masked for removal in 30 days. Bug #646182
@@ -294,16 +304,6 @@ media-video/2mandvd
 # Masked for removal in 30 days, no more rdeps, bug #602816
 dev-python/python-poppler-qt4
 
-# Andreas Sturmlechner <asturm@gentoo.org> (05 Jan 2018)
-# Masked for removal in 30 days, merged into dev-util/kdevelop
-dev-util/kdevplatform
-
-# Andreas Sturmlechner <asturm@gentoo.org> (05 Jan 2018)
-# Masked for removal in 30 days, no more rdeps, bug #642462
-kde-apps/katepart
-kde-apps/kdebase-data
-kde-apps/konsolepart
-
 # Alice Ferrazzi <alicef@gentoo.org> (05 Jan 2018)
 # kernel: Meltdown and Spectre - Processor flaw. (#643228)
 # Please upgrade for Intel processor flaw workaround
@@ -873,18 +873,6 @@ media-video/nvidia-settings
 # use. See bugs 603346 and 604998 for more information.
 app-admin/amazon-ec2-init
 
-# Mart Raudsepp <leio@gentoo.org> (07 Jan 2017)
-# No releases of this API version since March 2001, abandoned
-# in favour of glib:2 for 14 years; bug 604966.
-# Removed at 2017-02-08, mask kept for longer display to users.
-dev-libs/glib:1
-
-# Mart Raudsepp <leio@gentoo.org> (06 Jan 2017)
-# No releases of this API version since April 2001, abandoned
-# in favour of gtk+:2 for 14 years; bug 604862.
-# Removed at 2017-02-08, mask kept for longer display to users.
-x11-libs/gtk+:1
-
 # Robin H. Johnson <robbat2@gentoo.org> (05 Jan 2017)
 # Masking for testing
 =app-emulation/ganeti-2.16*
diff --git a/profiles/updates/2Q-2015 b/profiles/updates/2Q-2015
index 018eedc39bb6..2932ae786a8b 100644
--- a/profiles/updates/2Q-2015
+++ b/profiles/updates/2Q-2015
@@ -51,7 +51,6 @@ move kde-base/kcron kde-apps/kcron
 move kde-base/kde-l10n kde-apps/kde4-l10n
 move kde-base/kdeaccessibility-meta kde-apps/kdeaccessibility-meta
 move kde-base/kdeadmin-meta kde-apps/kdeadmin-meta
-move kde-base/kdebase-data kde-apps/kdebase-data
 move kde-base/kdebase-meta kde-apps/kdebase-meta
 move kde-base/kde-dev-scripts kde-apps/kde-dev-scripts
 move kde-base/kde-dev-utils kde-apps/kde-dev-utils
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index fe4ea45b4b5a..aeb4c5eca57e 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -30,6 +30,5 @@ move kde-base/kactivities kde-frameworks/kactivities
 move kde-base/plasma-workspace kde-plasma/plasma-workspace
 move dev-perl/extutils-pkgconfig dev-perl/ExtUtils-PkgConfig
 move kde-base/krosspython kde-apps/kross-interpreters
-move kde-base/katepart kde-apps/katepart
 move kde-base/kde-env kde-frameworks/kdelibs-env
 move kde-base/kdelibs kde-frameworks/kdelibs
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6a2339206afd..610fa3036e2d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2920,8 +2920,6 @@ dev-util/kdevelop:qmake - Enable support for QMake build system
 dev-util/kdevelop:reviewboard - Enable reviewboard support
 dev-util/kdevelop:webkit - Enable deprecated dev-qt/qtwebkit instead of dev-qt/qtwebengine for integrated documentation
 dev-util/kdevelop:welcomepage - Enable welcome page, requires dev-qt/qtdeclarative
-dev-util/kdevplatform:reviewboard - Enable reviewboard support
-dev-util/kdevplatform:welcomepage - Enable welcome page, requires dev-qt/qtdeclarative
 dev-util/ltrace:unwind - Use sys-libs/libunwind for frame unwinding support
 dev-util/lttng-tools:ust - Support LTTng-UST (Userspace Tracing)
 dev-util/massif-visualizer:callgraph - Enable detailed snapshot analysis using media-gfx/kgraphviewer
@@ -7769,6 +7767,7 @@ sys-apps/pcsc-tools:network-cron - Monthly cronjob the update-smartcard_list scr
 sys-apps/pkgcore:doc - Build and install API docs.
 sys-apps/policycoreutils:audit - Enable support for sys-process/audit and use the audit_* functions (like audit_getuid instead of getuid())
 sys-apps/portage:epydoc - Build html API documentation with epydoc.
+sys-apps/portage:gentoo-dev - Enable features required for Gentoo ebuild development.
 sys-apps/portage:ipc - Use inter-process communication between portage and running ebuilds.
 sys-apps/portage:native-extensions - Compiles native "C" extensions (speedups, instead of using python backup code). Currently includes libc-locales. This should only be temporarily disabled for some bootstrapping operations. Cross-compilation is not supported.
 sys-apps/portage:rsync-verify - Enable full-tree cryptographic verification of Gentoo repository rsync checkouts using app-portage/gemato.
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index be0d785d97d5..4a0700b0ae58 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index a74809376779..5804e99badb9 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1,5 +1,3 @@
-DIST geocode-glib-3.20.1.tar.xz 371200 BLAKE2B 7872ced7d4edee0c45c00c2e876cb307e5eac4615b194cf69bd6fbc3e50c809c9d8b85604c1273f6e65f1be1db88ca811f913124c4697c8ac676118861a3caa9 SHA512 0016b04928d3d7e9e3339bf1457d5ba7951af7af53b72a185f9cb3e92e9d1b1deb7ca11f95de1bcb0a3521a5b200ce3c25bb35eaf8bf15b81672846ec01b718f
 DIST geocode-glib-3.24.0.tar.xz 413536 BLAKE2B 37eebd39bb64d614af338e323b7c37c9bcf554d82b761c135326a9b2c0ab405901739ffe89f50c35932d162e4d2743a21caf4f446924c5d9f47bcf50eb11f4e8 SHA512 0e3910e99d164fdf5afd6befbcb7139a56779834fb1f2a318951c03e5196a31c4dafd7f88c37c7014377f15cd4d4b81e7080a440881e2c50aadaadf621abe3b6
-EBUILD geocode-glib-3.20.1.ebuild 1150 BLAKE2B 8610bf82d56eccab434d6521f16c11ac2c1ae169d878c2d8b0f12874da16fcd85b50d2fd06b79a8ed7158c99bb5f3cf8dd34710d1cdc98a0e454eb85321d0b3e SHA512 d8225ebb02239aaf5a3791b6ebbc035bc7eaef41a400443f496e7703c905d9ccade3b1c0d218dcbd8ee269f949c3fc24cb815c6f8367f9329868ac9d5c242ce0
 EBUILD geocode-glib-3.24.0.ebuild 1126 BLAKE2B a32f466ba0e92ce4f07cb8c4c3de71f45cf9d309e16aecdb3b976cca8644de0feff9d50ec69a5c30104e4b64cdf8ece6a97430d7cc7cb4a328db121ac55c3e63 SHA512 92bc4d7b61f6eb6c38268fa6ac2852a2aeb126bab0953e3280b6750cd9a4c74d024f8205d30bce000ca990ae0cf979773cd726834880f167eb76cda28e2b863e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.20.1.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.20.1.ebuild
deleted file mode 100644
index 20b873a33c43..000000000000
--- a/sci-geosciences/geocode-glib/geocode-glib-3.20.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GLib geocoding library that uses the Yahoo! Place Finder service"
-HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection test"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/json-glib-0.99.2[introspection?]
-	gnome-base/gvfs[http]
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.13
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-# eautoreconf requires:
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-# FIXME: need network #424719, recheck
-# need various locales to be present
-RESTRICT="test"
-
-src_configure() {
-	gnome2_src_configure $(use_enable introspection)
-}
-
-src_test() {
-	export GVFS_DISABLE_FUSE=1
-	export GIO_USE_VFS=gvfs
-	ewarn "Tests require network access to http://where.yahooapis.com"
-	dbus-launch emake check || die "tests failed"
-}
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index d82a0b6f958d..6c8bf771c74c 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-maps-3.22.2.tar.xz 1086264 BLAKE2B c51a387b562921704976946e244fa6bdf0abc42588a3e361e4886e08690c382cbd8f9fcdbcece48eaa9315d01c952ba161df3a799172bdeab12bf20df8eeddb2 SHA512 bdff6c55c811c9a12f2a56adfb2acbad4dfd3ceba761a4c50463b025eb9df01f5849f871b7934eae659ab8f90db7cd612694de40fdecbc9d63a3b59d343ee997
 DIST gnome-maps-3.24.3.tar.xz 1145872 BLAKE2B bd6e9652c341def652beea966d3a171a050219f3bc83288bd83eacb069899cd94d154d53bcea081bdfefdeee9b74e56c158c703ed92c9fcb5e35ecd718900e4a SHA512 b4a4c278359803e11b1aa43fb522a84b95eecfc349a134322f45db7acfe93867a61f6bd48e55a07d5d602b8161cdf5949a6b5d4da1212659e133260063ab6198
-EBUILD gnome-maps-3.22.2.ebuild 1266 BLAKE2B a45ff144d54a37368270c45540e8fd0e749a42aee64d658fb6042800f19d2bf8a1f1b810722004d03e8e5b7c12935481067b6942d22c109aadae65ecb270bd95 SHA512 44e4f35367af35d2813d53cd4a7e8ab90b5b40d9d7cbb1bb87a62fe1524d655ff65f3ae81845ce19dbc657bafedbf614423edda1d6b69a1c32641dfbf0e358b8
 EBUILD gnome-maps-3.24.3.ebuild 1273 BLAKE2B f971aaab9df9b0e7da41eec1954456e71e4fa75daa69a7636e06ebd0c4fccc44a7577a6c9592f18ebba5db450a6ada2e0334cc9324a89dfc706a151708e1bdc5 SHA512 ea5f53871629920a4b2b8b90ef65c77943e6643c2630c2f0ecb9017d526b2d86e6500d13e0f2ff8681f641e7cd89b6912b1f7aae1dac73a11029f0a73ba38470
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.22.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.22.2.ebuild
deleted file mode 100644
index 2441838d16ae..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-3.22.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A map application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=app-misc/geoclue-0.12.99:2.0[introspection]
-	>=dev-libs/folks-0.10
-	>=dev-libs/gjs-1.44.0
-	>=dev-libs/gobject-introspection-0.6.3:=
-	>=dev-libs/glib-2.39.3:2
-	>=dev-libs/libgee-0.16:0.8[introspection]
-	dev-libs/libxml2:2
-	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
-	net-libs/rest:0.7[introspection]
-	>=sci-geosciences/geocode-glib-3.15.2[introspection]
-	>=x11-libs/gtk+-3.15.9:3[introspection]
-"
-# Found by grepping imports.gi in ${S}
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/libsecret[introspection]
-	dev-libs/libgweather[introspection]
-	media-libs/clutter-gtk:1.0[introspection]
-	media-libs/clutter:1.0[introspection]
-	media-libs/cogl:1.0[introspection]
-	net-libs/gnome-online-accounts[introspection]
-	net-libs/libgfbgraph[introspection]
-	net-libs/libsoup:2.4[introspection]
-	net-libs/webkit-gtk:4[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index f4c892808d24..b5a6f93906a7 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index cb0fd884bc84..90c514c1fe75 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,11 +1,6 @@
-AUX gdal-1.5.0-soname-r1.patch 491 BLAKE2B 210a50e61990fa79c7ff3c489f0f184ab36eb655851027799015b6932a3cffd1290ad68af181d650ed5f5e209c8346148f225415469efb7437bd26995be349ea SHA512 883828de32d55a79a390f4737b640c8d50d174117e86396545d075fb5328a7e5ffffa150c11a6e9a6317b7cfd5458eb5ac543152fc2acafb1abf3688b78a573f
-AUX gdal-2.0.3-add-dlopen-support-for-jvm.patch 8840 BLAKE2B e4361d8ca2f42a74c60644cdecc3ba9329b2fb67edcecf71bad903899cfe4b1782a623dde962270c6139c442ee76a4274a5eb9afe45e81b40d4427575838621e SHA512 9af9a9a6063476a9a62807addf542b67e47a7323377f80a92ea163f9d36396879d7dd92af81d296d6bc2956c27b271c5dbe729598d91b68f64991f14e5cf8c0b
-AUX gdal-2.0.3-install_name.patch 1825 BLAKE2B 989f4c4e224dfa7974c2c29a938600d1f377931cc5c7deed11c3a9538da31dfd2a15897764ecf4b8515c7e771409f5208dfeb5437dc46318585e780e23456f76 SHA512 ebe21b9794a81de79ec6ae1e5ef225cbc74b7e36941ddec162b8ddee91778ac6cca2169464281168351fe8356ff4a14d503da7769871054f30592ce6560a0397
 AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b63e1c9b2814acc307e0b5082e7326f495102d10c4b2bdc86b17b7f4ae8ae11231c99215d87fc59217115f0fd92fc96f0 SHA512 16ed7bbd5569166c80cf4d8beba81195a177ee36bcd7e14ca6d00e3add6fe57c7980cbe1853747325443699daa331fc23e53fc86150b6c7cf871ef4812936c39
 AUX gdal-2.2.3-json-c-0.13.patch 3733 BLAKE2B 34921f8e2717a446bead6d8b07c6a8e2455752bd4534d066c4bb6150f1cd03856269a8510535517cbf60e609053e470107e9ce62d58358afcb48aa819a546563 SHA512 f4beaa11431b1eb2c6986c3da24a696cdade04f025a9bdeb9726c392aecdf597126c7735b1b2c1175bd0de71a2441b2c1e5d01e597acd7869e9c75644660994d
 AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d
-DIST gdal-2.0.3.tar.gz 11589011 BLAKE2B 2b9d319be24e377aff751c7ae4d6c89812c47fe2a0b9476936b2f3423e4f5593034a6303346e05709c9a7cffd71703ae80f72c689218ae0337794d35afcb3a1d SHA512 3ed2a084fa146fab8d5f5e039480ab935edaefebe9e55f85bf637a4487a3f56951c93055395850e7bf35d5a6d6e901f741ae01ad64be87597aabfad52f1c5e90
 DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046
-EBUILD gdal-2.0.3.ebuild 7525 BLAKE2B aa70d3e8b2bfb3213ea247f9c3c838a72cdf5e74061b6b4aa873726e14242f1d9635fc45436bebbbcaad443c89f0ad01546d02ad0f3d98238f2f8d4a006c2600 SHA512 eef801d86c845a1b880dee6aa20381ff06175d0c6b88431230e23ef772a5618455361dc6f38c5a7808d5dc97eb51cfb1fd9bf751b2d875d44d387f60fbf7685f
 EBUILD gdal-2.2.3-r1.ebuild 7470 BLAKE2B f15775486bb8a47e11191d3fb361f25f3b82fac5a6d81e2fa4e1b3161a5b9b0ace3b70c912304ed2da3d6821ea4500367ffa5919844e7e5159bf3e7c2563beb9 SHA512 dfbf230bf61217897c873a5c5feb54189a434ab783f259d8ccb293c72c7443ceec9509dfae55539088ecceea221406df3b6e76675e088c3f46daa625c2cdd693
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/files/gdal-1.5.0-soname-r1.patch b/sci-libs/gdal/files/gdal-1.5.0-soname-r1.patch
deleted file mode 100644
index ec35018868dd..000000000000
--- a/sci-libs/gdal/files/gdal-1.5.0-soname-r1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- old/GDALmake.opt.in.orig	2008-02-02 18:25:48.000000000 -0800
-+++ new/GDALmake.opt.in	2008-02-02 18:54:53.000000000 -0800
-@@ -97,6 +97,10 @@
- GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
- 
-+# for building without libtool
-+GDAL_SLIB_SO_VER =	$(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
-+GDAL_SLIB_SONAME =	-Wl,-soname,libgdal.$(SO_EXT).$(GDAL_VERSION_MAJOR)
-+
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
- 
diff --git a/sci-libs/gdal/files/gdal-2.0.3-add-dlopen-support-for-jvm.patch b/sci-libs/gdal/files/gdal-2.0.3-add-dlopen-support-for-jvm.patch
deleted file mode 100644
index 7c35d1cb1242..000000000000
--- a/sci-libs/gdal/files/gdal-2.0.3-add-dlopen-support-for-jvm.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From baba2c213770972e79be6be4902716278f351fb4 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Wed, 24 Aug 2016 23:32:13 +0100
-Subject: [PATCH 1/2] Allow libjvm.so to be dlopen'd with --with-jvm-lib=dlopen
-
-Having to set LD_LIBRARY_PATH is a pain and relying on the rpath can
-be problematic when libjvm.so lives in a versioned directory. Some
-distributions even allow per-user JVM selection so checking the value
-of JAVA_HOME at runtime allows this choice to be respected.
-
-libjvm.so's location is hard to predict (amd64 vs i386, jre or not?)
-so ${JAVA_HOME}/bin/java -XshowSettings is executed to find its
-location. If JAVA_HOME is not set then java is executed from the PATH
-instead.
----
- gdal/configure                              | 11 +++++-
- gdal/configure.in                           |  7 +++-
- gdal/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp | 57 +++++++++++++++++++++++++++--
- gdal/port/cpl_config.h.in                   |  3 ++
- 4 files changed, 71 insertions(+), 7 deletions(-)
-
-diff --git a/configure b/configure
-index 75e4e279de..acdfa439de 100755
---- a/configure
-+++ b/configure
-@@ -1753,7 +1753,7 @@ Optional Packages:
-   --with-python=ARG   Enable python bindings (ARG=yes, no, or path to python binary)
-   --with-java       Include Java support (ARG=yes, no or JDK home path)  [default=no]
-   --with-mdb       Include MDB driver
--  --with-jvm-lib=ARG        ARG points to Java libjvm path
-+  --with-jvm-lib=ARG        ARG is dlopen or points to Java libjvm path
-   --with-jvm-lib-add-rpath    Add the libjvm path to the RPATH (no by default)
-   --with-rasdaman=DIR        Include rasdaman support (DIR is rasdaman's install dir).
-   --with-armadillo=ARG       Include Armadillo support for faster TPS transform computation (ARG=yes/no/path to armadillo install root) [default=no]
-@@ -29491,7 +29491,14 @@ if test "${with_jvm_lib_add_rpath+set}" = set; then :
- fi
- 
- 
--    if test "x$with_jvm_lib" != "x"; then
-+    if test "x$with_jvm_lib" = "xdlopen"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define JVM_LIB_DLOPEN 1
-+_ACEOF
-+
-+        JVM_LIB="-ldl"
-+    elif test "x$with_jvm_lib" != "x"; then
-         if test -d "$with_jvm_lib"; then
-             saved_LDFLAGS="$LDFLAGS"
-             LDFLAGS="$LDFLAGS -L$with_jvm_lib"
-diff --git a/configure.in b/configure.in
-index 91efa5a32a..546ff04049 100644
---- a/configure.in
-+++ b/configure.in
-@@ -4213,11 +4213,14 @@ if test "$with_mdb" = "yes" ; then
-         AC_MSG_ERROR("--with-java must be specified.")
-     fi
- 
--    AC_ARG_WITH(jvm-lib,          [  --with-jvm-lib=[ARG]        ARG points to Java libjvm path],,)
-+    AC_ARG_WITH(jvm-lib,          [  --with-jvm-lib=[ARG]        ARG is dlopen or points to Java libjvm path],,)
- 
-     AC_ARG_WITH(jvm-lib-add-rpath,[  --with-jvm-lib-add-rpath    Add the libjvm path to the RPATH (no by default)],,)
- 
--    if test "x$with_jvm_lib" != "x"; then
-+    if test "x$with_jvm_lib" = "xdlopen"; then
-+        AC_DEFINE_UNQUOTED(JVM_LIB_DLOPEN, 1, [Define to 1 if libjvm.so should be dlopen'd])
-+        JVM_LIB="-ldl"
-+    elif test "x$with_jvm_lib" != "x"; then
-         if test -d "$with_jvm_lib"; then
-             saved_LDFLAGS="$LDFLAGS"
-             LDFLAGS="$LDFLAGS -L$with_jvm_lib"
-diff --git a/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp b/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp
-index b068adf777..bc54a115df 100644
---- a/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp
-+++ b/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp
-@@ -29,6 +29,11 @@
- 
- #include "ogr_mdb.h"
- 
-+#if JVM_LIB_DLOPEN
-+#include <limits.h>
-+#include <stdio.h>
-+#endif
-+
- CPL_CVSID("$Id: ogrmdbjackcess.cpp 27044 2014-03-16 23:41:27Z rouault $");
- 
- static JavaVM *jvm_static = NULL;
-@@ -161,9 +166,41 @@ int OGRMDBJavaEnv::Init()
-     {
-         JavaVM* vmBuf[1];
-         jsize nVMs;
-+        int ret = 0;
-+
-+#if JVM_LIB_DLOPEN
-+        const char *jvmLibPtr = "libjvm.so";
-+        char jvmLib[PATH_MAX];
-+
-+        FILE *javaCmd = popen("\"${JAVA_HOME}${JAVA_HOME:+/bin/}java\" -XshowSettings 2>&1 | sed -n '/\\bsun\\.boot\\.library\\.path =/s:.* = \\(.*\\):\\1/server/libjvm.so:p'", "r");
-+
-+        if (javaCmd != NULL)
-+        {
-+            size_t javaCmdRead = fread(jvmLib, 1, PATH_MAX, javaCmd);
-+            ret = pclose(javaCmd);
-+
-+            if (ret == 0 && javaCmdRead >= 2)
-+            {
-+                /* Chomp the new line */
-+                jvmLib[javaCmdRead - 1] = '\0';
-+                jvmLibPtr = jvmLib;
-+            }
-+        }
-+
-+        jint (*pfnJNI_GetCreatedJavaVMs)(JavaVM **, jsize, jsize *);
-+        pfnJNI_GetCreatedJavaVMs = (jint (*)(JavaVM **, jsize, jsize *))
-+            CPLGetSymbol(jvmLibPtr, "JNI_GetCreatedJavaVMs");
-+
-+        if (pfnJNI_GetCreatedJavaVMs == NULL)
-+            return FALSE;
-+        else
-+            ret = pfnJNI_GetCreatedJavaVMs(vmBuf, 1, &nVMs);
-+#else
-+        ret = JNI_GetCreatedJavaVMs(vmBuf, 1, &nVMs);
-+#endif
- 
-         /* Are we already called from Java ? */
--        if (JNI_GetCreatedJavaVMs(vmBuf, 1, &nVMs) == JNI_OK && nVMs == 1)
-+        if (ret == JNI_OK && nVMs == 1)
-         {
-             jvm = vmBuf[0];
-             if (jvm->GetEnv((void **)&env, JNI_VERSION_1_2) == JNI_OK)
-@@ -194,8 +231,22 @@ int OGRMDBJavaEnv::Init()
-                 args.nOptions = 0;
-             args.ignoreUnrecognized = JNI_FALSE;
- 
--            int ret = JNI_CreateJavaVM(&jvm, (void **)&env, &args);
--            if (ret != 0 || jvm == NULL || env == NULL)
-+#if JVM_LIB_DLOPEN
-+            jint (*pfnJNI_CreateJavaVM)(JavaVM **, void **, void *);
-+            pfnJNI_CreateJavaVM = (jint (*)(JavaVM **, void **, void *))
-+                CPLGetSymbol(jvmLibPtr, "JNI_CreateJavaVM");
-+
-+            if (pfnJNI_CreateJavaVM == NULL)
-+                return FALSE;
-+            else
-+                ret = pfnJNI_CreateJavaVM(&jvm, (void **)&env, &args);
-+#else
-+            ret = JNI_CreateJavaVM(&jvm, (void **)&env, &args);
-+#endif
-+
-+            CPLFree(pszClassPathOption);
-+
-+            if (ret != JNI_OK || jvm == NULL || env == NULL)
-             {
-                 CPLError(CE_Failure, CPLE_AppDefined, "JNI_CreateJavaVM failed (%d)", ret);
-                 return FALSE;
-diff --git a/port/cpl_config.h.in b/port/cpl_config.h.in
-index 313729fd3e..e8fa21140a 100644
---- a/port/cpl_config.h.in
-+++ b/port/cpl_config.h.in
-@@ -161,6 +161,9 @@
- /* For .cpp files, define as const if the declaration of iconv() needs const. */
- #undef ICONV_CPP_CONST
- 
-+/* Define to 1 if libjvm.so should be dlopen'd */
-+#undef JVM_LIB_DLOPEN
-+
- /* Define to the sub-directory in which libtool stores uninstalled libraries.
-    */
- #undef LT_OBJDIR
--- 
-2.11.0
-
-
-From cd6bbb60ced62b6176482e86c54ab618e2592ac8 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Thu, 25 Aug 2016 21:26:20 +0100
-Subject: [PATCH 2/2] Fetch jackcess classpath using java-config instead of
- using CLASSPATH
-
----
- gdal/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp | 26 ++++++++++++++++++++++----
- 1 file changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp b/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp
-index bc54a115df..5b0972677e 100644
---- a/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp
-+++ b/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp
-@@ -218,19 +218,37 @@ int OGRMDBJavaEnv::Init()
-             JavaVMInitArgs args;
-             JavaVMOption options[1];
-             args.version = JNI_VERSION_1_2;
--            const char* pszClassPath = CPLGetConfigOption("CLASSPATH", NULL);
--            CPLString osClassPathOption;
-+
-+            FILE *javaCmd = popen("java-config --with-dependencies --classpath=jackcess-1", "r");
-+
-+            const char* pszClassPath = NULL;
-+            if (javaCmd != NULL)
-+            {
-+                pszClassPath = CPLReadLine(javaCmd);
-+                ret = pclose(javaCmd);
-+
-+                if (ret != 0)
-+                    pszClassPath = NULL;
-+            }
-+
-+            if (pszClassPath == NULL)
-+                pszClassPath = CPLGetConfigOption("CLASSPATH", NULL);
-+
-+            char* pszClassPathOption = NULL;
-             if (pszClassPath)
-             {
-                 args.nOptions = 1;
--                osClassPathOption.Printf("-Djava.class.path=%s", pszClassPath);
--                options[0].optionString = (char*) osClassPathOption.c_str();
-+                pszClassPathOption = CPLStrdup(CPLSPrintf("-Djava.class.path=%s", pszClassPath));
-+                options[0].optionString = pszClassPathOption;
-                 args.options = options;
-             }
-             else
-                 args.nOptions = 0;
-             args.ignoreUnrecognized = JNI_FALSE;
- 
-+            if (javaCmd != NULL)
-+                CPLReadLine(NULL);
-+
- #if JVM_LIB_DLOPEN
-             jint (*pfnJNI_CreateJavaVM)(JavaVM **, void **, void *);
-             pfnJNI_CreateJavaVM = (jint (*)(JavaVM **, void **, void *))
--- 
-2.11.0
-
diff --git a/sci-libs/gdal/files/gdal-2.0.3-install_name.patch b/sci-libs/gdal/files/gdal-2.0.3-install_name.patch
deleted file mode 100644
index 1e83d55ecf7d..000000000000
--- a/sci-libs/gdal/files/gdal-2.0.3-install_name.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Unbreak compilation on Darwin
-
-Author: Fabian Groffen <grobian@gentoo.org>
-
---- gdal-2.0.3.old/GDALmake.opt.in
-+++ gdal-2.0.3/GDALmake.opt.in
-@@ -104,6 +104,10 @@ GDAL_LIB	= 	$(GDAL_ROOT)/libgdal.a
- GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
- 
-+# for building without libtool
-+GDAL_SLIB_SO_VER =	$(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
-+GDAL_SLIB_SONAME =	-install_name $(INST_LIB)/libgdal.$(GDAL_VERSION_MAJOR).$(SO_EXT)
-+
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
- 
---- gdal-2.0.3.old/GNUmakefile
-+++ gdal-2.0.3/GNUmakefile
-@@ -208,7 +208,7 @@ else
- 
- ifeq ($(HAVE_LD_SHARED),yes)
- 
--GDAL_SLIB_B	=	$(notdir $(GDAL_SLIB))
-+GDAL_SLIB_B	=	libgdal
- 
- install-lib:
- 
-@@ -216,14 +216,14 @@ install-lib:
- ifeq ($(MACOSX_FRAMEWORK),yes)
- 	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/GDAL
- else
--	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B)
--	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR)
--	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
--	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-+	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).dylib
-+	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib
-+	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib
-+	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib
- 	(cd $(DESTDIR)$(INST_LIB) ; \
--	 ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR))
-+	 ln -s $(GDAL_SLIB_B).$(GDAL_VER).dylib $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib)
- 	(cd $(DESTDIR)$(INST_LIB) ; \
--	 ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) $(GDAL_SLIB_B))
-+	 ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib $(GDAL_SLIB_B).dylib)
- 	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/gdalplugins
- endif
- 
diff --git a/sci-libs/gdal/gdal-2.0.3.ebuild b/sci-libs/gdal/gdal-2.0.3.ebuild
deleted file mode 100644
index ee3dfedc4d87..000000000000
--- a/sci-libs/gdal/gdal-2.0.3.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/2"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads xls"
-
-COMMON_DEPEND="dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libxml2:=
-	media-libs/tiff:0=
-	sci-libs/libgeotiff
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	mdb? ( dev-java/jackcess:1 )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc?   ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( >=app-text/poppler-0.24.3:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	spatialite? ( dev-db/spatialite )
-	xls? ( dev-libs/freexl )"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.7:* )"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.7:* )
-	perl? ( dev-lang/swig:0 )
-	python? ( dev-lang/swig:0 )"
-
-REQUIRED_USE="mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
-src_prepare() {
-	local PATCHES=()
-	local PATCHES=( "${FILESDIR}"/gdal-2.0.3-add-dlopen-support-for-jvm.patch )
-
-	# -soname is only accepted by GNU ld/ELF
-	if [[ ${CHOST} == *-darwin* ]]; then
-		PATCHES+=( "${FILESDIR}"/${PN}-2.0.3-install_name.patch )
-	else
-		PATCHES+=( "${FILESDIR}"/${PN}-1.5.0-soname-r1.patch )
-	fi
-
-	# fix datadir and docdir placement
-	sed -i \
-		-e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		"${S}"/GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -i \
-		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		"${S}"/swig/python/GNUmakefile || die
-
-	# Fix spatialite/sqlite include issue
-	sed -i \
-		-e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -i \
-		-e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		configure.in || die
-
-	sed \
-		-e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.in || die
-
-	sed \
-		-e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# updated for newer swig (must specify the path to input files)
-	sed -i \
-		-e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		swig/python/GNUmakefile || die "sed python makefile failed"
-	sed -i \
-		-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-		swig/python/setup.cfg || die "sed python setup.cfg failed"
-
-	default
-
-	# bug 626844, poppler headers require C++11
-	use pdf && append-cxxflags -std=c++11
-
-	tc-export AR RANLIB
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myopts=""
-
-	if use java; then
-		myopts+="
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-lib=dlopen
-			$(use_with mdb)"
-	else
-		myopts+=" --without-java --without-mdb"
-	fi
-
-	if use sqlite; then
-		myopts+=" LIBS=-lsqlite3"
-	fi
-
-	# pcidsk is internal, because there is no such library yet released
-	#     also that thing is developed by the gdal people
-	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-	# bsb - legal issues
-	# ingres - same story as oracle oci
-	# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
-	# podofo - we use poppler instead they are exclusive for each other
-	# tiff is a hard dep
-	ECONF_SOURCE="${S}" econf \
-		--includedir="${EPREFIX}/usr/include/${PN}" \
-		--disable-static \
-		--enable-shared \
-		--with-expat \
-		--with-geotiff \
-		--with-grib \
-		--with-libtiff \
-		--with-libz="${EPREFIX}/usr/" \
-		--with-ogr \
-		--without-bsb \
-		--without-dods-root \
-		--without-dwgdirect \
-		--without-epsilon \
-		--without-fme \
-		--without-grass \
-		--without-hdf4 \
-		--without-idb \
-		--without-ingres \
-		--without-jasper \
-		--without-jp2mrsid \
-		--without-kakadu \
-		--without-libtool \
-		--without-mrsid \
-		--without-msg \
-		--without-pcraster \
-		--without-podofo \
-		--without-sde \
-		$(use_enable debug) \
-		$(use_with armadillo) \
-		$(use_with aux_xml pam) \
-		$(use_with curl) \
-		--without-ecw \
-		$(use_with fits cfitsio) \
-		$(use_with geos) \
-		$(use_with gif) \
-		$(use_with gml xerces) \
-		$(use_with hdf5) \
-		$(use_with jpeg pcidsk) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k openjpeg) \
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
-		$(use_with netcdf) \
-		$(use_with oracle oci) \
-		$(use_with odbc) \
-		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
-		$(use_with opencl) \
-		$(use_with pdf poppler) \
-		$(use_with perl) \
-		$(use_with png) \
-		$(use_with postgres pg) \
-		$(use_with python) \
-		$(use_with spatialite) \
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
-		$(use_with threads) \
-		$(use_with xls freexl) \
-		${myopts}
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -i \
-			-e "s: -rdynamic : :" \
-			GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_install
-		popd > /dev/null || die
-		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
-			-i GDALmake.opt || die
-	fi
-
-	use perl && perl_delete_localpod
-
-	local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
-	use doc && HTML_DOCS=( html/. )
-
-	default
-
-	python_install() {
-		distutils-r1_python_install
-		python_doscript scripts/*.py
-	}
-
-	if use python; then
-		# Don't clash with gdal's docs
-		unset DOCS HTML_DOCS
-
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		newdoc swig/python/README.txt README-python.txt
-
-		insinto /usr/share/${PN}/samples
-		doins swig/python/samples/*
-	fi
-
-	doman "${S}"/man/man*/*
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 76837d975bb7..ac867a4eafbc 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index ffc5cf20be86..dbdc60d9ecbe 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,4 +1,6 @@
 AUX ack-2.14-gentoo.patch 431 BLAKE2B 61a7313811afc88f3289609998902d03de0b11b0b01c95e5be5a656995909584f46fd844d4e3befdad22ac83f16d66a04b1f8e53abb92a75ab3e185c8013bcd4 SHA512 5eeceda1a764358b4d7f8836cce41d21cdb895f2763325ddfd7ad7456af3d55807113a3702834f097fd513fef20db8de4003344d9ea73a58dac64d4c68e0e99b
 DIST ack-2.18.tar.gz 232279 BLAKE2B dc7c347eee2be367a2b1bd4839719661f1c0de68bd3fcb3512c68cb5c42e09e8208712e7e3c57b418a00c961a933574a0c09c7f107fe43a4f96efeae21fbc8d8 SHA512 4147161baa8d82fb84b29980d5eac7cf3197733192ca827d3fa4e8f55fa9df29d92b2ac21beb69df00186eea03c7ae6fcb85d6e4334a0a21c232ddeb4933bcf5
+DIST ack-2.22.tar.gz 250275 BLAKE2B 52cafe63b6f4aa50feb3a8d68141662fbbec7a73d31b2f06d3d63c7efb9ba681214ac20fbfd299f680d4e3758eaed8b4b9b3cd697f38977f2e0657a90dc0478a SHA512 d0073c424d861f2cfdc2ce8c0dfa149620803b4c30adb6c6f4f8896277ac89bb6d97d3e8e9bdfd1202f95808bd387b2e3a8353a3e7d204cdd61eb9cafde48303
 EBUILD ack-2.18-r1.ebuild 776 BLAKE2B ccd1290eedd9cd29692386364406ebac8202c2584cd35579dfecf4e1c21fb60c201ea6bfa9aefe19ad0fa0b57c1f483dccda6c66a5a72d1f2e57f3570ac6de6c SHA512 25979e6b277a49c9b087b987ccc14192d53f9f55ed7efbd55a491f14c2219f7fdeb0ed805e835ea58c893277ea35cc5f43f0974f65454e6fed352c570b468ffe
+EBUILD ack-2.22.ebuild 778 BLAKE2B 56b352c5f7d0ad66432f7bdd241b90bd9ce262d7501639793e267576e5e3747deb73ef8af5aae0cd522769040fc52ca310efeb8b6d9a603c7092335ee50035c9 SHA512 ff81502cb1783bb173909ac3b729fd252b7c6fba7f8218ad951feaa2a9c97e47aca615394c82d40f338dcc9fc5de4ebb591042572862618ad1e2d2990f8fed1a
 MISC metadata.xml 1725 BLAKE2B 7787caf338ec9ba64acce9d2fcb542279db07d0c19001073e65a3904ac313b62d0f1fcf5df1445a86f4aeacb8563b7f179d077fda31514db4454c50a81599341 SHA512 9ceab2bd4b599aa83b1b780b322b753a5bdfb51b4883aa804907f5d5d8420276c75a04ae717f8520778cb3fc25ba4c4a710a64ddd49193f050992436c0faeb8f
diff --git a/sys-apps/ack/ack-2.22.ebuild b/sys-apps/ack/ack-2.22.ebuild
new file mode 100644
index 000000000000..3e28da27b33c
--- /dev/null
+++ b/sys-apps/ack/ack-2.22.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DIST_AUTHOR=PETDANCE
+inherit perl-module
+
+DESCRIPTION="ack is a tool like grep, optimized for programmers"
+HOMEPAGE="https://beyondgrep.com/ ${HOMEPAGE}"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=dev-perl/File-Next-1.160.0"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/IO-Tty )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.14-gentoo.patch )
+
+src_test() {
+	# Tests fail when run in parallel and if dev-perl/IO-Tty is installed
+	# which enables interactive tests that need to read from stdin. If IO-Tty
+	# is not installed the related tests are skipped.
+	MAKEOPTS+=" -j1" perl-module_src_test
+}
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 46a63ee9f838..e8d711b32c9c 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,5 +1,3 @@
-DIST baobab-3.22.1.tar.xz 947932 BLAKE2B 820c483964ef44d9ce557253128030044f456986e4c71bc0c2e64436290fd2b9e4aeadb1cb717179de68064faf80df5deaeced91d535eb5ae084abeb897b62fd SHA512 6fae974ef79dc9b61269cc07fcdb4f6d8f043cf3eb8239c2408a7ccb1445800c1beda85da8ae9e0da1a39604e4896a6aab0ab04391286df20c20783d208c6c36
 DIST baobab-3.24.0.tar.xz 970636 BLAKE2B bac7397a0b157723f8341b09b7e00fdaef2a50803ff901be6c307aa733b72478f7b3f62850e3e8445b79d1ad17668c617655aa7268402a487ee6e10267d0a7a2 SHA512 7a16cdc7b4e77e8bad23bccc171b4e552b2eb33a43822579cdf4b1d5ac76526955c0efeadf355fcda3a72b1fd6f8dbf2a6088406b5a21b8ecc4d06ff525baa17
-EBUILD baobab-3.22.1.ebuild 826 BLAKE2B f6eb457e87e64cda16727b3a3f1a54e404f4c0e44102205a0456d0112dfe5346bcacf21fb7738a77ccd862673146250c7ae4bce29e296d5150ee04244ddfca56 SHA512 9f7237475393c82e795a34f2e52bc7104b0200d435643ab54eeca2bde42c059282fbb224c4aa655bda6ffa66dd2c910ce9e5e3519a5c11cea0037443b5424690
 EBUILD baobab-3.24.0.ebuild 826 BLAKE2B 2710c2b9102a30500cdf8e27dbc22be0145c293f615be673ff41a634f82f61bc76e9ae17fba1aab1c8a4acb918e2d03471563ffc5fb4468683d312d3a6cd2e23 SHA512 c617bd4aa3327aebd0c9576b6921b38dc309bed6cd7dfa339a8293c261109bbafb5092f9db6da6c1ba575eb1dbceb32be0f2a982c0b4f47a0abf1e67d062f7b9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/baobab/baobab-3.22.1.ebuild b/sys-apps/baobab/baobab-3.22.1.ebuild
deleted file mode 100644
index 25b752e2597a..000000000000
--- a/sys-apps/baobab/baobab-3.22.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Disk usage browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2[dbus]
-	>=x11-libs/gtk+-3.19.1:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	x11-themes/adwaita-icon-theme
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure   \
-		VALAC=$(type -P true)  \
-		VAPIGEN=$(type -P true)
-}
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index b9979205d768..cb0cd1e2f27f 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-disk-utility-3.22.1.tar.xz 1455508 BLAKE2B 49075e3b6e413a6c69e483004aba7fe4212c2494992f7177ae8ea139bab9f4f657e9ce756ba558b073a09c7c8fe24f58e470bb52811a7bc98fb9c6048ed9b98c SHA512 f8ea64eb5adc3d6d55669bfa85c80a23f91ecb86f8632ae4ef035ad5062375e4fd73581f6ad12f6d83b1d6d98508a046b64a5a6544dea59765da2ff4b42b2d37
 DIST gnome-disk-utility-3.24.1.tar.xz 1947976 BLAKE2B a3b9d02417bed415bf6b9b8d86abcfa857abe316133ce7abfa11db835831e916d879b09d1e1129d12621b0234ffa27c1e246837cb614c51c54ce387a9c73bea4 SHA512 ae6bf83e005733ae985987411a9fe25b0059f64484fc0d613ad54af478130782974607bec53713ee36c2a28de653ceba82b0fb091aee57101773c0eeeaaed2d5
-EBUILD gnome-disk-utility-3.22.1.ebuild 1058 BLAKE2B 93b66145017932d9f09b7b660e4a17486d45311911e67cfbc8a9685078e18725f7a080a0333b8adb57b7650155e2cd3fe015f91a7ab20e3086387ed917f819d4 SHA512 5d521e064f7af967328969c485fe93247560bc9d05396e4096faf470b3b9c09fdcce389a7e50e5340de289e264b4b89d7dfcf5c0ba216e67ac3c5b61a4088671
 EBUILD gnome-disk-utility-3.24.1.ebuild 1065 BLAKE2B a94d3c210fe8038a595a61e0eb50b6ab7444c39222d4c2e6643698ccad2a3e3ffc5edb3a64c8dbfc95c5a701e889c8405af46412752d23bd59201703c84d1c80 SHA512 810ae41d78b5ada6e2200a73065fb83004377129441c1460aab85bb3d008ac789b3810af70e52f8b1d161fa2bf8969c7c33917678d84ec405b2adb904d230f4f
 MISC metadata.xml 348 BLAKE2B 78a8cab4d641fbf3a66632f3f22b66f271f39ec44c6afe18b7e2ee3b049f36a5fa1ffc29964cb293125061f4b2be45ac9f09e136f42aef428375bf3630e92643 SHA512 7da9aaf34df822f6f62b606fb00655a4d2a7bf710cb9e265dea98b887365d64536c927caa2810b9b1d92dbeb8c93f9e09b7e529e4304bdc4de5d4f6d61208c24
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.22.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.22.1.ebuild
deleted file mode 100644
index 93b42aaebd36..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.22.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="https://git.gnome.org/browse/gnome-disk-utility"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="fat gnome systemd"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
-
-COMMON_DEPEND="
-	>=app-arch/xz-utils-5.0.5
-	>=app-crypt/libsecret-0.7
-	>=dev-libs/glib-2.31:2[dbus]
-	dev-libs/libpwquality
-	>=media-libs/libcanberra-0.1[gtk3]
-	>=media-libs/libdvdread-4.2.0
-	>=sys-fs/udisks-2.1.1:2
-	>=x11-libs/gtk+-3.16.0:3
-	>=x11-libs/libnotify-0.7:=
-	systemd? ( >=sys-apps/systemd-209:0= )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	fat? ( sys-fs/dosfstools )
-	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.2
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable gnome gsd-plugin) \
-		$(use_enable systemd libsystemd)
-}
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 94b448885f82..5d622b40975d 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,5 +1,5 @@
-DIST moreutils-0.60.tar.gz 93137 BLAKE2B 223fdcb162ce7a17a12b1b26f9b77d210cdf2b44492632dcfa75005d0a9872ff90153b6240ed5b96a0a413b323b60d5b5380e79f2f2059e401837ecc5dd6aba3 SHA512 b09b81606fc307abe26173fbd2e50ab3ee84db53b7242dc57a0747a83489088b1702435cfad5a171af00d56ab154b9d4c3062a3d4ac7c002dc03315c6fca0cab
 DIST moreutils-0.61.tar.gz 93234 BLAKE2B cfa3c24d68ca0f9ef220ef97e0ac50a77e557cc399ef898d15a56d4e205ba180f494ca7a89a566e4dea28eebf08590fbd94b75f7850f941a8a22eba147f8e61d SHA512 6164680c8bfec02f7a84274b1d4342a1d6c296e14843496dcc9f9ac71b3e3b1663dea72e2251a546a646775afa70589483e8d5da71b388b1022476bb3dd91b56
-EBUILD moreutils-0.60-r1.ebuild 1478 BLAKE2B 92147d9ede5c7b0aabf8e33c132432a240a093e0a9eab2df89e51f34da0f6409885239c4663b9acac2536d21c2cfb994bafc80b0370f3265dfd7836f09125648 SHA512 2837b8041fa09763834a3ac0698bd6a16d246e9d58e1bc7957e2a527f85f0cfed145df81838c3e5f5f90521ac2e84acaeaa4b599befadac86e435cbc23d871a9
+DIST moreutils-0.62.tar.gz 93711 BLAKE2B b8d8cf7c83c3a9fc6a3fb1677954520dcc884ba81eebdf7cde2232f8aea7177f4c79dbce84ff20cf20f924af279c6e02683dfd082ad35237cc0109cddfe30e14 SHA512 100d8129572c1b9ef1381150b69cbcd1762700e66c0ffa0ea849989352bc1bad77b67c5dbc00c159ca6c02905585dbfa3c8a5d88e910da9daaf27b5dba9f2367
 EBUILD moreutils-0.61.ebuild 1478 BLAKE2B 92147d9ede5c7b0aabf8e33c132432a240a093e0a9eab2df89e51f34da0f6409885239c4663b9acac2536d21c2cfb994bafc80b0370f3265dfd7836f09125648 SHA512 2837b8041fa09763834a3ac0698bd6a16d246e9d58e1bc7957e2a527f85f0cfed145df81838c3e5f5f90521ac2e84acaeaa4b599befadac86e435cbc23d871a9
+EBUILD moreutils-0.62.ebuild 1504 BLAKE2B 87b156ba026a3d9213bd993ea3426094d66008c90f4c8a1609e6d43e5e65ee34f7c72ae91483a023edfe88f8dc139e2b28013bc2b34ff1c73611640e07cd99f4 SHA512 9653beffb5939ccc07242d8dbb57f004b92975d207bb3538a13d089d954cb0a6f5465f7a90f45e7fc03cb848e996cc9d5e694ca8e50e8aefb783ab6ac47290ab
 MISC metadata.xml 313 BLAKE2B 66183e9cd23dd84df66abc1f3e229607f3a234f6a07a29cb2246c130cf214fe5ab1275c6f96b5804e27ebc8b867236c49261369756cfaf9dc563dae60f387be5 SHA512 75fcc8c041bbe324b5c1bcd0b006b7cfc17b5b2ae4bf0ef711b9ef4d3233917d4a189320ef06f3165e23f33ac7e6e58d1545cb4c2082eb22a052d09817cecc6f
diff --git a/sys-apps/moreutils/moreutils-0.60-r1.ebuild b/sys-apps/moreutils/moreutils-0.62.ebuild
index b16d74ba1408..2e245cd08c2e 100644
--- a/sys-apps/moreutils/moreutils-0.60-r1.ebuild
+++ b/sys-apps/moreutils/moreutils-0.62.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux"
 IUSE="+doc +perl"
 
 RDEPEND="
@@ -45,7 +45,7 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
-	emake CFLAGS="${CFLAGS}" DOCBOOK2XMAN=docbook2man.pl PREFIX="${EPREFIX}/usr"
+	emake CFLAGS="${CFLAGS}" DOCBOOKXSL=/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
 }
 
 src_install() {
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f35b8b22e26c..d73f54fcdd1d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -14,8 +14,8 @@ EBUILD portage-2.3.14.ebuild 8512 BLAKE2B e32c3ee1a5828cdbe53aad326c4dc6fbdcd57b
 EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025
 EBUILD portage-2.3.19-r1.ebuild 8410 BLAKE2B 1a3753ecea5555ac11a60b3ded94a75cdffb931a828927fd5d01cc0d544bccbaa35a5ac559001d02c4a8df7cdd61939bb60785cc7c0e518a30470b3a611c1829 SHA512 c91fd81e456c454614c23609776aa10de0a3e1f1114ef6bc03b15db6715109aab31e357e7ce7bb2b5f4873c1e64585ed060d52533874b745c430e1050e929bab
 EBUILD portage-2.3.20.ebuild 8417 BLAKE2B 9810d0113d505f17d79427d42b5d065b07495f1ec024bd853d7390ebb6226fc355aec038a7ade04fece97d21e68ad61fa063a238cc379173f5dd02cf4af42b38 SHA512 96e5a26737bfc3e10805fffd07ab7509d1888e96534b0df113fc00e18040671bfca8c0b7d12336d73e972f64862093af2f3b8cabcad2571234599450406be263
-EBUILD portage-2.3.24.ebuild 8803 BLAKE2B 5076b248daa81e66a9759758529e765bb5529d0d9feb9fc10eaa9f87ac803245e5f56c0a129d72e841445ff013f140276ea8b0db708dc1e080b27ff203a068d2 SHA512 fab0f077cb2504b8b841c8f23a133d72d4e4a8b09b209e6585001790eed67959470311b83c2324dd559208ad490f2c2c15aeb49de79433580ed7d2f48662eb75
+EBUILD portage-2.3.24.ebuild 9060 BLAKE2B 99d54431fbb867be7692140f1b86bb322033f6c27cc37c66ee0e6f752cf976737357fd79b4277b1a2c63ccbad33f82434f47976060aeb18be8cbdf1c68d6fbb9 SHA512 a8ba4d3958fae0c6a13470e7f812fcdc177b6dabc3f7c2f37b0dd47d6ab581e27954b92ea339ca4a8a74ffe475162560492d2fb3055a4b1f1a569f949f6bbe29
 EBUILD portage-2.3.6.ebuild 8638 BLAKE2B 0c50b63b0b233cc9d6d13e914659b0057c7f330e05906d4cd7ee19bef5ad2874749a403e48252e321a42e8109213cb7d6861aa7fffe9616447b2587f5d4a4810 SHA512 a80367ffbeaf00d887e0af09e239a8deb7d37818db50a6f3df59aa2c0ed7b8b6fe233f0520aebfdfad583694f1f6b7252d35d00d9bea2943251fd7b216bee602
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
-EBUILD portage-9999.ebuild 8344 BLAKE2B b63ca7daae0c45896e1430df35edc8268da88f45bbad6c458b90311cba79aa2e54a2c41a8ec3bd08dbd98f7293f3421da528711599f455d665a222878895cb92 SHA512 092b47b4f4b482355bf3efbe84c8bad7c44894e0ac9feece332743693211a6de2d95fd0c4dbc60fedad641261641cd402b8b093919fd82389d94cf0be4a078f1
-MISC metadata.xml 1324 BLAKE2B 3e403e150d3487708ac804f718aee00557810f2ea1c6f3dfa4c37666f3c5ca710b61c00f9fc01404fb88dd96dd675fc81c90021305c3e903dc0ab4f540f206df SHA512 052fc2dd654dbfd81f62646de4c6b6dc38d09637afc2e80e7c98eb20b65acf2e985466700bc8068145f08746cc7ccdb0555c5a549969fb8177b6bd83310669a9
+EBUILD portage-9999.ebuild 8601 BLAKE2B be3f7cbc87ed0f252791536a38b43c7f7a6d834e03f1e3eff2ce91e68724088d369aeb2bc7f2b7ebfd4d89c54048a730c7f968959346f860ea3f8d477c9739b9 SHA512 01b5e4d906383525d8ac25599d480b5d60bb68a7ab87d673d802be49a97ffaf9a5fd970ff8accb59eeabb57e75285ac56cfcc60328d5ef75895fb8a7def9540a
+MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 8d4801007bc4..5d99599f6780 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -11,6 +11,7 @@
   </maintainer>
   <use>
     <flag name="epydoc">Build html API documentation with epydoc.</flag>
+    <flag name="gentoo-dev">Enable features required for Gentoo ebuild development.</flag>
     <flag name="ipc">Use inter-process communication between portage and
         running ebuilds.
     </flag>
diff --git a/sys-apps/portage/portage-2.3.24.ebuild b/sys-apps/portage/portage-2.3.24.ebuild
index 8e5bc50d4eb2..8de39be77589 100644
--- a/sys-apps/portage/portage-2.3.24.ebuild
+++ b/sys-apps/portage/portage-2.3.24.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
-IUSE="build doc epydoc +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
@@ -94,6 +94,13 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i pym/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+	fi
+
 	if use native-extensions; then
 		printf "[build_ext]\nportage-ext-modules=true\n" >> \
 			setup.cfg || die
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 43c081296c77..52fca1f4c12d 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="build doc epydoc +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
@@ -93,6 +93,13 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i pym/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+	fi
+
 	if use native-extensions; then
 		printf "[build_ext]\nportage-ext-modules=true\n" >> \
 			setup.cfg || die
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 110b85f3b7c1..3cf1036629b0 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 39beb6a45cc7..ad3f3c096351 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,10 +1,8 @@
 AUX tgt-1.0.69-sysmacros.patch 1128 BLAKE2B d3e14b57ad16ccdc47def33de8da9c6dedb4f280919fc30fcd76a700a218c60843f8c0371bf728438ffc10d21eda5b1dd0af3a7a1bb5ce38a9676968022c6fe3 SHA512 37d74d52c2a29fbbdd482b7e583d9d6e1fa175f5824b32c635b49b46a05cbe7632bab06e6850c03e47789851b88a48f43078cfc29db8ee3f7beaad3ddb87d5b8
 AUX tgtd.confd 108 BLAKE2B 74e5f66f6fb193541853e562cd1de5e99806f1f324db6efb5f9a5217935044dd61237171b368dc1747017fbd9094d8c3acae4dfde0d5dfff69957c3f8800d63c SHA512 2153e99e3f6a2178bbbb2bda1d6af9a67d6080b36e7c5cbb4f951b10324c80a24fa224a7003c26b3b51d40a77bba97856bc009bbb0e664e93625face723edc91
 AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4fcc53c46e4678acf049c16ee761f29eb8e928f0713f38a9f73bd13db1e0408da56f42f64b337 SHA512 1e6d114dbb89c7a26e65546b6c775bcabc3c9508e0757e118a4272fbf4299a185b4679bc510d9cc3da7db25b96343ddc8e45de044543ebe26d952132eba4de30
-DIST tgt-1.0.71.tar.gz 296540 BLAKE2B 89cc4a79119b07bd61a74c838a647b44e0c05b4cdf7e1b2d93580c503c588e6e75ba25a81f30ff4eeeeec2bcfa2669847aff2c3243ce95b50fd53b15a25f6112 SHA512 db74deb199ef341577ab505b7202651e6c28aa9d62d37d3492b1775a2944284e1d3bb7c99b6d8bedd3456807641952876719ecd66553bd8c8dabbee5669f9428
 DIST tgt-1.0.72.tar.gz 296698 BLAKE2B 6625bf87b37f4683aaf0c29264e69e400c6d238c9eaa7d9bb6fd46a76b542a8477ad8c7e9913d3dde70caaf02c323a2c01a3bd78b2d092829f4530015225012f SHA512 4fdb1b8f3c2487f66629024132f7fa53ab69b9eba67d380fb18aa2d9c143e77bdf808b3ff8d1e2bf1d4420cf1792944d6f79731ddbb095d52b53d573d9f1281c
 DIST tgt-1.0.73.tar.gz 296814 BLAKE2B a3c81c00f716678aa9388f6a4562bd0b6fe0e2c705aee9655f942ffafae4bab3bbbaff521a8b7aefab208a354e0c1c617b85cdd08247a77d1026d0482d2b6528 SHA512 e6410f16c54f71d9a33d511438169a0ca305a7b9a9dd6abbaae9f0b31c18223fa1f3a11b575322d3bb94df129b4f9b186079a7d7cbd27e31734151154edab1da
-EBUILD tgt-1.0.71.ebuild 1563 BLAKE2B dcaf51f0db9b827826ea9f672f519d6c66f4b7b73221c45bc1a3c560f051ee11d1e8a7ee806ce7a41f7ce8d0e92238360bd6b17b99e0d64c2bf0faf928f7aa3e SHA512 008dfd30d1ae4363046df41f26025283faf0f7e42df4a64fa84d54391ed7fb2f832c884d0d310f158574200510c1f41a8ebb5a92339caf6e5e066a83494025c8
 EBUILD tgt-1.0.72.ebuild 1563 BLAKE2B 7364870afeaca18d51b156690ca59f0db9637c78c6e1dc61cce3df8861be244d6b43fdc0bf8d2dd689f8ff879b87e6b395f8434fed0495ae763e702759aa4173 SHA512 f4a1bffcae7471dbdf4bad933c5b7ff82b6656da570c739aaec192389a1ae888ed8083cdb34340407a3eda692eb147aa177e5a8b59077ad22467332980c755a1
-EBUILD tgt-1.0.73.ebuild 1516 BLAKE2B 13d60a71ef56518f8019118226d321d86a3bb901cf9f1a500ef1669cb5b30121beb7cfe79be0c7c888035d786e8040186cd1a2db4a89c9779f7581fc0355c066 SHA512 1145c77ab9db574fe39fc6839c3e7ef9abfaa915b530dbcefc0b18e4bbf59af1929fe49905bf34d65dba98368c51f48f6ad6331d21a5272fe55c61af00667776
+EBUILD tgt-1.0.73.ebuild 1514 BLAKE2B c64c89359f7054020fa130ae559a7da2f14b76368e88bc6a642a99c5ca085bc27b23f650a5b148db65595acb4132a200c43f9af82ce2c1d423d3cd674a979737 SHA512 10d945d72aaa099a6d29a669ae0e80f31056946c62947ae180d9fac446cd1d842dd52d908c7fc2db88764d5672187571bb11795851dfc3444e5aa96f3ae909cb
 MISC metadata.xml 825 BLAKE2B 89a6844eade4098443db47dcd5b3350c1bd6f4c0ffbdb6277df5714fdfd248d056f770f05e1392d64b573a28ca9db140dc7130e0109075c7fd398677ca251af9 SHA512 0c75be2e830ff683c8cae93175504a1e6508131d704c48d31b9fe98baa6b3a1e491661fda6180c0c1e35ef7e9bd57309d05e07b41160a7cc090934913e186f9f
diff --git a/sys-block/tgt/tgt-1.0.71.ebuild b/sys-block/tgt/tgt-1.0.71.ebuild
deleted file mode 100644
index ccb001c49fcd..000000000000
--- a/sys-block/tgt/tgt-1.0.71.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-MY_TREE="f2a6db5"
-
-DESCRIPTION="Linux SCSI target framework (tgt)"
-HOMEPAGE="http://stgt.sourceforge.net"
-SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="fcoe fcp ibmvio infiniband rbd"
-
-CDEPEND="dev-perl/Config-General
-	dev-libs/libxslt
-	rbd? ( sys-cluster/ceph )
-	infiniband? (
-		sys-fabric/libibverbs:=
-		sys-fabric/librdmacm:=
-	)"
-DEPEND="${CDEPEND}
-	app-text/docbook-xsl-stylesheets"
-RDEPEND="${DEPEND}
-	dev-libs/libaio
-	sys-apps/sg3_utils"
-
-S=${WORKDIR}/fujita-tgt-${MY_TREE}
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.69-sysmacros.patch #580594
-
-	sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
-
-	# make sure xml docs are generated before trying to install them
-	sed -i -e "s@install: @& all @g" doc/Makefile || die
-}
-
-src_compile() {
-	local myconf
-	use ibmvio && myconf="${myconf} IBMVIO=1"
-	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
-	use fcp && myconf="${myconf} FCP=1"
-	use fcoe && myconf="${myconf} FCOE=1"
-	use rbd && myconf="${myconf} CEPH_RBD=1"
-
-	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
-	emake -C doc
-}
-
-src_install() {
-	emake  install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF}
-	newinitd "${FILESDIR}"/tgtd.initd tgtd
-	newconfd "${FILESDIR}"/tgtd.confd tgtd
-	dodir /etc/tgt
-	keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.73.ebuild b/sys-block/tgt/tgt-1.0.73.ebuild
index d052002e5daa..0677386365d7 100644
--- a/sys-block/tgt/tgt-1.0.73.ebuild
+++ b/sys-block/tgt/tgt-1.0.73.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
 CDEPEND="dev-perl/Config-General
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 340135b77357..f867a123cb10 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index b1547e0a90be..2cf29ac4788e 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -13,7 +13,7 @@ DIST btrfs-progs-v4.13.2.tar.xz 1673732 BLAKE2B 995c364a594d075dff088247cc8f745a
 DIST btrfs-progs-v4.13.3.tar.xz 1674084 BLAKE2B 1ce0747e776253a8e93613705e4aa3bc704367b54939e010e2dc69a114760041b5d85b6a7370f6919010f694792dda280a1891c9f6193ad95c98317b5730784b SHA512 6db18197ab48a43da5212ead2fdd4a6d0c9eb035cd5ce40fdb5e6e39a69dd118aa0112246df8cb4a339665c20c39479d630e03ccc1ffea3017646695e1c5f833
 DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be2433149b6aae5e8602cef4c892f7e5fa1160e4b8bbed354bf36c90d3a6a4d6856b57cb10e632a9fba47b1f0b312098a6393da SHA512 e01a52a84bc0de81e7173fda46c12fbd451b5117014008033e16c7bf48165065c6362d812a95ade17c01f62f66755b4c7ab11dd22804eb3bdfc56346a161e2a6
 DIST btrfs-progs-v4.14.tar.xz 1697584 BLAKE2B 8d5aeb251ab6ede72507db926fb21afddbfc87a9a25d330bcaa933971fc19831b9c9f452bfead836bfaeb0cdf21b0d09d8eb6f98e5be0424566f0d7b4c190937 SHA512 11171e6730f4aa102bdb4cd405da2d4c55e2c102fec4cc6d3135df516c78af1c34fede722a1677bd9c638b47e77085e005b29333ae70b98771501e32628890f7
-DIST btrfs-progs-v4.15-rc1.tar.xz 1929368 BLAKE2B a3372ac7389bfc820a389a5f9d324121b788b133e6e59cc336ed07222a4d312acb30176ed611fab33a7131852048f984a980cdc999e818ee82241c9a2efe37a5 SHA512 a6072fc9f60962ca94474450339de15dcc7dbf7329fbd6b66406c55275132f5cc9c98bf274529d12ebcb38838e778714804735750c9e787a971026b86caa0473
+DIST btrfs-progs-v4.15.tar.xz 1928788 BLAKE2B 54bbf65f18d182ffa8cd6fc1437e243fe9c6aac6467c038bc32d925ca6070d2c56949d65cd3d26bbdff1995d211633a9791bf790f49eb8a9c081684b6a32dab3 SHA512 7c80fb44c9747e51db89a1d1487e15a1163061b0e85e50a07f28368c1e9e1b32ee2a4f2b769514e1581d1410b7ae5cca8ccd44b5a4e95c32b95e10198aa4f13c
 DIST btrfs-progs-v4.2.2.tar.xz 1143760 BLAKE2B 4a4aa9c55e03548e361308682dd24da96d98f32a5867fb1f15112f91f9911d59a7d5b4386f7585a1ade59b95a45bc149c0566746dbd7c4503c25bd55983dac3d SHA512 2ad23546b3bb421faad1f67da37566b6ae1887c5340c0f1d06ca59fc0cd0fb1060d92e74e36ba7bfd85b0aff30811525654cd03b7d3570b0b51c2d8e2d6d9a76
 DIST btrfs-progs-v4.3.1.tar.xz 1184416 BLAKE2B 395fd772a757f9f8de96ff0f3df991678b560c88f120b51d612fcaef79f760a347c94c66d0156724d79e2aaad0312119d3cdece22c4f50a89566e664ea5b9d01 SHA512 661c7c05ee3527cc34f3aa08e88e252e6e836a86752f7e607e3f6dc0a9a861d3bc645a6fa0a5af5f6abfe4f3f2f7e193cffc2bb1c53595e0b7f99c3ff59daeff
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
@@ -36,7 +36,7 @@ EBUILD btrfs-progs-4.13.2.ebuild 2477 BLAKE2B e4e145b92fa24e5c02e6a85c4de7211326
 EBUILD btrfs-progs-4.13.3.ebuild 2389 BLAKE2B 9657578c6e58f09496d139c228539b3bb849a9410fa0b8559fc04336e6ee7578ef4b471cf07b9b2c9508c9dcd51a3971bd0eb0f6b8ba4388d7df7c79a9055eb1 SHA512 e48fbe435e195718a5ff8e129712512c8c3627e8aca8a1217e691fdcb2d6933d4f08d368cb3b6332e2fdca2a9b1da38517b14142cb33b435f8e200580e5c432e
 EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa3087eeb77f2d5e86f51995dba2c85b557c5546f659798d593e36cc03307d436a11a98ab768bce47ffa186c7a2da6d2 SHA512 01032adb19e4ebef2bc923c16284274b5177701551c578e8813596f13e938b5504b1735e438f4633cc9131a2e20decd6e5bc58a45b3955f08b7d9c9144f60512
 EBUILD btrfs-progs-4.14.ebuild 2481 BLAKE2B 4bf035eacc95fcab5c1a495cee562afb28d0130e94b1fb338b22ae19dfada51a52d75e032a35314e855062410c207840e8597902d8684f43e28fceb14dd38be1 SHA512 f5a0b926e555ebd00a97ddcf8375c1415b94fedda038c6cac7403a7e096a8ea3fef553c7407b0a39911e7a7aa362b046e6c6bdb4de5bbc2565c5100f44f97c58
-EBUILD btrfs-progs-4.15_rc1.ebuild 2515 BLAKE2B 1ea8bdd9f1162533c673c95f251b214260f1bbea58c806803cdf0795e688d624774705765745b63cae047a7f89539e42e10fae7c58b34b35ebeb187c97734477 SHA512 ef7f69cf25c524e26aba8cf2e0889c623faf3aa6dd88a8cf2f944756c52918b825570e6f92581ea8343fb96db0c565541855409afef6e3bed056cf397089276e
+EBUILD btrfs-progs-4.15.ebuild 2515 BLAKE2B 1ea8bdd9f1162533c673c95f251b214260f1bbea58c806803cdf0795e688d624774705765745b63cae047a7f89539e42e10fae7c58b34b35ebeb187c97734477 SHA512 ef7f69cf25c524e26aba8cf2e0889c623faf3aa6dd88a8cf2f944756c52918b825570e6f92581ea8343fb96db0c565541855409afef6e3bed056cf397089276e
 EBUILD btrfs-progs-4.2.2.ebuild 1891 BLAKE2B 6164d918d4452a4d91ee812a84fe7a2859fd303396ccacde0fa2dcd5fe7ed1e974bee47e9deece3b621e62d8176379d45b12c2ce6b52497d406425781cb35a3a SHA512 9f0771068eae7ec9bd54545d1f7d1146e9c1a221599dacb40c15106f73ea15bded433adc13dda8d2f7e302b2b4a989fd3a4442904ab222901eab70652e43d28c
 EBUILD btrfs-progs-4.3.1.ebuild 2260 BLAKE2B 5ee8e3850dbb83c42e84754981fe549ee201899ab12e7f74c69bf140a3cdb38ff4d1de88f9365633c80d5e9a5ca96917f4f55755fce359cc633be4eaf9a6e9dc SHA512 8e435e7c541dda1b45e1a0ea4af82143688101bcf5cc3afc83c38429f2c300420bc72f56460dd237cce1cda7c0c84de8fa552cac4b2fa6d5052f7388b5041727
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.15_rc1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.15.ebuild
index 0b955eb22a02..0b955eb22a02 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.15_rc1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.15.ebuild
diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest
index 100ed6262933..42d1ab29dc54 100644
--- a/sys-fs/exfat-utils/Manifest
+++ b/sys-fs/exfat-utils/Manifest
@@ -1,7 +1,9 @@
 DIST exfat-utils-1.2.4.tar.gz 167004 BLAKE2B 9491ed5dc74826a233d788976a6f585651dcb7813d132c6a985435e24ab751f39edb3e5dbf87fea39ac0b8ea8eee8d727ff526a05a82ea84a27a7cc5eceb3ee5 SHA512 88c012b535a761493b7c417fad6d1cdafdfb71a5a7e29279e73c7220111edc51bf2e9857f9f3b786b7324227db5ea7b919b599c5b44b6e121fae004a7bdc15e5
 DIST exfat-utils-1.2.6.tar.gz 167375 BLAKE2B a91a34fbaf178ac6ec68191c21ad5e46943608a39aa1db6ad64df1e3d0d0465f65206977c3c2eee49fb2b7d8b57a145a46f916f057075fe6311e77cd8a5046ec SHA512 dc7aaa708cbfef887d6a03d7877488ea6699c053d9cc825243480ae912fe3d76b5e4297559b352defd5b234f159806a16aa407ac1b26206e86d6d9dd4c8bcc36
 DIST exfat-utils-1.2.7.tar.gz 158468 BLAKE2B 39700af0a8186a922bacb34b5b42af2fb09430a6b4c802642e4df78174c90188f9480488a5f30e67621eb29485eb0b16035cba49b956693a4859dcdc105626a5 SHA512 316bf4c770b880f5c2e33792a41849094bad26c279253da3abb6a6fcb3e9287d45bdd7cb1205f9cf4b68e277bc0a557391ff82d96365f9c209ef9500e4017d80
+DIST exfat-utils-1.2.8.tar.gz 181121 BLAKE2B 679b7662d14d9caa26b6d0aff1007130f6d7ad7a3eb36238847f9cb735011fe69fb367e013126419b780ad1fa61c6ad1fdb163e8c5727c4dcff50db85959b7b2 SHA512 98acebf74fe5f5181098cdd880303d6c78d5aa88aa7a87d5371c887e4614536b19a24d48526b235de034fad26b68ddaf4f286b68b5963e95cc1cf7cee1c7b58c
 EBUILD exfat-utils-1.2.4.ebuild 649 BLAKE2B 01654bce3a254241cd89b3ece1450c0a819459ca329786ee0b7d51a2f11161eef7db15c51b8a1fd96538a211224c6690b2b6a62238f9d640879eed25bf7e5ddd SHA512 c8a6ae79392bcf7b9edd419dbe83f1e85260018ae87656d6bad9365156812198c85f7c6af52b1012ddfccc9a5ad1b47f95e2a489c627eccf20840f459bddceda
 EBUILD exfat-utils-1.2.6.ebuild 651 BLAKE2B 4cfaf841a0a7873bd0c7c8ce731971459b69ada2adab32eec3f00af1a3729f798e694ff49668e2bae58ab5a3f8c926e485549cbee73385f6c8194fb4ee72e21e SHA512 96c22dd901dd0672d1d28034e1061aa1764e8513ad6495bf8f0e9703d7f2c2c10496b922ee2323cff63eda936f5e81e929b9d75a90584bfbddd7ee8dd27328dc
 EBUILD exfat-utils-1.2.7.ebuild 651 BLAKE2B 4cfaf841a0a7873bd0c7c8ce731971459b69ada2adab32eec3f00af1a3729f798e694ff49668e2bae58ab5a3f8c926e485549cbee73385f6c8194fb4ee72e21e SHA512 96c22dd901dd0672d1d28034e1061aa1764e8513ad6495bf8f0e9703d7f2c2c10496b922ee2323cff63eda936f5e81e929b9d75a90584bfbddd7ee8dd27328dc
+EBUILD exfat-utils-1.2.8.ebuild 651 BLAKE2B bb5293e19775bd5fee4a4e8bd89f03318d15729ae44374183a45a1efae61235dac6bd05e2a4d88f00349afb4d9627242cb1c35a6de81109fbef4ccc272309d0f SHA512 948d2441fd94717ad9ec94551ecb13e9e024c100f47ef7753abe22154b7585ead390a1c56dac4cbdb96bd312577b62080eee4299eb7fee9bc168408504806190
 MISC metadata.xml 451 BLAKE2B 89f419f995928b9d29c5aed14e20792fde2bc90cae84ad31b2df25eedfca4bbe23fef0845989616b5e6f0a44bc50941879bd5928e4f0dfbdb8a2ed4db97b95a0 SHA512 e9b06c7885b8f6d5d114042e9fa8946583b2a481ef74d4269e0d462ff995fb7da3d4ef171d401c48f517c93ca8b954f7f72f1fc0a9ac294b232e7d8a5da228c9
diff --git a/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild b/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild
new file mode 100644
index 000000000000..761f74833161
--- /dev/null
+++ b/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="exFAT filesystem utilities"
+HOMEPAGE="https://github.com/relan/exfat"
+SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
+
+# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+
+DOCS=( ChangeLog )
+
+src_install() {
+	default
+	dosym exfatfsck.8 /usr/share/man/man8/fsck.exfat.8
+	dosym mkexfatfs.8 /usr/share/man/man8/mkfs.exfat.8
+}
diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest
index 8cb1f8aee781..71972ebe0f55 100644
--- a/sys-fs/fuse-exfat/Manifest
+++ b/sys-fs/fuse-exfat/Manifest
@@ -1,7 +1,9 @@
 DIST fuse-exfat-1.2.4.tar.gz 136048 BLAKE2B b0901531cdbf0432d78bb27070eed846db0cb5c7158f063c1a3dfde3a8183fb110bebbdc480bc4bc7fd295ecd204414ba0fa6d9e9879da2bdddc7cc2dde04ecb SHA512 e425df39b205de017250ae29231a1d485649710fa08d6c46f2c831e3ff6a696f20e5bf2086d7803b992edc7e9296ee28df5cf1321cc21183f96e373aa3b5fcd9
 DIST fuse-exfat-1.2.6.tar.gz 136534 BLAKE2B 56dd5b5cace39804241c55fcd7224264360d106f81e591e7afc58e8937adbf8e4a7a1b4ea9b254d81f851709f827e941291c93bc0163db897ca21911dcf6ecd9 SHA512 93132583b9637c9c48eeaa40d49222686488db7123d0c524d6f70daf6e11fdb5b2b0e44046820b36d3a31a3421165ff9546beb93cb94a6f04cb2d0477aa0c420
 DIST fuse-exfat-1.2.7.tar.gz 135447 BLAKE2B 6cdba6e97643d8705e682540615a9beb191d309817cc8f6d019c25fe088758515b7bedbb1916a47b32ad0f612be36e27adcb6c109e048d3db03597bb4cac6d22 SHA512 dd41a9dac2c0229b42127ef517b15d0f63095bdde57a534a7bf4c473a14164964372ae9c8f8d35bf73f8e0ad3acc66483e34f35e90ed18bb88d2696a5cb9645e
+DIST fuse-exfat-1.2.8.tar.gz 159588 BLAKE2B 929fb87ee75aa70ba68814763c085c76fa1e263451bc3cd388b67dc6e793383c8eede1ea754a55c7ce7f14b38b7ec40f503acd28b0709d1ef58b10cb977a1d58 SHA512 ce81f15121b9f21bdaaacb09bdeeccdc8d556585967b85f1ab57534a8da07ea45434541fc571069b5795bae0f2ba5f090bbe7a0d5881dd35de06b706abe6d395
 EBUILD fuse-exfat-1.2.4.ebuild 669 BLAKE2B a88507dd06fbd834b73c00505ffb495bc6c903979fe9cd65703fcb2d502ccfa68ab4de66d187cfe63c7d7df6a1993234a79d382474ecd458bceb1a8cd9fb843f SHA512 3668b64925e6ae839a2be8556becb28a88006fb77089b8647af8f89d214e8f054ebf65fe41f0142a79f44f6c523f3adff87487cb00779d9a941819b6654d5787
 EBUILD fuse-exfat-1.2.6.ebuild 671 BLAKE2B d9df58ed7f790162e33fef8552bbbec39abfb3dc93b48581abae46aa5650d5c318475d5cb85dda0a10062150368d01ac1720ae15d47184aa536a68d4be15fd91 SHA512 eb085490011b47985081aed348a4fa908d5dffe0ff27d7ed0a950dccee22aa322685463caff520728d65d1d37739b5f3894f22b683a3e5203681aef209680d55
 EBUILD fuse-exfat-1.2.7.ebuild 671 BLAKE2B d9df58ed7f790162e33fef8552bbbec39abfb3dc93b48581abae46aa5650d5c318475d5cb85dda0a10062150368d01ac1720ae15d47184aa536a68d4be15fd91 SHA512 eb085490011b47985081aed348a4fa908d5dffe0ff27d7ed0a950dccee22aa322685463caff520728d65d1d37739b5f3894f22b683a3e5203681aef209680d55
+EBUILD fuse-exfat-1.2.8.ebuild 673 BLAKE2B aa59dca9555f11c0c2def548045d8036b39aef505b84998eacc85b77c5590389e0e99fa749bd07d394c152f1c592693bb06352a8a1ba9440c5d50276688b78ba SHA512 51796bb84966674ea8578339e48a3938bbe593361bec49924be37526838090fcc70260839adfb6b431301c1a797c01f50257908be9c5b7667e4dfc393ff6284b
 MISC metadata.xml 451 BLAKE2B 89f419f995928b9d29c5aed14e20792fde2bc90cae84ad31b2df25eedfca4bbe23fef0845989616b5e6f0a44bc50941879bd5928e4f0dfbdb8a2ed4db97b95a0 SHA512 e9b06c7885b8f6d5d114042e9fa8946583b2a481ef74d4269e0d462ff995fb7da3d4ef171d401c48f517c93ca8b954f7f72f1fc0a9ac294b232e7d8a5da228c9
diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild
new file mode 100644
index 000000000000..8bd2c0f2bd03
--- /dev/null
+++ b/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="exFAT filesystem FUSE module"
+HOMEPAGE="https://github.com/relan/exfat"
+SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
+
+# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+
+RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog )
+
+src_install() {
+	default
+	dosym mount.exfat-fuse.8 /usr/share/man/man8/mount.exfat.8
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 3994d6cf9279..b8a241b7ac97 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index a6d49f44d25f..a9819abf1f22 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -49,9 +49,15 @@ DIST genpatches-4.14-20.extras.tar.xz 17492 BLAKE2B 9540c0fbc4c6f824a235fe80a3ba
 DIST genpatches-4.14-21.base.tar.xz 501592 BLAKE2B 84eba9f89a7155c63d51f0afd2e1bcf7793ef334969b56a34b6b567d9d6dc3cc1203079a91f4dc917b75423e574db090fd6c60e8f605ffb050240648a91e40a4 SHA512 559581390525efa0c1b4201d72258de0c67388f6b25d0acc8ddb79129379a1760d7221fc1ff7cc635c29b0fb796216e3e6930f897f6cf3752d94ffe542749a25
 DIST genpatches-4.14-21.experimental.tar.xz 5180 BLAKE2B cbcf820310d1484527b08a08cdc27f69feadbd88ed87ccecaea9e495e660849ab3b17e13fb194e734979eefd68bbd97103ff100f5e243875e6084031e9b588a0 SHA512 b6084c79795e5457088b5f167b7fb2ab9d900a84e2866fd7354ca018d00d78ac94e069e5bbd895af96eafb00cc33cef7f31acc87f03f13f339e6862432b92865
 DIST genpatches-4.14-21.extras.tar.xz 17488 BLAKE2B 8c0e58b87b0b4294b7c6187b5393b99f43043a466e95b7d2da20db288a17329f5d7a1d9a45e1f86b277581957e7d4f46dc8105b4999d899046612a87bd0b90c0 SHA512 3f53d7d962194a4ece1e95c1ca6539b83682224ddc59ed7afa24253aa7d6f15b3c3360af3ecf23a9d37224d13f2bf91b4f28c0d5bb8634b828332b3dea64b1db
+DIST genpatches-4.14-22.base.tar.xz 545732 BLAKE2B ec8afe9b5f799932b0df3997ec4f83ea87bc2b58ac09c2e1d2898426336478f9199609d2b4db52c8d3ff61f6e95fca370c953472ad95bcdb18161cdd8789debb SHA512 d201ab46d9195126b23531ac9fbed4f53b94a3e4d7e77ec52bb5251ac2a2dd75b2c3aef62deadc32f4eb6d2a11c439f66a441fd2a617e9e22a93777c55913239
+DIST genpatches-4.14-22.experimental.tar.xz 5184 BLAKE2B 814356256c11ea5bb67706f47ed76d6fe6f8b4232b989ca042509ed2a7f3088f55bd113d3cac25342a66e4803f90864cca803c91661af106141b78ac9cf5fe18 SHA512 e840928a463a764d59013424045f64c1fdc8e5d18cf1d20c9ea15388d5f4c4b9ec6aa86e88c33add716366d6b18be175943c22b6bb1c88d3cdbaebb606a38b10
+DIST genpatches-4.14-22.extras.tar.xz 17492 BLAKE2B 1242891d2ebe519d6c9d43eb6a0b2e9dd1c51ae76dc8aaf71f14dfbf3b9c52097cfc4ad59c5e2add1da4ded0a34a06e2d302a0366a8afb665f1536f899fa3f9d SHA512 21830b23a1b16291beba81ac122a36e8bcf9268b548aa6e9258f18283e80f610ed249ccf320f27b0a45acd35e3bd8ba5ceb0420e360ae94635121f89d74903b6
 DIST genpatches-4.15-1.base.tar.xz 5908 BLAKE2B 6627ff7c5bd6b799dae5e61b1638ccc538715cc253521fd07faa0c5ea7dc9aed5204c040742d37a9d172509577ae5442526d11cbe8714540ee8e1f1637d0fbbc SHA512 c7b8cb613f4a2e6570808d179be6972511ea45c849c4415509e38e1d4688014cab15486628bb282178f306ff786e83718fb2171d1391057bb817ed67a0508caf
 DIST genpatches-4.15-1.experimental.tar.xz 5184 BLAKE2B 814356256c11ea5bb67706f47ed76d6fe6f8b4232b989ca042509ed2a7f3088f55bd113d3cac25342a66e4803f90864cca803c91661af106141b78ac9cf5fe18 SHA512 e840928a463a764d59013424045f64c1fdc8e5d18cf1d20c9ea15388d5f4c4b9ec6aa86e88c33add716366d6b18be175943c22b6bb1c88d3cdbaebb606a38b10
 DIST genpatches-4.15-1.extras.tar.xz 17492 BLAKE2B 1242891d2ebe519d6c9d43eb6a0b2e9dd1c51ae76dc8aaf71f14dfbf3b9c52097cfc4ad59c5e2add1da4ded0a34a06e2d302a0366a8afb665f1536f899fa3f9d SHA512 21830b23a1b16291beba81ac122a36e8bcf9268b548aa6e9258f18283e80f610ed249ccf320f27b0a45acd35e3bd8ba5ceb0420e360ae94635121f89d74903b6
+DIST genpatches-4.15-2.base.tar.xz 22348 BLAKE2B a4d4e0b6a83e46a657ced903845dc7adcdb749e6657006c58d7070a0cb906066a1241ba7c33c9431aab4af12debc0e875822c5d327dc29853420cc5699cfae2e SHA512 2d6d8a2cda9ee4c41068c03f1e90e5bec2c25debb2bfbda7d6acc83b49b4ecfe861fd0be68c133dac4c98f23d8c23fca816f817653cb283405148985f20c4e9e
+DIST genpatches-4.15-2.experimental.tar.xz 5184 BLAKE2B 4967ea59aaf9587c5f36e1cb97e0ce454f7d23c0d9e02cacf4bffef14834ca591eb4b64606fdc267d2051cab21ac49cfab16082d1a0affa2e2e555bfda27a72c SHA512 9fbf5806636b2676144dfce4d33c8ff1d97dba9a44703abe5cbc1741c3f54f082416f9628f308a186dfef1c82b42183a9a52970f96be06c1e0a60ae1a1a29257
+DIST genpatches-4.15-2.extras.tar.xz 17488 BLAKE2B 7549c1059b8aa48dedf196fbf53be363735ee2d016ce03fc22c3c72082eb5c770d5af557c8602ad01e7b98f1eeaa4c0497a6eebf344596365811f402307b3f6d SHA512 053490dac39816e14086781c4aa7a6c66544543a8851fd672b8a8cfcf49a03573e3820284de3a28c0345eec27a1c1687bc445443c5076ae3662686da3ed5e1d5
 DIST genpatches-4.4-107.base.tar.xz 1587988 BLAKE2B 827d3ae42c0fc412c165568edaf1f8550bf828d7e2edb7c5abd3013a2b639dbeb68d2e3a9656e2995baee07c7619695918e654174528ce3eebc8a891715bc636 SHA512 1fffc6d7b2c186c87c8b343d4bf5fcf94086dae9f4e70b2965f5dc8c18ff4753d417074ec4ad7deca29ff597a6e5d0cfca4bf325609596678febea5ac2f5ea24
 DIST genpatches-4.4-107.experimental.tar.xz 87776 BLAKE2B b239fcc9ee1d0344a9fac8b6ae8e712bdf97df7547a2d3d1d6b39ea23f50d8836ae8fac3bfffcc401b3af52dd333b2b2b1e1626fb739da608d247be5fc67dbf3 SHA512 49e0cbc980cfafc7992d92e0bd2dd07d594ec39b9ba0bae27dd915eaffbd78c5af6d3d47847a98ee9a619447b3b220faf0c44484dc99088609ff8053f3c5d907
 DIST genpatches-4.4-107.extras.tar.xz 16468 BLAKE2B 1ece602969ead12faab3e0e5d5703a75c737a18efe873d5bdda71ff134387f5760a76105262270543b4a0e882a9b5434905b3846bd68cc3af5bc1b0383122cd2 SHA512 0843f4cc2cb2b3219f7e1343d68062a9c86f08c51c67a801f82c7685c8c0eb92ea32841a8a6d4bb8da9fc9882eeb965bc66317d7c14e7a5ffbb58214f962dc35
@@ -88,6 +94,9 @@ DIST genpatches-4.4-117.extras.tar.xz 16452 BLAKE2B 9e482d457abb019663d022a8c297
 DIST genpatches-4.4-118.base.tar.xz 1754144 BLAKE2B f64fffae61f17195d5b8402e6ea7d6212c555fb25d71953627f16bdeeaeb3b64b9c67234b0cdd83b7c81b0cda8ac4a0868f3eb158d87376350371a792640fb92 SHA512 93a63ac4c76a8dec29db45e8ac640af65dce3852685b329237448b69904b83b9fd193a9fcd83cdd6517f4fa11cef75d83af02a8e9662754676d9319a8088aec2
 DIST genpatches-4.4-118.experimental.tar.xz 87788 BLAKE2B c729f9c8c14d64c68987953e848f1e615cf034253eb85536a12fa7d542902bd6d3c0c6946d7cf83af99425711bc3b02108e9f1a0be329f48340d2a388a924443 SHA512 723ebb901488d7559bc79b7aa3fd108609acfcb51ba0738dbf5b5e6853dacaaa8853b59a6e073b15969017f868c9b6ebd94d2f4f5f022c9ab60959393ca05bdc
 DIST genpatches-4.4-118.extras.tar.xz 16456 BLAKE2B ddb6559900ab60daddd8f0f3e24bfcc486263bcdd1cade2b84564400c0c7c6635c3979c9adb86129621ca320d9c0fdbf5d03de2beb513bb1e41b4b6c96cd5ea1 SHA512 99b486c95be1e89e26f9d3a06f2afd2bbd96a935f55a4c3fdccdb670401b52042d1d0a025ec5ca7907be9dc557139107ebd6ec97311f9d7aad5b0d3d008c68d3
+DIST genpatches-4.4-119.base.tar.xz 1768028 BLAKE2B 2772ca3166de6ce5833134f3e1a58295912c760364a7634591ad86edac60672b5bea9eebb2e9285d6a644ccc2091c040516776d575190dbaa9094d3f6315aa7b SHA512 a0dc9eb02d5cd002ce0e00e59c5e8a3b226a89ab03dc5de25b26bdc98f6cf58b5b25962c49893b70fe6938da60f08d627f9fcf42d92df9d499da4c44aa8477bd
+DIST genpatches-4.4-119.experimental.tar.xz 87760 BLAKE2B d152ca04d2b064605cf65bcd0d57bd990504fc83653ee407332d74f36bb26477f96c2cd1524137e1a6fbf82bdbc8ea026ae679fb490ac719314b2cfd9db65051 SHA512 dd7c7c63ef1457051381a1ad84c25c4b9291b1c4ffc999da3eeb1c53adc343fd4881a715b169258284eb6fe814b077ce9fc46edb1ab2e54a4d4f05735c902420
+DIST genpatches-4.4-119.extras.tar.xz 16472 BLAKE2B 575206fd6f1d59205d88ff8177a0497675d4f99349bdb5884800288c5bdd4f578cbb031f23b3bf5b261515f4f8fe3c65bc658311449bdb32d1e09c06aa0fc750 SHA512 d7dda67d16ad0ae77ee378efbc1c17dda234273951ec20b6f7f1865e86b00a42bedd1e57f46d229f7ede2a39be8e56f2986636d2cd3ba9b29ef77dd8cefccbb8
 DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
 DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
 DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
@@ -136,6 +145,9 @@ DIST genpatches-4.9-81.extras.tar.xz 17356 BLAKE2B 3e26281722b92a9720a04bdc35910
 DIST genpatches-4.9-82.base.tar.xz 1500228 BLAKE2B a00811475170bf38c5d7b47d333bcda666d292e9ce9ea98331def2b34da2cdaa996e83742eae48beb59d358ea728b839cbfd0e2c44bfae95c45a960d6070a84b SHA512 529345d0d47b0965768f1575174a4666739f5ded0f5387eebcb414e263e3a4c296e6ba2d3b9323ff71a7e269973b525d1fd9bfc29d413c470bbe6e45b7c83beb
 DIST genpatches-4.9-82.experimental.tar.xz 106392 BLAKE2B e732422fa294c6c4f2c41b4e75a3b4242bfc1ae2a5d3163de3b67120d09deb8d5a517f1fc02f3b77e79434e6e53fc1dd4261aac3183b0e786eff66408157c835 SHA512 ac3d6cbcfb08b839cb1333d144df4e34478ae60443e00a7bb6a34efbf1464f366f2c6ac271fdf82268234c2272e0454421a1c3a360f9160695a724ff6b0b9166
 DIST genpatches-4.9-82.extras.tar.xz 17356 BLAKE2B ed2439bfe88bce646e5b70ea03cb340910f70b9a17dcfe15921dcd53018de7358c9acd304ff83bf2894abf7a57bbb91a6c9f474f3b4e44d1094dd5e0bad2d6b6 SHA512 5d315412d6cb9e4f0c5fcf3025900002294a52da40c6c773f632d2cf581bc2af7dec487f5e883b142b46a6ecdd6171777b787f511bbaf33047d4b512fa376585
+DIST genpatches-4.9-83.base.tar.xz 1517252 BLAKE2B 880a6c5c38583e027bf8ce6efd5d24c16f411d675e8d269406bdbf7196b540baafe7ea4e17d9c0fb3ab75605103059265fc6ae02d9bf7871468cd5bef7856c38 SHA512 010c2a7969207abd4c7b462fa2f9e7796e0c5f261f41064b03fd82593d00cb33db3e6b9bc2eda1dc6bab37ef4d979513545ca434c3725d71b2156c4ad5faa50e
+DIST genpatches-4.9-83.experimental.tar.xz 106424 BLAKE2B 1255fe2d88222acd77366fe580bca9e80fc30ce4bf10de846172efdb011d7f4391eafd32a23b550e95afc14a3fb222192f0112459a1acb148c4c82bf7449f2ec SHA512 1d84ab93028e0150698c8986890c0d1e06ddbbc0cb84b31a5a03130f5580e4253c78600caf20cf8c3d2bd28aa928e7c67d3c0329403ddc5b62388f3932bdeda2
+DIST genpatches-4.9-83.extras.tar.xz 17364 BLAKE2B 127ce0405586999eb9c7013931389704067302da2b2544a95993cb4ece57324878f6037b9a7f87622a4ec5a9b14dc7133511ec9a66298482cfe9fe27850fdfd2 SHA512 578e6ffd62d76451b72c1443410dbb805f57056b970943d7c055b4c7beedc7007f835cace28b6b54101649eca7fff135a62dd01ffc65f738f781e52a6a579989
 DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
 DIST linux-4.12.tar.xz 99186576 BLAKE2B 02d031c7f2f29849c06a6b5b589af78bc486a05a758267e47f2ff16844ae8ca701fff53cb859fcc105f7ea92c0769acf8d7f7cc116444c15235ef4d63cadc8c0 SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
@@ -157,9 +169,11 @@ EBUILD gentoo-sources-4.14.13.ebuild 742 BLAKE2B 79defa786bd57b36c14f7ceb99da402
 EBUILD gentoo-sources-4.14.14.ebuild 742 BLAKE2B 8cf138fd93fa76e2280baf29a973fd8d26a495d41cda3cbf0b9ac1b81718209a14ba87ac2623ce768bb9bf2f23813dc3a9e35ec942c3b031c1e9cb264cb93d7b SHA512 042e8df152e227429809a4e994d86668641b5632ae50f21780636aa22138b2e7fb48b25db6533875617c9e578c3c3f0f852188dad4137bf6c25c55ae75b86eed
 EBUILD gentoo-sources-4.14.15.ebuild 742 BLAKE2B d3121b065e2470df22b82884c4786e16b886b2d665555596f08f2193d8b37cfa624e84a241382651e38811e9bb24f41a608795620ae3df5166d2b5830bdf8014 SHA512 adc5a779711a415a5e614c26e60fac4b301e0b7f101fbb8c0e06308005f355b7e0f61ca613d5135c70b6b266b33b408a6962ab20b816b68826ac1e81451af5e9
 EBUILD gentoo-sources-4.14.16.ebuild 742 BLAKE2B 863f9406c40f4646d01f4b023b393cce2df9d8570840c9d3b59b8269deaf646f4f94cff234c7284df02599dba189edbb741edbd6d68c9514299aba6093964d46 SHA512 c8114271cbf01aaae62118c40c15e178ff87854d1a3d27df49fae729bbf472626e4e30458e687db36174a6735a9ac3fdc3b5d04421cb71493e5ab3b412a910d1
+EBUILD gentoo-sources-4.14.17.ebuild 742 BLAKE2B fada763522f2c375031bea4ced99f69cbef761879a61fd7eecd84e3d85d16a79e250b8e302ea9ebecadf3638c9d57d617c3f7603578dfc10b742c10c53b50361 SHA512 6d96c76f19ea25aa6d2a577b5139ae4b67d784bc3277cdfb75e9d3b7cbbf082c240e8aaa5051e1f81f922457050aed4707ec918a02615fb3e73eacb4ecfd1b9a
 EBUILD gentoo-sources-4.14.8-r1.ebuild 742 BLAKE2B 493b800cb7fdd217c141aa2d94f6af21d83aa2c19e8cc76613ebda470b115218504e1faa487260aa3ec5798df2dbd15d37fc88112ff8411676f3b57d177a3bff SHA512 d6dada25484f8dba5a772a51d3073224f3e8e4ef72eff9a365c900ae574181e21ee7035c812e068158cbc5916abc874864809973a8435afbf8b2b88c4a939a0a
 EBUILD gentoo-sources-4.14.9.ebuild 742 BLAKE2B 2ec59b4a79db4d5e94b268a5d8888f54fd6a5ee61d146c9fd7553dff8d6443609cb198cff98fec615e7b2ec5a535a22765c3b328adf923cde7e03e5da36fc434 SHA512 d488ac5b60c05c266d1e4c911b6ca341dc024f087ef3896576648f6488fb810733e3693814871d15331b4cf9e7d62da47b3b8456e4fac4a6c6f03ba247bae4ab
 EBUILD gentoo-sources-4.15.0.ebuild 741 BLAKE2B 6cccd19877bc0d5bc677ea794fd4669268c654d01c156b62f24cc1a7cf89c54db8685b78fc2ba941c9b48602847f3b9c9d5c05a358015e1cabead653c0f4476d SHA512 8daf880f336464e106ea015594b1ee8f476e8391dac6f698327b2c48faacaf0f4c864b6b2bbeb2b723d0cd0ea1e88041e3b23010748baaa313962028453c7164
+EBUILD gentoo-sources-4.15.1.ebuild 741 BLAKE2B bdd6a645dca7b8cb96832f43ba52604d095b4074326e482a08a46bebccfcd88dba40dee9de1d01f55e41d32209b20e99cf632bc8bb4189e97efde854275613c1 SHA512 d3101818abccdb94c1ca8a070301a2261027b655b376d3ee4eebf3ce78e88848efd3c4d770857a9657ceaadba2c34b1f220f5d48accd7f2534d37109b69edc4d
 EBUILD gentoo-sources-4.4.104.ebuild 743 BLAKE2B 802e40cca68ffd0a60e89b78472150c9607d1536a24da4ce8b6931e05fbaa630dfb5e30d1f3b49fd8a94c7d33fb9489f377bd96de471712d16450ec4d704de7a SHA512 55a5c40f01ceeced4a226f18e7e30bfed7a0e8fe684d3d1f3e8ab66a3509ff3c4fc128e4d0b551a5f1efff44e95f1e5a19db3d4ca4d567499b2e1b6951e36c21
 EBUILD gentoo-sources-4.4.105.ebuild 743 BLAKE2B b928e1bdcb11b512c1d1b855d282a08fc6e8f3d80ca7178599c1fd5ecfd001f78bf9be71262919988b3541e1310d4dfed142ae216d0dadb2f171da94e1978d77 SHA512 3fd6636e5d03b204c7a64f90d7bb4352641bc3938e5be217be588dd0b2ff40ddbb71067409f06ee092a88ea7324a51e73e92d337043d3ccf326640ec6fc77e6b
 EBUILD gentoo-sources-4.4.106.ebuild 743 BLAKE2B 20e6ec2d4fe6f872921d54cc8510cce5a325a546c1cf36edd94f2c664fd88aaaf201b23664559351dac47a27f3e2ee3803931e6aa7380f0eaa0294476defc525 SHA512 d0e045062971878d254fd791c8763b5a67932ea7ff028e8d63ebdb0c2a238e78290f08d32889b22f3aee328002c8a5c0eccf3d610be82a6de1242d5d405905b6
@@ -172,6 +186,7 @@ EBUILD gentoo-sources-4.4.111.ebuild 741 BLAKE2B 028cce31f7f50089d7db9cb7dca2beb
 EBUILD gentoo-sources-4.4.112.ebuild 743 BLAKE2B 813f94f002876e7cae223a0cdae8f9e2f735a6865c219883fdd2bb3d364b22403c8b14f0f07c43b47964c08bce561201f91440973d11c62ac08c951702d751a8 SHA512 d064a2e5d9d22545246cdca70e2f4e22ef6b1725c6236a69936e18746ce45ea1305cba44fe927a1db74713fa76787399b77d262036084c08e43b6821d0865f69
 EBUILD gentoo-sources-4.4.113.ebuild 743 BLAKE2B 6c31cc1269e4a32bc808657758e7e8ffe86bf93047a07fe8d606733b957e3b9e2384bcb52a27b11cee6bc798197e5827c4e4e6255eb8afd0089994d44e3312b9 SHA512 d42207f49e8763bea3d46fb1baadae30267896d0b725ea448971b92744d782fc27a7e19f258ed0a17510c16c47978676d632a8bbf66244022f21b63c56858ea5
 EBUILD gentoo-sources-4.4.114.ebuild 743 BLAKE2B 3b697dafc5bd68da36cc0d37a16841caba0d52f83408ba9c90a7ba9d1a0f3e8ecfe47878e50d0671b9c180173c72385014d7af5ce91f304c022bc1eba68cb302 SHA512 0cbda791621186a4a9ff6b594741a843895d792e825230e18677c129f53d5e7d1292a398b173041bd97feba88c5a64a2f87f288a888688c3398a724ddb3b156f
+EBUILD gentoo-sources-4.4.115.ebuild 743 BLAKE2B 1903d410d78de981bc8b5cd8e99c60e1b4dacb8a44cb41c526f6b1489fa42fbeba17ac3f4ddc7d6354b9db0b0b16b9a8a93a7111f4e5cb5e83ffba726b09a0e5 SHA512 81c3d5c44d243af979a7da84c36df3d1a6634e4e025c307db85948f45ee13e69ef97ca727ffbe9041a7e14c681c21236a336a089d24956ae106b649dd55b68c0
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 BLAKE2B 1f1cb7f7355792bcb664b74c7476e9f8d0e90ca648b819ad44e0a4339210867658584a206beb21842633b7537b2b7f58d43b391d4c4f98fd700280a72662423b SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
 EBUILD gentoo-sources-4.9.67.ebuild 742 BLAKE2B 86d65f90024085652859b5e3091f097e556be4a69fa24045fcf98f54000e7d48da3a822a9fc294417665b48f6b49a4e0cc9c3f746c1ea9330725b37529f75b07 SHA512 d444a40a62974d90dccb589d0098e8066615f6e32088fdf5a24bf7063df96d9b720d704ba805291160a030e5e240fd915e442c680f11feb7838e1dee9f9bb439
@@ -188,4 +203,5 @@ EBUILD gentoo-sources-4.9.76.ebuild 741 BLAKE2B 4ceda6a592c887c09173d606b2af6abd
 EBUILD gentoo-sources-4.9.77.ebuild 742 BLAKE2B 704f24883b5dad9bb1ffed3c6ed0467c95c4120fdbcef843f9d6e99df3f3da709c0e2e2fe6a2da60cd0c98ffcc6d18f9f62b1e7937a624325b524eed1af3218c SHA512 410e8917baaab9458edecf5f89c83ee8f12dc7687e53cb2ce5d40ea7956f251f1a76fed5f35d00cea1410ce7038b16159e94c3f3215e17342020cea1fec10ae7
 EBUILD gentoo-sources-4.9.78.ebuild 742 BLAKE2B ec4a48c6993642d9b6979c924b7aa9961f8476ad5b104888c85c2d196dea26b89811abec09cce695767aaded850a65449b78134a57d282d0f663259f13e0b7be SHA512 5869154cd2e4ead0e92ec29020f19231ab6d39c568900bca8c7147bb805f72b60822c3051307db9e109a8db9ad0cda86f5abbcc61a2f79ed50d071924399a3d3
 EBUILD gentoo-sources-4.9.79.ebuild 742 BLAKE2B bea38a9c4419e50117883d95628f2106ea4a62baae18d8b245098b7822f09e9fe7e88884b043a1e2c920767b07faff35a8560cdbbd846f65b21b4b33da59b113 SHA512 5910901bfc49add959da4fdf1c682406d13b83467cdf189810ce820bc14d9147694434038043a17373fa6981630bae32cf0576752455e394314e7e2d5b8abfd9
+EBUILD gentoo-sources-4.9.80.ebuild 742 BLAKE2B b13e9f9cd13be2fa3faa5d5bb6f4bf6ed1687cb244ff4039c7d8df3ed14c996769c902fca6b6bc89eb0ede48a65a63705abf72aa88911a4acb44a1974fdd26d8 SHA512 472fb06bbcef0698bc2652d86a1f752fba515dbe581b701eb8a86eabdc54178f563e97b949b7a458d02aa37d8320e6882b1a89cd2b828dc0904b854cf5edc91a
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.17.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.17.ebuild
new file mode 100644
index 000000000000..ef3e32eda04b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.17.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="22"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.15.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.15.1.ebuild
new file mode 100644
index 000000000000..0cdac282a79e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.15.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="2"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.115.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.115.ebuild
new file mode 100644
index 000000000000..c8f803e6a307
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.115.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="119"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.80.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.80.ebuild
new file mode 100644
index 000000000000..50a437fff900
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.80.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="83"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1cbdee68b44c..112f90ab0af0 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index 57a649e2efe5..951ff7631b50 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -4,14 +4,12 @@ AUX freeipmi-1.1.1-strictaliasing.patch 587 BLAKE2B 4d18219bf51c0673d730a719e8ad
 AUX freeipmi.icinga 117 BLAKE2B 12409a509d0b06d54196961f703fbe91034e1f68cfc19e5cb90c00a3481e29e8bca45fcaca2cc1d780ba5ca6deee58a06b24a2b928ce4a73067efb83d34201f8 SHA512 813aeebe5e663073f3bce7917b35c6ec493f5222bb759d47238aa2b382459661a90165b0bd3a74c2e6e1940d373eccb43ab03a4270d2d2c91a03be361ce46032
 AUX ipmidetectd.confd 185 BLAKE2B ea7164e6b126cc684482557cafae3ac0c39611484243e95a3e8946488cc234f4d3100f931549f08c917d454768845e276d83fa3f9e2d7a57c4454a55090bfa38 SHA512 f10e908a451c646b2c61338d79e69663c05216a54093745bd2b659041e0b91adb9be4077c92d63f6f3d62cb5510168b6a57e5e86375533e235fd3abb2b72a49c
 AUX ipmiseld.confd 192 BLAKE2B 52b125e63ca3e13fcb24f5b304f73c78269fc58b2c3e40cb185b28697c409ccf5ecd4b95599c38119bfe8c97977c3cc87e3633989e2b9d4095cded4b2b248dc4 SHA512 0a031f29a4692085054d5fc2dfe6d0ad7fb762f7ee96849ce2d562a90d6e3b0f3ae8328ab852dc22bee6221bc5cd8b588bd02075222038fa0f0e2f64ac185799
-DIST freeipmi-1.2.2.tar.gz 3031730 BLAKE2B ff821d56a15cbd8fdcb64d2d790feba873d063e71f42ed718a5ed0df4fa9b27d65c2b05aaeef4030a5d94a8bf0ef4c87a05e90a363f337a8530b43b0f0f65b83 SHA512 86ea9a073ec275b3594e93c7e7fdef2b7214dcd3e696fdec4a017841d4bb7e2179a407d91aa11b26c952cf5b06262801b41293642ed38220d57112a37878a5f4
-DIST freeipmi-1.4.3.tar.gz 3089282 BLAKE2B af8d731cb6887bf4985d343c1f2f73f807516eec04d521601096a015f7fab158a98525070775ff3adfe5c8ce6a41a75668728f561b9ce5362c6add4a192b2715 SHA512 88a2dec70696017407aac313628407200ee2c6600547fbff73c6880ae8d65cda166c8e00e0f4b7eaddc35f4376143b8fdb0b4ac284aba401c2592a95804e6cec
 DIST freeipmi-1.4.8.tar.gz 3185068 BLAKE2B 4133a7cdb5f66a28c07e965e6842c9d5931edaab7c19a4d4e89f5907ffa5c3f9e753b7738141206835346d06ecb7045780fe2913682ce70153822895c4da4425 SHA512 3cd4acde402bbc945b007e31e7f8dad3ad4539d2cf00310e9168d7cec8024203a280c8ad91e3f08b86dfa9be536779969c5393c4523df2fe8eb904f765fcfc56
 DIST freeipmi-1.5.6.tar.gz 3321440 BLAKE2B 4e40379e06b7e1b45aa4720c674a99f1ce54b167e597e0cc1aae82329e703eee95f9783086a2fec901585637c9209837f764e0b8028b78d6feaaa85e515e561b SHA512 2a33c4068af03be5d99a9a0098ded3177bedbc1b71df14c2ba67d40012bee6791388947b0dc552433feb9098753182d62a84f43af6036fbfbd06a7f277ef8b6a
 DIST freeipmi-1.5.7.tar.gz 3321187 BLAKE2B c6f7e9c4e0a03ce1d50972fee99741ec00a8f5beb0323d61d9217b3773eed33cb04e7bb92e1f293cb39c8012872babdc4774e6d81cf808615b8b283510e1e67c SHA512 a4d39d11d4e4b9635c272ee3a197729ac61c3e1c909c202498fb480c41289116eb933cd716fe2e0b5aa6dc258751ee204892bfb009398b6d5c2c65ee1cc58544
-EBUILD freeipmi-1.2.2.ebuild 2068 BLAKE2B 7704121a1bb025f3c25d123898afd7d21a3cb455e7d980fbff98e9392def58b4dcd5bdbd61daef02bdc46bcd612ab5bf906a0800fa1e127a3009b1e165d5b3ba SHA512 8a955345f982f78c63142a98f63152a3a0384a4d0bb1cc56cb3cb6f3e699655857c00c73bed98b75cbe7213bdfa74a66bfd1616f983bdc1e5c94cc1963087afb
-EBUILD freeipmi-1.4.3.ebuild 2506 BLAKE2B 9d527f89a8d889ebd16059fff9290ce863f3cb3be3bc95b5dd64094cd8953ca2837727e753cf5105fab207df8b29c6383603bf8e8a036336792dd4e4d4e343ba SHA512 95325284f617bcbdf68e6eae0ef2d873a2e99926f6e9a2ce8c9536fbe27b69e4ea90d3b7b803ae03d71682aa3527a330233f57b049ef8990acdf7882484f86ab
-EBUILD freeipmi-1.4.8.ebuild 2439 BLAKE2B 50c95b91dc409f907ac20d5f5f82e2cbf008b9b92d6295fd85e312ea08a8ca2eea5e4e1dcf7cc03f0a33379e4f7869e907251a38202252171cde8e6415e46859 SHA512 ff88963e435207bdc7b857c82998f7334b46bf2a62ed7396d6f848d449e37c2211f59fc22b0c69cb8a29c196d4e053870afd9c49067820035cac01441a54a5f3
+DIST freeipmi-1.6.1.tar.gz 3398508 BLAKE2B 48c7cd791a635a1d82cc6304c8080aa2f88415c33a8dabf80a844305de5d21ef3bf20fd236c5a56d3a761fdadc1449b8750728465263828b157f93ba6080ad87 SHA512 f8ee5b3b59c0ccffeb52717a134cb8c149e42f3f66ea20420e4efbdbdc79d527e52e6d20b2a75a4406bc8c2190f368f83d8d36cef611eeeabd58ff7bf95380e5
+EBUILD freeipmi-1.4.8.ebuild 2437 BLAKE2B 94a08cc0def79256536a9b912610611b324804aa56b07e74db6dc69c9b96ec4013ed592d5a345b0f1f9016434b54aba80135d3656fa51a582ab1bdde60917ca4 SHA512 f1587c29e63fa8d11e98857a816c22f2e7bed14d6e5fbf65fff3e0fd9f7ae8a391993dfd28883808365f2be9a51994a2903e7905f13f1ec0fa9a309eddf39ad9
 EBUILD freeipmi-1.5.6.ebuild 2376 BLAKE2B 1efb6ad0146bc811a2997e58e85f6d00a8c801e9e3b25e4350d73c5c25b57899c8adbde33914974735ac6c13f885de1c91692b7ee65e8042b66669e1b37331cc SHA512 d9d8700d2a8bb6b438273d02b3ce50540c837fd7436afb776f5691c476a051213491acfdd9671d29b7ba403f3aa9a77920e07ef33e7025c499a823668ef5aebd
 EBUILD freeipmi-1.5.7.ebuild 2375 BLAKE2B 6cf2866bcf7e355bfe9c5e803d7423eb9adce18274b27b4d25be91a3e309d71934e187f0f53418c18eacb329879aeaaa518534620ca1f6d129ae0ffc657bfb19 SHA512 b6e1f15b39894f475a56981a3721e1a2fef14205bf0aa51cd43f837aeeb96cb14c70bcb1f7d3580a5f6d474d1300bab4b7f654511560090c3d70fefbfee3faaf
+EBUILD freeipmi-1.6.1.ebuild 2375 BLAKE2B 6cf2866bcf7e355bfe9c5e803d7423eb9adce18274b27b4d25be91a3e309d71934e187f0f53418c18eacb329879aeaaa518534620ca1f6d129ae0ffc657bfb19 SHA512 b6e1f15b39894f475a56981a3721e1a2fef14205bf0aa51cd43f837aeeb96cb14c70bcb1f7d3580a5f6d474d1300bab4b7f654511560090c3d70fefbfee3faaf
 MISC metadata.xml 376 BLAKE2B f9bd1d470315ace8e1a7b71b77a2616131dec7530cba329cf10118df75e78b5c26e2891f3f5ff78b5df94f1ff67e93e05721d941a94cef847eabfea90b860abf SHA512 10922a1b392edce6cdb447eb2a06694570a88f765fd49eb7f154deed1cb3a33901c68ff1881f3068ae212ba6182c61e598e7ab7d4d683602f4016adc3ca7d7e8
diff --git a/sys-libs/freeipmi/freeipmi-1.2.2.ebuild b/sys-libs/freeipmi/freeipmi-1.2.2.ebuild
deleted file mode 100644
index 72ea48975c2c..000000000000
--- a/sys-libs/freeipmi/freeipmi-1.2.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
-HOMEPAGE="https://www.gnu.org/software/freeipmi/"
-
-MY_P="${P/_/.}"
-S="${WORKDIR}"/${MY_P}
-[[ ${MY_P} == *.beta* ]] && ALPHA="-alpha"
-SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/libgcrypt:0"
-DEPEND="${RDEPEND}
-		virtual/os-headers"
-RDEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1.1-strictaliasing.patch
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		--disable-static \
-		--disable-init-scripts \
-		--localstatedir=/var
-}
-
-# There are no tests
-src_test() { :; }
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
-	find "${D}" -name '*.la' -delete
-
-	# freeipmi by defaults install _all_ commands to /usr/sbin, but
-	# quite a few can be run remotely as standard user, so move them
-	# in /usr/bin afterwards.
-	dodir /usr/bin
-	for file in ipmi{detect,ping,power,console}; do
-		mv "${D}"/usr/{s,}bin/${file} || die
-
-		# The default install symlinks these commands to add a dash
-		# after the ipmi prefix; we repeat those after move for
-		# consistency.
-		rm "${D}"/usr/sbin/${file/ipmi/ipmi-}
-		dosym ${file} /usr/bin/${file/ipmi/ipmi-}
-	done
-
-	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO doc/*.txt
-
-	keepdir \
-		/var/cache/ipmimonitoringsdrcache \
-		/var/lib/freeipmi \
-		/var/log/ipmiconsole
-
-	# starting from version 1.2.0 the two daemons are similar enough
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmidetectd
-	newconfd "${FILESDIR}"/ipmidetectd.confd ipmidetectd
-
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 bmc-watchdog
-	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
-
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmiseld
-	newconfd "${FILESDIR}"/ipmiseld.confd ipmiseld
-}
diff --git a/sys-libs/freeipmi/freeipmi-1.4.8.ebuild b/sys-libs/freeipmi/freeipmi-1.4.8.ebuild
index d74001bcc3cf..58dd6e67e7d7 100644
--- a/sys-libs/freeipmi/freeipmi-1.4.8.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.4.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~x86"
+KEYWORDS="amd64 hppa x86"
 IUSE="debug nagios"
 
 RDEPEND="dev-libs/libgcrypt:0"
diff --git a/sys-libs/freeipmi/freeipmi-1.4.3.ebuild b/sys-libs/freeipmi/freeipmi-1.6.1.ebuild
index 1913c0b81014..44c0af38ab67 100644
--- a/sys-libs/freeipmi/freeipmi-1.4.3.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.6.1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools eutils multilib autotools-utils
+AT_M4DIR="config"
+
+inherit eutils multilib
 
 DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
 HOMEPAGE="https://www.gnu.org/software/freeipmi/"
@@ -15,12 +17,12 @@ SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="debug nagios"
 
 RDEPEND="dev-libs/libgcrypt:0"
 DEPEND="${RDEPEND}
-		virtual/os-headers"
+	virtual/os-headers"
 RDEPEND="${RDEPEND}
 	nagios? (
 		|| ( net-analyzer/icinga net-analyzer/nagios )
@@ -28,12 +30,6 @@ RDEPEND="${RDEPEND}
 	)
 "
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.1-strictaliasing.patch
-
-	AT_M4DIR="config" eautoreconf
-}
-
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
@@ -42,14 +38,14 @@ src_configure() {
 		--localstatedir=/var
 	)
 
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
 }
 
 # There are no tests
 src_test() { :; }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	# freeipmi by defaults install _all_ commands to /usr/sbin, but
 	# quite a few can be run remotely as standard user, so move them
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 8dce99d7cfa6..47ff63baa110 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index d3a8d8a4cd39..64aae30dfd99 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,9 +1,5 @@
-DIST parallel-20170822.tar.bz2 1622834 BLAKE2B b86e7a67972e52b943a98dd1993042c605713c087a5bee6edee0b30ef6beee8c951bc8aaf13fab882f8bc56f5b64ced6b764c4532821b16f854e2fe05d5f5452 SHA512 d0ce008a1d10f6802b141835a931bbbe533d5a4ca41c5636dae1ccecd5ad6b0385d36f11ba33970053dc293d2a44524921a84c2f4f38e9adcb48e435fcdb29dd
-DIST parallel-20171022.tar.bz2 1665411 BLAKE2B 9b3d5991343f16dc7f58f471ccfbf893907aaacd3ff870af01bf1eb08cda0ba21e0cd39a93a05edc7124216503e0ddeb8fad0daf6462c661654e4714e9fec798 SHA512 1b265482e0e79035e6febb9363ed2b8b34fe6e9ddc751fbf9764bd38cc85c5123aa3034b4f3937f476969cb70a3b14a724ee990a7270ab0bf3b543596f521390
-DIST parallel-20171122.tar.bz2 1661996 BLAKE2B 437d008805eb9deecfb1d533e27fa07fa070216259622de85f1cc9f7fe9e828ee721e63a8fae21824c1e7e43356b1a7c5fe2c31faca78a335d5002555eb81816 SHA512 d73523b30aa0e00cacc1ca8b68fdbc9f7ded2513d14c5a79e909303a29f016d5bd17dd530cb4e560f6413c56f9f2ef07fd29aa77d6dcdd093abd799fe8d6b7ce
 DIST parallel-20171222.tar.bz2 1690077 BLAKE2B b79be7a99b767b490143158c33632591e34c7958771c1c4196c7532b031f35fe1bda7b45cdc4b68087d64aae549ff892a86d9d6396179532c424177882c24ccd SHA512 3811310ee3957072a217ebd03b23127b115364cf24645ff0f958cf6ff9490d3379b25f7176da4f7ae43afdd230eb07d49fb7acde71d522eb1d37dae711c32813
-EBUILD parallel-20170822.ebuild 870 BLAKE2B a028f6cca58a942c1610996afb5988b9ed9ec76715b4b45645eb4ec610b0799e0c406dd78e51e076da5c19993be810cb60118de29e7be4cdc6ec4f782e3a9798 SHA512 07ab74b5f58f5e4a7ee1900efeffd1037095948a1672c4c8a3b57a181f74531405aefe177e4cfca5e91356fdb2d6fbe327aa750aacf52726f1aeb8883585846c
-EBUILD parallel-20171022.ebuild 872 BLAKE2B 79341913552fce7a2a940f7189aba732c9f233b719bbed92ffed402121e5feaad3405d5717926b06f3f3ad0cc378de2552a97721cca2dc93da6e6e50ca37354c SHA512 576c50813c673d7a0b7ef1285c20d4f7edffc65530521ab5289c973f7d78ef82d2cba9298ec147ee756bdd931a5ec5de3de6c1f2f62d97bc00e3e7839da333ab
-EBUILD parallel-20171122.ebuild 872 BLAKE2B 79341913552fce7a2a940f7189aba732c9f233b719bbed92ffed402121e5feaad3405d5717926b06f3f3ad0cc378de2552a97721cca2dc93da6e6e50ca37354c SHA512 576c50813c673d7a0b7ef1285c20d4f7edffc65530521ab5289c973f7d78ef82d2cba9298ec147ee756bdd931a5ec5de3de6c1f2f62d97bc00e3e7839da333ab
-EBUILD parallel-20171222.ebuild 872 BLAKE2B 79341913552fce7a2a940f7189aba732c9f233b719bbed92ffed402121e5feaad3405d5717926b06f3f3ad0cc378de2552a97721cca2dc93da6e6e50ca37354c SHA512 576c50813c673d7a0b7ef1285c20d4f7edffc65530521ab5289c973f7d78ef82d2cba9298ec147ee756bdd931a5ec5de3de6c1f2f62d97bc00e3e7839da333ab
+DIST parallel-20180122.tar.bz2 1717905 BLAKE2B b3dcb1000b06d319da1b4d99edd0cd4778d7decbb31743749bc8ecf1e185dd67f80cf77351fcaa9fe98b94d42d6e610f10d4ba694d269db5403bd28d620c3599 SHA512 aa2e8408e59751e491f9d07535c9302d397446ca8750983e87ac9540c25bd0d44fbda1ffc50ba1eba3c1fb83c24e1c64ee486aeed732da7a39c426178c7a8db1
+EBUILD parallel-20171222.ebuild 870 BLAKE2B 8c59bf00bce95835f194564e853f2730ab87539f14b077a463cc9d84d83c77d0be0bbeeeb997827cb3ddaf7482cee9508e3c1df295bff39b6417e4a831470654 SHA512 3eaf6a0d19f2dc305976cc468631cd79b790aef1e41a803b25eee6908c528b51e3abc4f71b36392b76fdf148bc12e40502040543d34bce691fa83ab2fdc0c68a
+EBUILD parallel-20180122.ebuild 872 BLAKE2B ca91a138a59b01cfe03759ac09535604ff0f5bb9c4c69216145441a75e7d03771975f967971b4b5cbe0f4c6a79fd3dc68511fe1e43bb6def590345cde597c94f SHA512 8b7a52a0e152253144731dee8397d6b07e9ca1559febbc6a2d1cc1ee910673d80b3763ea5aa564c267da2e1e2c14dda010f438066a91da6f780eae99200056f6
 MISC metadata.xml 1003 BLAKE2B a5a05ad6fb91321ade93dc8534764af73614a4495ae0ae023825b155be4a2d8f095df51971bb174c3e5fa335d7753121b09b22d8fef5ec4ffce3460b95fa2ed1 SHA512 a9da23fd3dc9476e2934a06ed8c0638fb3ee2530ea0ed9305a88ef0fa517a2996494d4e97492a709a601937d794748b0cba794d0b919667decdace77123c700f
diff --git a/sys-process/parallel/parallel-20170822.ebuild b/sys-process/parallel/parallel-20170822.ebuild
deleted file mode 100644
index bc813afd8a1e..000000000000
--- a/sys-process/parallel/parallel-20170822.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="https://www.gnu.org/software/parallel/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-lang/perl:=
-	dev-perl/Devel-Size
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-IO"
-DEPEND="${RDEPEND}"
-
-DOCS="NEWS README"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# See src/Makefile.am for this one:
-	rm -f "${ED}"usr/bin/sem
-	dosym ${PN} /usr/bin/sem
-}
-
-pkg_postinst() {
-	elog "To distribute jobs to remote machines you'll need these dependencies"
-	elog " net-misc/openssh"
-	elog " net-misc/rsync"
-}
diff --git a/sys-process/parallel/parallel-20171122.ebuild b/sys-process/parallel/parallel-20171122.ebuild
deleted file mode 100644
index cfc66354fd89..000000000000
--- a/sys-process/parallel/parallel-20171122.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="https://www.gnu.org/software/parallel/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-lang/perl:=
-	dev-perl/Devel-Size
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-IO"
-DEPEND="${RDEPEND}"
-
-DOCS="NEWS README"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# See src/Makefile.am for this one:
-	rm -f "${ED}"usr/bin/sem
-	dosym ${PN} /usr/bin/sem
-}
-
-pkg_postinst() {
-	elog "To distribute jobs to remote machines you'll need these dependencies"
-	elog " net-misc/openssh"
-	elog " net-misc/rsync"
-}
diff --git a/sys-process/parallel/parallel-20171222.ebuild b/sys-process/parallel/parallel-20171222.ebuild
index cfc66354fd89..778fdc10b82a 100644
--- a/sys-process/parallel/parallel-20171222.ebuild
+++ b/sys-process/parallel/parallel-20171222.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-lang/perl:=
diff --git a/sys-process/parallel/parallel-20171022.ebuild b/sys-process/parallel/parallel-20180122.ebuild
index cfc66354fd89..a195928e2b8b 100644
--- a/sys-process/parallel/parallel-20171022.ebuild
+++ b/sys-process/parallel/parallel-20180122.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 386ca279ef0a..4668682e1fde 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index be885fb77f37..57f6ff52e12c 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,7 +1,5 @@
 AUX epiphany-3.14.0-unittest-2.patch 1725 BLAKE2B 1464841241c618137db834933094968d7769c513ecd8934f73e6522744175efb5d41e05be11ed629cf3072135de39a2c6f05c083d48ea219bc29952ac000487e SHA512 5ec81de76fb8bb1574e954d5bdffd81114c022d558573f049c415f037855b65c03e727fd3fa2ce557c12f3a17921dc655c60ef4e1ad06f3bc9a6a42e58ddde70
 AUX epiphany-3.16.0-unittest-1.patch 972 BLAKE2B bf27a8b68a9526ed3b481bae00c614dc57db57c2b6909a6e0d1936c86a395cf577cba8db8bc272a3485527118e69b0f8109ad1427f957b5b2eeff4437c954c5a SHA512 ec59eb312e7826306af76fc587fb9435c6ac2da96cd574df381829bda2e2f987a47afef9bdff0e8dc162fe63f43d1a744edc84b84ae387edd1279d77ebdfdc86
-DIST epiphany-3.22.7.tar.xz 2293224 BLAKE2B 2b3cde7d8eec1d539614e54c4ee5911f8673bedfb59d44207dff9d5196e0b79ccba0f2ee4e42e82d9d2d08de5bfdb9a625d5ea9c3dc984f76443e680b3c55121 SHA512 8150952e89b86d05958bd9f9a0c78ba583764ec878220c8e328cb936108faf25a10837e038bd1a0ba1279555d2f95f819477cfddcb67c31e5b4c3533daf446bd
 DIST epiphany-3.24.5.tar.xz 3216736 BLAKE2B 8a4dd668606521d1b0144afc9ace8607f52eac457f0059e6087216323ec1132dbe1c755e40dfe9993bf685e5444db1268ada1cdf55edc04c51058fdd256c6047 SHA512 a8f203d182b8c87878a3272f8b4f642b0cf4128476e0727208135cfdffeb293425cf662c58820f0d3aed2e1b20fe6dc4cf5cbb8277a398c6f533a0bea34f40f2
-EBUILD epiphany-3.22.7.ebuild 1743 BLAKE2B 3245a8a6bb57ff535e9294ce96c72caeec5f130241eae1c9e7ed060e5471a99becbbc5a3f2b7598bb9b9abc72813022dcf2e63c488d2836a011ad376b803ee4b SHA512 c8eca05bdffc6a2f0907059d17e96e9abb93084694197f00bb4371596c5cd59d94f16d47f831e1a5bccb41b028007758436f2480900ec25baa3fa0d1bfd15f8b
 EBUILD epiphany-3.24.5.ebuild 1949 BLAKE2B f17b4603d8f1dbfc26cde3be0c333fa50d3147b61255d1d1618180d5578330a388ed866439e4506c83fb2b06dbc37cf767cd4e25cf2b2a971c222ab0613afecb SHA512 49dabbd617bf90f4af2dbb45d08d6c9a0854555a58a933872b15dca299e7bce9e9084fe07a51571be96d3310651475b0e95e4babf4cf0f7456aea0313fa42f3a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/www-client/epiphany/epiphany-3.22.7.ebuild b/www-client/epiphany/epiphany-3.22.7.ebuild
deleted file mode 100644
index a7701018ee37..000000000000
--- a/www-client/epiphany/epiphany-3.22.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic eutils gnome2 virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="test"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.5.5:=[gtk]
-	>=app-crypt/libsecret-0.14
-	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.44.0:2[dbus]
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.14.2:4=
-	>=net-libs/libsoup-2.48:2.4
-	>=x11-libs/gtk+-3.19.1:3
-	>=x11-libs/libnotify-0.5.1:=
-	gnome-base/gnome-desktop:3=
-
-	dev-db/sqlite:3
-	x11-libs/libX11
-"
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	!www-client/epiphany-extensions
-"
-# paxctl needed for bug #407085
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-apps/paxctl
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751591
-	"${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
-	"${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
-)
-
-src_configure() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=778495
-	append-cflags -std=gnu11
-
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		$(use_enable test tests)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 85f5369511cc..2a454da97bf9 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_64.0.3282.119-1_amd64.deb 52849306 BLAKE2B 7459cff0039ff73e85d6da7ceedfc9066548c220a5fbf69d74e3038d40fd0931e1828f1d49cb4d73ede3b1518cef6c8e76c536b8dc358577f8e6a356c2212109 SHA512 1c7d1084b0b7fde0f3e66e1cf145838416c474fc77ce14b3008c6cc7466830fd943e64905dec92e3af995c0d47884e2c30d72a291573baae5131094ec2aa62f9
-EBUILD google-chrome-beta-64.0.3282.119-r1.ebuild 3613 BLAKE2B 6cc1c18348c2b1b286b67d08683a6360e629d572651fcbb4d413707d356954b47a72f8c432720d52ccec500eb40262465d8f514d5a033356fa6a9cb7923869ff SHA512 0a116bf5b178f5f8d1a5d3ac5de413174baba1b3ea08889992f421e4d41a29069ce3d1801262d9d664d736f433c1aefc53527cb485e77b924dfe463af30b01d9
+DIST google-chrome-beta_64.0.3282.140-1_amd64.deb 52849920 BLAKE2B 7f3dd44f40f527f1ed2de30427e677c3d2b1de87737b88ee53c159a792ef776dccf7a604347eb3ebcfc12d2de736b33b146e5a9a5a818928f464b300d5f883fa SHA512 8c9517d2023da4c1adb91678d284e195303fdd32f34b84d77d0c8166678ec2866791251e8c75ae86991fd004d438d6f36cefba5855c3a3a19db7829d7d48264c
+EBUILD google-chrome-beta-64.0.3282.140.ebuild 3613 BLAKE2B 6cc1c18348c2b1b286b67d08683a6360e629d572651fcbb4d413707d356954b47a72f8c432720d52ccec500eb40262465d8f514d5a033356fa6a9cb7923869ff SHA512 0a116bf5b178f5f8d1a5d3ac5de413174baba1b3ea08889992f421e4d41a29069ce3d1801262d9d664d736f433c1aefc53527cb485e77b924dfe463af30b01d9
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.119-r1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.140.ebuild
index b6c1fbac0615..b6c1fbac0615 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.119-r1.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.140.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 3cca83ed782e..59f7722eb66b 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_64.0.3282.119-1_amd64.deb 51690924 BLAKE2B 295fb0aa2a5dbd855414cc7c7382fee8b9ee4936cee56c583e57ec13cbfa4744e9491207f5966e1ae79d39b75da2fa0c33ac495d632e14bad48016e73495f1d5 SHA512 7bf351e7840a1c7d7e3fddb9c38d392c39dfadd5a8e2624ec434e4d3f5815682317234858cfd493c537e4695ecdf1d57bed3caaece9eb1bc9ac2ec90fa86f0b6
-EBUILD google-chrome-64.0.3282.119-r1.ebuild 3607 BLAKE2B fca914874e76b3c8e9d98cfb15e2754d3a4d5c969eb0e29684347f0020811b933b1d09e2adeff769affcdfc8adb293c6420e07de25a34d9e637a5c5f42fb9685 SHA512 39830b1e3e55db0dfe822fd6260de0758ad39a25f803d35ac006c2b1e3f780cc78688a53a243a7bb05ed6c99b14027fd6bdbb24c6eb11f5b61964448fa99c45a
+DIST google-chrome-stable_64.0.3282.140-1_amd64.deb 51688962 BLAKE2B a1e583af1edfc73882b68007259ba980ba2c23c4070a4477bd92e8c21a49d4939c1b027569ac914927131263d0cd82b44d421c84a2a7a8e9611b2f936965842e SHA512 6602ecf29915722087dc6b2ca20ee65996eab7411f9a9f66c8c73b5cb007552877007f96e3829f63faf5357b82d9a84b4dbb25a4d8bd54d3f806af9d0370049d
+EBUILD google-chrome-64.0.3282.140.ebuild 3607 BLAKE2B fca914874e76b3c8e9d98cfb15e2754d3a4d5c969eb0e29684347f0020811b933b1d09e2adeff769affcdfc8adb293c6420e07de25a34d9e637a5c5f42fb9685 SHA512 39830b1e3e55db0dfe822fd6260de0758ad39a25f803d35ac006c2b1e3f780cc78688a53a243a7bb05ed6c99b14027fd6bdbb24c6eb11f5b61964448fa99c45a
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome/google-chrome-64.0.3282.119-r1.ebuild b/www-client/google-chrome/google-chrome-64.0.3282.140.ebuild
index aa34e5affa5b..aa34e5affa5b 100644
--- a/www-client/google-chrome/google-chrome-64.0.3282.119-r1.ebuild
+++ b/www-client/google-chrome/google-chrome-64.0.3282.140.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index ff8211f18743..5df8c471c2b2 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 38009d38d066..61ea1520806c 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_64.0.3282.119-1_amd64.deb 52849306 BLAKE2B 7459cff0039ff73e85d6da7ceedfc9066548c220a5fbf69d74e3038d40fd0931e1828f1d49cb4d73ede3b1518cef6c8e76c536b8dc358577f8e6a356c2212109 SHA512 1c7d1084b0b7fde0f3e66e1cf145838416c474fc77ce14b3008c6cc7466830fd943e64905dec92e3af995c0d47884e2c30d72a291573baae5131094ec2aa62f9
-DIST google-chrome-stable_64.0.3282.119-1_amd64.deb 51690924 BLAKE2B 295fb0aa2a5dbd855414cc7c7382fee8b9ee4936cee56c583e57ec13cbfa4744e9491207f5966e1ae79d39b75da2fa0c33ac495d632e14bad48016e73495f1d5 SHA512 7bf351e7840a1c7d7e3fddb9c38d392c39dfadd5a8e2624ec434e4d3f5815682317234858cfd493c537e4695ecdf1d57bed3caaece9eb1bc9ac2ec90fa86f0b6
+DIST google-chrome-beta_64.0.3282.140-1_amd64.deb 52849920 BLAKE2B 7f3dd44f40f527f1ed2de30427e677c3d2b1de87737b88ee53c159a792ef776dccf7a604347eb3ebcfc12d2de736b33b146e5a9a5a818928f464b300d5f883fa SHA512 8c9517d2023da4c1adb91678d284e195303fdd32f34b84d77d0c8166678ec2866791251e8c75ae86991fd004d438d6f36cefba5855c3a3a19db7829d7d48264c
+DIST google-chrome-stable_64.0.3282.140-1_amd64.deb 51688962 BLAKE2B a1e583af1edfc73882b68007259ba980ba2c23c4070a4477bd92e8c21a49d4939c1b027569ac914927131263d0cd82b44d421c84a2a7a8e9611b2f936965842e SHA512 6602ecf29915722087dc6b2ca20ee65996eab7411f9a9f66c8c73b5cb007552877007f96e3829f63faf5357b82d9a84b4dbb25a4d8bd54d3f806af9d0370049d
 DIST google-chrome-unstable_65.0.3325.31-1_amd64.deb 53258960 BLAKE2B ef575913e3183d4ec16d95c0193d4024b0a59952b1aa933c0d2099410e0d3e13a331a5b00417bb7db79ed82f08c9923c2e367cdd08efadbb6f11f1b7a9f1e666 SHA512 792680c90bccd2ef3cd13d64ab26dda4559c5f724e5b4273e3128070a31ea6f553c555897062b5a932dfbf29d6691d174cc1b3426192656efa295e93d538f786
-EBUILD chrome-binary-plugins-64.0.3282.119.ebuild 1438 BLAKE2B 25df8bdde008f7711eb41c4f616ba55ad4fee20604ba67ffd3e0b55b016896b1e71258cd894f1060e69b3ba65499ed16218bc835f5bff1318fe6529c01e9b8da SHA512 bf8818ec496fb2be1edda7f6e84920e048f8f7017e53a4d14bd52329b458f38efd2d5cc3b39190385a5e0926c8cbd6f73f2433c7abd259fdb70d51e0e245c0bb
-EBUILD chrome-binary-plugins-64.0.3282.119_beta.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
+EBUILD chrome-binary-plugins-64.0.3282.140.ebuild 1438 BLAKE2B 25df8bdde008f7711eb41c4f616ba55ad4fee20604ba67ffd3e0b55b016896b1e71258cd894f1060e69b3ba65499ed16218bc835f5bff1318fe6529c01e9b8da SHA512 bf8818ec496fb2be1edda7f6e84920e048f8f7017e53a4d14bd52329b458f38efd2d5cc3b39190385a5e0926c8cbd6f73f2433c7abd259fdb70d51e0e245c0bb
+EBUILD chrome-binary-plugins-64.0.3282.140_beta.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
 EBUILD chrome-binary-plugins-65.0.3325.31_alpha.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.119.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.140.ebuild
index c62a441fcb51..c62a441fcb51 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.119.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.140.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.119_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.140_beta.ebuild
index e94c35d47021..e94c35d47021 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.119_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.140_beta.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 33cc3ff08764..bb1f8e6f6168 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index b30464d012a8..f7793e6c3d61 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,23 +1,32 @@
 AUX tomcat-7.0.82-build.xml.patch 5271 BLAKE2B 0dbb5c994bc0d81e604569373d66691ecdc0015c4ddcdd9602156f1e5cf73e2c2bdfd27f1d1deec900c3046b979365ccaba73418a58a7a2e03b9ffe7d3489879 SHA512 160c0117e89a2ef5caae95004b426d155c64e19e6c708a9cc11a53308cba037799a60e4f901c3a5bb5af2d2ca8452246d7dd66283b91fad4a339004026148fe4
+AUX tomcat-7.0.84-build.xml.patch 5836 BLAKE2B 2c79524b53ffa777b3e3efbb9f3dbd806f138df0d62058abdcabcde03e687961c355b1c6d58bf5bd757fc594a08054109b17407774663b082eb36b5ac8e9bf1c SHA512 ff04ecca86808e0f8d8a5f93902b9adace7722bf6b497e97fc9d5cd20925004e22e9759e980a6c184548170e63c299446a26be34833c2b23e70d25bd245cc557
 AUX tomcat-8.0.47-build.xml.patch 10703 BLAKE2B 6a3621e4e46fa193390115815be73cf7b42c4a241ce48b853c22f0837b66f2da71b66e1ce074a0d454f674f855f567216caaabfc64fb8b01f6b495652a5a3d82 SHA512 ffea8c47e066573571050130f1c6fd03e18af872f814d9bb23c1f0866ae8184039828500c1fd7d5c8186a47625baa3c9db3653608e31d19fc110129d32262001
 AUX tomcat-8.0.48-build.xml.patch 10703 BLAKE2B 6a3621e4e46fa193390115815be73cf7b42c4a241ce48b853c22f0837b66f2da71b66e1ce074a0d454f674f855f567216caaabfc64fb8b01f6b495652a5a3d82 SHA512 ffea8c47e066573571050130f1c6fd03e18af872f814d9bb23c1f0866ae8184039828500c1fd7d5c8186a47625baa3c9db3653608e31d19fc110129d32262001
+AUX tomcat-8.0.49-build.xml.patch 10844 BLAKE2B 339600eadad8cfb11b7c32bc731f0a4f6ec3d291fc74d6d3ea4cf9139f7889efd2591cbc0afbcafc466b2e55eb48a1d4f90dce252b7750e60c164621d416ae33 SHA512 c177774153663f368fa14c8001ac41312c5fae85dfae57642d807a73fc18b93cc09b8c456db01275a349baedfa225dad81b758097a107d9e837ec1408ca8e297
 AUX tomcat-8.5.23-build.xml.patch 10323 BLAKE2B 754121fe17ea72678af3fdfd0a59e5cf6a21c86e4765bafe8aee7f94e950e6eafba665782474f31de1b21e631e4d4473e970f89ea07a5d73b9057d7ee256d3b7 SHA512 1d322b74acb363310566d6f5c35f83326c6504a8a75721f24536db0d650104765d6402f454843c38f816eb8f290ccd0273b559116ea62df433bd59a38ec29b72
 AUX tomcat-8.5.24-build.xml.patch 10323 BLAKE2B 754121fe17ea72678af3fdfd0a59e5cf6a21c86e4765bafe8aee7f94e950e6eafba665782474f31de1b21e631e4d4473e970f89ea07a5d73b9057d7ee256d3b7 SHA512 1d322b74acb363310566d6f5c35f83326c6504a8a75721f24536db0d650104765d6402f454843c38f816eb8f290ccd0273b559116ea62df433bd59a38ec29b72
+AUX tomcat-8.5.27-build.xml.patch 10464 BLAKE2B 658ee0da1b8ae96dd40df7345cf9efea24e409eaa4024f5bcf695bb1f91811b6513f31f70fbd0899040aa23314a2725d2871dc42e81977cd184de6a86a4fddc3 SHA512 5f7f25eae6c5f7e9ca943800b48bea084e7279110d73fa7a54bfc89eabfc617cd82a36f3634aaa9d14580e9d2bf9115214d6cde663b38545f1a3977f597b14e1
 AUX tomcat-9.0.4-build.xml.patch 10464 BLAKE2B e3a8ca895f310fe91f759f558927761a307425bd373695b00eda0d642f98fdf4f8b7d5abe7070fa02ba7eaef506c59ce6e56a47602bce657c05320ccf5766292 SHA512 d055cfa4d947873a0e5541f7679bc1f52fae5196ab00e8c46eb011cb6373dbefa3c29721d3fda0d5b18b7bc961ffc1305d2766fdf088e3db2ee5c6bf5dc1c9b1
 AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
+DIST apache-tomcat-7.0.84-src.tar.gz 4713409 BLAKE2B 3dc7766db1492413bbd3f878a2da7392dd4cfd1ca4c3e8a236e380cdfbc0c4ff075665d39871026e61f0bc88e0a84f372fbcef6914af9dc99e6dda05bafc6e48 SHA512 ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74
 DIST apache-tomcat-8.0.47-src.tar.gz 4996505 BLAKE2B 8024ec5248fed57bf1841a320fc23fa8a7a99b2352ea9635f3d4dc903bd363f3a15adc47f48250a4d732ab9c1724443bcb602b459b6ede2e7908051a5c3fdea5 SHA512 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702
 DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841
+DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87 SHA512 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
+DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415 SHA512 d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab
 DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557
 EBUILD tomcat-7.0.82.ebuild 4279 BLAKE2B 21c8b0b0d3823ed1535276a03ed63b2afd840648036a1175f52babf19e3801f85d6bfb0822ef8a30aad1e731428511c2816d77d0afdd7587777775c33072fd86 SHA512 3f366efa7559235ef48b8dc297cafa6af9854f7ea6e4bce0e03e1be956590f3fa34fdbeeb5fd8ac7bd4e7ed43a4bda381a3c2b7f2b3e5a0e1ae50523ce5d5def
+EBUILD tomcat-7.0.84.ebuild 4168 BLAKE2B 13d55a2939d6e532abc64c985a2a83ace8fc4b865cb4abccd9b054c012cf3c090570fad4eaa6d9e2101bb7ba2a20fbb53c064a20163ac73af1ac02c46384dad1 SHA512 67bebe9a934570b75c6c69d3395213f8bfe4f433ee201743900469111a663a794402726502bc154a515e9ea96d528daa79265ea5ff61c878b6933b916c3a34c6
 EBUILD tomcat-8.0.47.ebuild 4471 BLAKE2B b9e4bf2549bc087f2ede1c2d21f8a28734b65155539ff9686d4d21937a3877a38cf8a8e60310a708f9122d1e4cdd7dbc52c6a8e2ab4483fbf2ec79b62b61a541 SHA512 e97bc0a73e8a1384c30915d42e1cfcfa4431ae63dccf85b997c30333a464b3042ec5aee48678c2dbcb045d30532d7aa17ec00ecff14f0d8d7caeaeff9cd3f5b2
 EBUILD tomcat-8.0.48.ebuild 4472 BLAKE2B 5b0b4c1df76282c0f266ac921275285423834f3c75e44b8e5779e74eb444af738e2dda68d8940f7fcfa9d10d6850d148b46dcf58b8ff2d25afcd51dca7b4c614 SHA512 6eb897fb6fd1692b778bb8c80ea2e879690aee6d12af0db1b1dbd3a8fbdb01443af9e404694a35613a3be68e53ecbe5b259cc06feeee94c10d8460495d36c620
+EBUILD tomcat-8.0.49.ebuild 4472 BLAKE2B adc088c5195c8ee33e73ec195114cd347dec109bd9b43844bf4104761a5f62f9373d0b7031b16f2cc073b8909fc2c0364206d7218169a9bb57b84065a1d60a79 SHA512 8eaf07510458087946fc4d8655de962d67e5c550c9270608b35ead3fe0bbbe8be0445d9ce5fdcffce9f3bde2933c874fd369f409949b7eef1aaa041792c15e32
 EBUILD tomcat-8.5.23.ebuild 4519 BLAKE2B 89e25b96d1b794e910ce1c549bc20d1c788f8dfe034d961614c358ff08883177923a45e25f719f850196e7f6d9fedc144cd445f522e85cf78fd951d1040a1725 SHA512 c63e34cac14b2739588a81c5d7b667fe9431f43df0a14d3f596a24e9414a375fcf6466d066e35395532d01b681ba634b026c34691dd10d63590858b6bbeac5fa
 EBUILD tomcat-8.5.24.ebuild 4520 BLAKE2B 1d117a461e056afcd51d4311759a51f6a519e92fe059fbc6c7b497fb34afdf1c7702fa917b3531156c93eb27438a251a2a3766b910f44be410a01b910e63db97 SHA512 2c50bbd367df38f7214d3bb04606e5a5f10f68a2d305a939477f2686d26ff4b9596dd4703a9979179919ad9ee9f034db2dc7dff5d0fba0c0b75b00abe6c3c918
+EBUILD tomcat-8.5.27.ebuild 4520 BLAKE2B dd196056f5a9573c3a96ade1d2002d8c2941d7184fabadc08679f5cc3f4c22251c1f7e33e98aacde15e8f9d24fece6e0a82dc9389c1ff0145ae8fe2369cb0770 SHA512 9090868c52a1b844202618651eab855e9e7ef48fcb5f6b0ad546c9c223d4835ca3cb3047e44906298312359d3cabd54d7a19c1e02c9b19b361e8e6431536a43d
 EBUILD tomcat-9.0.4.ebuild 4500 BLAKE2B 0b9a6f855b524697ba5c99d96600eb479e140d03a6719b148c17870188c76f63cf71d829a3f277b16e8804aa839380692842354b2e8196d234102d54f80a433e SHA512 7c27fbeddc1a1e1ddeb1630a722473c6f8d29ef43f62c63490f643e2cad12288f0d6fbfcd71629fd18eb1b350dace1db2f3e61169cad34915e943060dd025cb7
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch
new file mode 100644
index 000000000000..aa40bd1564a4
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch
@@ -0,0 +1,161 @@
+diff --git a/build.xml b/build.xml
+index 3f1229c..13894ed 100644
+--- a/build.xml
++++ b/build.xml
+@@ -671,12 +671,14 @@
+       </fileset>
+     </copy>
+     <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+     <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+       <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+         <include name="*" />
+         <exclude name="jspxml*" />
+       </fileset>
+     </copy>
++-->
+ 
+   </target>
+ 
+@@ -733,26 +735,32 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+ 
+     <!-- JSP 2.2 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+       notice="${tomcat.manifests}/jsp-api.jar.notice"
+       license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+ 
+     <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- Bootstrap JAR File -->
+     <jarIt jarfile="${bootstrap.jar}"
+@@ -999,9 +1007,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1060,14 +1068,15 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
++<!--
+     <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+-
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+       failonerror="false"/>
+-
++-->
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1697,7 +1706,7 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1886,11 +1895,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!--
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1902,6 +1912,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+     description="Create the Tomcat javadoc" >
+     <fail unless="java.7.home"
+           message="The java.7.home property must be set for javadoc build"/>
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -1966,6 +1977,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2006,9 +2018,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path refid="tomcat.webservices.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2632,7 +2646,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download (and build) components necessary to compile" >
++          description="Download (and build) components necessary to compile" unless="noget">
+ 
+     <!-- Download Commons Daemon -->
+     <antcall target="downloadgz-2">
+@@ -2675,7 +2689,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2721,7 +2735,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch
new file mode 100644
index 000000000000..b7e0a283fe26
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch
@@ -0,0 +1,267 @@
+diff --git a/build.xml b/build.xml
+index 3152712..9e09384 100644
+--- a/build.xml
++++ b/build.xml
+@@ -718,24 +718,29 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
+-
++-->
+     <!-- JSP 2.3 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+ 
+     <!-- EL 3.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- WebSocket 1.1 API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+@@ -1005,9 +1010,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1067,7 +1072,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1101,7 +1106,7 @@
+     </javac>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc" depends="package">
++  <target name="build-tomcat-jdbc" depends="package" unless="noget">
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1116,7 +1121,7 @@
+     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc-src">
++  <target name="build-tomcat-jdbc-src" unless="noget">
+     <!-- build the jdbc-pool source jar-->
+     <echo message="Building Tomcat JDBC pool src JAR"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1220,9 +1225,11 @@
+ 
+     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
++-->
+     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
+ 
+     <!-- Note the meta-inf below will work as long as there is only one JAR
+@@ -1615,7 +1622,7 @@
+ 
+   <target name="extras-commons-logging-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
+@@ -1754,7 +1761,7 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1941,11 +1948,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!--
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1955,6 +1963,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ 
+   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+     description="Create the Tomcat javadoc" >
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -2016,6 +2025,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2054,9 +2064,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path refid="tomcat.webservices.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2791,7 +2803,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download (and build) components necessary to compile" >
++          description="Download (and build) components necessary to compile" unless="noget">
+ 
+     <!-- Download Commons Daemon -->
+     <antcall target="downloadgz-2">
+@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2868,7 +2880,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2908,18 +2920,18 @@ skip.installer property in build.properties" />
+ 
+   <!-- =============== Utility Targets to support downloads ================ -->
+ 
+-  <target name="setproxy" if="${proxy.use}">
++  <target name="setproxy" if="${proxy.use}" unless="noget">
+     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+   </target>
+ 
+-  <target name="testexist">
++  <target name="testexist" unless="noget">
+     <echo message="Testing  for ${destfile}"/>
+     <available file="${destfile}" property="exist"/>
+   </target>
+ 
+-  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2931,7 +2943,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadgz-2" unless="exist" depends="testexist">
++  <target name="downloadgz-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2950,7 +2962,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2961,7 +2973,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadzip-2" unless="exist" depends="testexist">
++  <target name="downloadzip-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2979,7 +2991,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2989,7 +3001,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="downloadfile-2" unless="exist" depends="testexist">
++  <target name="downloadfile-2" unless="noget" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3012,7 +3024,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="trydownload.check" depends="setproxy">
++  <target name="trydownload.check" depends="setproxy" unless="noget">
+     <condition property="trydownload.run">
+       <and>
+         <not>
+@@ -3023,7 +3035,7 @@ skip.installer property in build.properties" />
+     </condition>
+   </target>
+ 
+-  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+     <!-- Downloads a file if not yet downloaded and the source URL is available -->
+     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+   </target>
+@@ -3034,7 +3046,7 @@ skip.installer property in build.properties" />
+ 
+   <target name="ide-eclipse"
+           depends="download-compile, extras-webservices-prepare, download-test-compile"
+-          description="Prepares the source tree to be built in Eclipse">
++          description="Prepares the source tree to be built in Eclipse" unless="noget">
+ 
+     <!-- Copy the sample project files into the root directory -->
+     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch
new file mode 100644
index 000000000000..e08dd17c6cc3
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch
@@ -0,0 +1,258 @@
+diff --git a/build.xml b/build.xml
+index 2b3c7cf..b8e57e0 100644
+--- a/build.xml
++++ b/build.xml
+@@ -717,24 +717,29 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
+-
++-->
+     <!-- JSP 2.3 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+ 
+     <!-- EL 3.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- WebSocket 1.1 API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+@@ -1010,9 +1015,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1072,7 +1077,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1106,7 +1111,7 @@
+     </javac>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc" depends="package">
++  <target name="build-tomcat-jdbc" depends="package" unless="noget">
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1121,7 +1126,7 @@
+     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc-src">
++  <target name="build-tomcat-jdbc-src" unless="noget">
+     <!-- build the jdbc-pool source jar-->
+     <echo message="Building Tomcat JDBC pool src JAR"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1225,9 +1230,11 @@
+ 
+     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
++-->
+     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
+ 
+     <!-- Note the meta-inf below will work as long as there is only one JAR
+@@ -1610,7 +1617,7 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1750,11 +1757,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!--
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1764,6 +1772,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ 
+   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+     description="Create the Tomcat javadoc" >
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -1828,6 +1837,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1868,9 +1878,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path refid="tomcat.webservices.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2617,7 +2629,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download (and build) components necessary to compile" >
++          description="Download (and build) components necessary to compile" unless="noget">
+ 
+     <!-- Download Commons Daemon -->
+     <antcall target="downloadgz-2">
+@@ -2637,7 +2649,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2694,7 +2706,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2734,18 +2746,18 @@ skip.installer property in build.properties" />
+ 
+   <!-- =============== Utility Targets to support downloads ================ -->
+ 
+-  <target name="setproxy" if="${proxy.use}">
++  <target name="setproxy" if="${proxy.use}" unless="noget">
+     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+   </target>
+ 
+-  <target name="testexist">
++  <target name="testexist" unless="noget">
+     <echo message="Testing  for ${destfile}"/>
+     <available file="${destfile}" property="exist"/>
+   </target>
+ 
+-  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2757,7 +2769,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadgz-2" unless="exist" depends="testexist">
++  <target name="downloadgz-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2776,7 +2788,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2787,7 +2799,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadzip-2" unless="exist" depends="testexist">
++  <target name="downloadzip-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2805,7 +2817,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2815,7 +2827,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="downloadfile-2" unless="exist" depends="testexist">
++  <target name="downloadfile-2" unless="noget" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2838,7 +2850,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="trydownload.check" depends="setproxy">
++  <target name="trydownload.check" depends="setproxy" unless="noget">
+     <condition property="trydownload.run">
+       <and>
+         <not>
+@@ -2849,7 +2861,7 @@ skip.installer property in build.properties" />
+     </condition>
+   </target>
+ 
+-  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+     <!-- Downloads a file if not yet downloaded and the source URL is available -->
+     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+   </target>
+@@ -2860,7 +2872,7 @@ skip.installer property in build.properties" />
+ 
+   <target name="ide-eclipse"
+           depends="download-compile, extras-webservices-prepare, download-test-compile"
+-          description="Prepares the source tree to be built in Eclipse">
++          description="Prepares the source tree to be built in Eclipse" unless="noget">
+ 
+     <!-- Copy the sample project files into the root directory -->
+     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-7.0.84.ebuild b/www-servers/tomcat/tomcat-7.0.84.ebuild
new file mode 100644
index 000000000000..4ce5c4efd222
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.84.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	virtual/jre
+	!<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+	virtual/jdk:1.8
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+	default
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	java-pkg_clean
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+	use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.0.49.ebuild b/www-servers/tomcat/tomcat-8.0.49.ebuild
new file mode 100644
index 000000000000..badb0b2ee129
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.49.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	!<dev-java/tomcat-native-1.1.24
+	>=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=virtual/jdk-1.7
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.5.27.ebuild b/www-servers/tomcat/tomcat-8.5.27.ebuild
new file mode 100644
index 000000000000..17a74d0fb02b
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.27.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	>=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	!<dev-java/tomcat-native-1.1.24
+	>=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=virtual/jdk-1.7
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 2620c42f7281..3345e020ec6b 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 0ab47ded11cb..6a186426ba61 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -3,7 +3,6 @@ AUX xf86-video-virtualbox-5-localconfig 996 BLAKE2B 67ce33deaa4073b4d522ec586567
 AUX xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch 1248 BLAKE2B 449981786700fd7c01d1d7346489553afc6959912c882aba750cb062009f773955efb247dc0bfeb4dca298da09393e0cd749c592a580e7509db10a7bea7a3dce SHA512 793a7f937eddf955ae7a2ca48d41675c8a6ec8c34e9f76d3edc8618562c2d0333714d9de7ae5927e16df7bc750e0309a3dd4173f3f9e262aa5c0d80190c98302
 AUX xf86-video-virtualbox-5.1.10-xorg119.patch 3375 BLAKE2B 52b6999cffb8b60ceac7949af1d3bb8452e138a9d6f8d84ac6587a121e1a379f9e69a0b9896c83e63c7ebfec26abe2b46e957a25385d04cc8613aec407483906 SHA512 f84cdbb6b43444eda753f6a31b3fe2514152545a7d75569d88f3b2d22542e5d087dfbd735457155f1463449f4e2138382d6f730978bd8d80280ad609dc826718
 AUX xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch 533 BLAKE2B 3ef40088fb83096c17944609d4fb7c14b7e7bb39ef0bf08d3bcda2795d4ead8801f06e7761804191ca4eec537bc22f45dcd6085407b1e6ef3ed4227a1fd594b0 SHA512 325a7adca76884e40be17d756ebdee3c8e8565d50a872c7cb2e429d046fd91b44acc6b788abb0eb28ab14594687203894ffe0c2d441c38ea5f87a88e76e87997
-AUX xf86-video-virtualbox-5.1.30-sysmacros.patch 679 BLAKE2B 6ff7b4973ae1bfdc1f66e5ed3c8e4f0b2c11e3e1bd6b12577703b1d0a8cf4e7c7de52fe5918049f009f8e868d93b5c62966a0a2be0421a08515e94d06f6267a1 SHA512 549073a60e2e56d2463c541d027e7c3c2c9ec22d06943ddd04f7b65ae5213eb67853806de16631da389e3f94c42b8f25c7717efb92aacfcc87062d7d7d3101ea
 DIST VirtualBox-5.1.32.tar.bz2 117268301 BLAKE2B 336df054e3407d7e701d6719258cfcba9beec1439cbe94f137570cfcbdea02df3e34374ac36d3b4387c47ebafd17a0f05c2fb710eb4f140d8200117b505aba98 SHA512 052ac1672515a36c4138e2d52672a466d4c768f219f52eefe98e747a292ebebe04e7de35547eae6803654be5dc937b8e6f4d358a65fd4f49a8333eac8862d138
 EBUILD xf86-video-virtualbox-5.1.32.ebuild 5048 BLAKE2B e6214b4d223bd87556921fe320b1603de3cd80256254f9db6e8a60a3773b0212b68e5a5a25fe655fadc32e42b906a0f830e12c64c6a43978bee06e14a7b965f6 SHA512 4ed0f341ca74f86b7a41714d3ffeb7e6871a8362f83fe0a5fa6cb27c827fe88a2fa416d74a155fd05f92e10b79d9f8a0cbd7476e0fcaf7cb87a7b5de3d1813e3
 MISC metadata.xml 407 BLAKE2B f1d23bcb66043219615b3aaf7ead87df8b8c12f09e3a1cd0b919268cc5282f0ebadacfce7860d12715a75209219166f39d6b2b89509e9920dc7c5507db146176 SHA512 e28c65e666d3f78cc8752c3f8af0d7e5494b4a2f93fdc98cf71110424aa9a72b68ee40aa299c46a7048d375a1f52bd0f03efd12d5e88226a4934989e7634afc2
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.30-sysmacros.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.30-sysmacros.patch
deleted file mode 100644
index 0ee85e52f002..000000000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.30-sysmacros.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- VirtualBox-5.1.30/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp
-+++ VirtualBox-5.1.30/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp
-@@ -64,6 +64,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- 
- 
- /*********************************************************************************************************************************
---- VirtualBox-5.1.30/src/VBox/Main/src-server/linux/USBGetDevices.cpp
-+++ VirtualBox-5.1.30/src/VBox/Main/src-server/linux/USBGetDevices.cpp
-@@ -47,6 +47,7 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/vfs.h>
- 
- #include <dirent.h>
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 20118efda49a..aad7aa2562eb 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 21d4f16e15fa..6fa291d83fb5 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -4,7 +4,7 @@ DIST cairo-1.14.10.tar.xz 36251788 BLAKE2B 2015594f2a263250b7fd924840155aa3f813e
 DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B 3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e SHA512 ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
 DIST cairo-1.14.8.tar.xz 35392464 BLAKE2B d1d8b283bc55bcb8f34a1e1d8dd6384292c128e38589672f404ee1d15b32004398c3b4668737e1ef34a58b841445530603c9105644076cbda289ec576c55a252 SHA512 dfe77a01ca72e21e11610243a5f6e92e6b0821c4ace11686fb0bac8f0bf9217a79974ff46bdf3d19fd85173f5f24f2c3f6d4e00cf729a55a6492e6798d6c4ec2
 EBUILD cairo-1.14.10.ebuild 3948 BLAKE2B 1d0341e593ec6a05f3d085e794e78e80d8e77c97d48ed18a48531a40afa1976c24128942ed44059616597816f9eeb812d091740279eb3ecb7e5246ed48de85a9 SHA512 c7a336a2ac1479f437b8004c5ad4b38756b1056f1cb9d0ab4dcca97e1eb61c240114f867ee66e9cff1273156f5c6a472cca1c7ccbfac7a7b283c98c03c1d4a62
-EBUILD cairo-1.14.12.ebuild 3945 BLAKE2B 8ce1714704f6d04fd3fbef80c88ff96d28b06ff00d8da5d5c49efcf4eeb4437c20d71cfb059595c511b746b5bd1f4c2bf3e1e00a16b92688254929f667e5820c SHA512 5751dc43ec2f56f54cd23be65cd1c40b27cb86784e5c2571062b2b074fad7173e78d9645140589d9ddc7a26fb13367e4961b760a9a7dc073fa03accc05f933d0
+EBUILD cairo-1.14.12.ebuild 3944 BLAKE2B e8b3ffd966250ece710a27375373cebe97f78adb914daf962d042d648f4a8062c89d9c55c1f79a181cfb6a8464b54cdeb169ed2a4754d52a3c6247a196ace95f SHA512 9ca1a710e8327a3f31b3ce243eeceac812785bb7a19740e4a32efafd1280c6830e0a030eb6a40ece5ada156e462d4a1723ce97ded21954320788e2da0b076ab6
 EBUILD cairo-1.14.8.ebuild 3969 BLAKE2B 446cac4d88e0805ded1a3ca9702eb58ff0b78c5c7038dc4a4671f8677b1ef8d0e88c75d94e16a0366652835f83c542e5841c645160203ce3f3fa4006b16c5f4c SHA512 32250d74eb8508f601bb35096c2446bcf67494bad7d7e4402173044e46d9842c5c8c00361b8884a05fb7f2f5b58f90283e0a0a11036ec71814c4853676d66f97
 EBUILD cairo-9999.ebuild 3997 BLAKE2B ab2fb119f30ab78b474e42a342893dbf0157c89b37cef389d17abe614fc349de707e29b71f27c3aa46c1e84ab4f9c308636a444296cfea459ceeedd0f2e4345a SHA512 5ba225067a8b9def6881f0eb57f57dc2916d0f695bd74d48f2d2def24f413a18dcb37b81879193adf63e949e719c997cc11f6fd4ff5b746cf944f9757e03ee7a
 MISC metadata.xml 821 BLAKE2B 849b86bb474319b9787ec50aa29354fa84a2decdf36074e6618a2a5f1c120c48470c4a54ac7ad8e1c34e9d79b190e1b265f8eaa4f8179c15fb1679d4e35b9ffe SHA512 f15c40e43476dbf8ea426092f80110f10fc3acf3035b57b1d25a94cb4437252cdbee59fca5f054248c62eecf75afe49ab4ba8b12818e8f571217899c2b536ec5
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild b/x11-libs/cairo/cairo-1.14.12.ebuild
index 81fc462cc937..3a96a04fb72d 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index c845bc69cb7f..5ba549d06a88 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -4,5 +4,5 @@ AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e
 DIST gdk-pixbuf-2.36.10.tar.xz 5772196 BLAKE2B 542df9a5b9d3e790cb592b714a402633eaf37ecd4a21d597f307bdc3f5a0a35e3c3d9e3f6c822e163d0d64b9de62d7b120cb2b174f3109bdffc5e08225506f0c SHA512 d080d20baa20efe58cc5e5d043532f57e7950c0f7a3661998f924ae2a819f6bf1113e1da7785ac2063dfa582576d418eea5b3c80ea3db16057de43cc3f911d35
 DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6ffbc69fa66236d91b29a6e923c01b91054eb491d2ba15a2e5d2d694f143eb0cc472bbed9bfce0bc015d6602449920fa SHA512 231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3
 EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3795 BLAKE2B e3a6b029120e43a6395096782c3d73599ef953321e3f46480b7211199e7b7326017b0674f71cae3298a81c183b602545294de14d351edb0fee53970f4e8421fd SHA512 737a797da5cec04c2f61c6cf5df869f87e1050dd608cb2f1a670c28364c349f3aba6b51b45adeda36bb5f58f1a7a39c3b9d989d61c2b118c50a409a622d381c2
-EBUILD gdk-pixbuf-2.36.11.ebuild 3889 BLAKE2B e0899b23bb22a245cc3dc123299560ed369303529c7d643dc4ea70cd6138a269b3bd290edf79f3781f14e4be0c037ed20bb79cc2d886058a73e3d4163519f8a0 SHA512 3f0ef05374bbee83544cb2b52a8dd2e960027dac009aab88ea6d90abffbe739d2a7f2279e4db08984340bf21918e8315c077e8f085fb0150bf563114bfcadf2c
+EBUILD gdk-pixbuf-2.36.11.ebuild 3888 BLAKE2B 9c944150f47bdcf3affd47490896785d9226f5ba4b8c70388b8036b75a1b5b9189f2d777cdcb7ed57485ccb234c84d2e6d9c3632ebf142b0e2eac1e0c054b3ad SHA512 98f96446e3ebdf88fb949d3cc794c13411f1916f3af64026dfdace4424a8691b004ef23396feb5f9f9767d24ffc0c459f129955ef4cf1bdce2fa3b00fae8c1e1
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
index 89fa40f2ab2a..c1db4416c3f0 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 5500453bf0b4..391224a6e592 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -5,13 +5,10 @@ AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
 DIST vte-0.36.5.tar.xz 1017504 BLAKE2B a7a94b389660f9bbf7aa8033e4a5e2cc96c39458e43960ad2ce785f2fbe1597c7156d090aab220e909ae31f8731d0d961686dce08aef0f270581c01de4bf19b0 SHA512 43f9211381238ca6cb7f49c8a9dd8f48f702e9968e038fa26ee69228c1fc86061d5dbfabb2c27f677280e89ae9080f20594f3c27481246e3f91dd5f3ea0354f6
 DIST vte-0.46.2.tar.xz 989756 BLAKE2B 5b62ca5425604301f748a214610e2e6e2431f9ad9d21b0867e8d8e34910f1b6c4b77029b57b8255dbd04c6e960aaa2583a2ec670f4683b2331290f22ea957454 SHA512 abcf94752094314b01eb14156e894bedb24f959d4faf84bb070b34eb2745f01d029859ef959ddf1475776605a1721e4d011ae7ad57fc4937d8bfcbecc8b0cf61
-DIST vte-0.48.3.tar.xz 1009364 BLAKE2B a16b56ecab0db7ee1a9f8bc9f975ba13fb1dbbdcee77fd6c6f7c11df4680eb644566bc30ffb2ac6009c0ed891bb20598eebaeb87837ae1ac72d7eb8241d2e119 SHA512 3037b61a759cfcf56838bc7804df5a211da416bff9ddc5791f8a8d5157b90926985cfe57d7edbab42de64945d5e668470fe4129a218fb9c7af546648e1660c72
 DIST vte-0.48.4-command-notify.patch.xz 5500 BLAKE2B 88b655403d2bef034604a283b173fece305af35f51b20f9d4811b33265b5a6eb83441e0b978539de501d118a8431c4a9a9a69a111a03c45adc87763b15b09fd2 SHA512 b8ba202aedb5d821962a7cdc89e6ef8ac8a3480dd7681bf8ce708ce511598f3335ba153750d40cb06e9a2c5bab5888b3daef9096458c2889d94028feaa394575
 DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b27109724fb318d28200220f1514fb23e4cdc90263a756914b5db442c947578c8854a535cb960a06f7bc03a77 SHA512 4b75bd881e58b5043bc44e391ef3a826a2c25d0f1bb5ffb890367e11a60b1bcbce091575ede6972a89ae043b39c51897f91fca1faf6872664d602e503d8020fc
-DIST vte-2.91-command-notify.patch.xz 6012 BLAKE2B 4a37464ed214e80e5db8eb6a9c09a33816d143e081a5391709be3cd3611197f75d5cfe750ecdfdc95199328ae4894d7ad565933338ba5025e108cd8e2720af68 SHA512 e6a8955f99c98183c60df770b5c6826c5a456aaac3c83a8d0fa5037d2dd250450c8287dff335e22ca32332645d13d298cecc5d2c884c7c9da65d09dfd2a79054
 EBUILD vte-0.28.2-r208.ebuild 2973 BLAKE2B 7ee8e830fd6499df69012a9d69cfe21343f46c0c114e47bebba9de573443a60f0def0660e359660d672398c469e61d9804d53e02ebfd6396e28d2fbd361cc821 SHA512 c8711b4777911936c2c2154eaa620f4ccbcb5df491a1943d97bb2bc1179ab333ee422fcf26f56a7f76170941b6d6bdb21b881fffb0c7af96a37cbf7eb63ca560
 EBUILD vte-0.36.5.ebuild 1695 BLAKE2B 3d83e03aa9a8aea1e17db966f44f33e500a60a99c0d2e8fe9113f66ff3b30e8cc9800f5889b6b94140b096bffc8103bc105c6ed9556fa680558b98cdbe52dcb3 SHA512 b0665651664f07d69741836d0e870710ec271807fd2da982b544eab42d48da74bb5800324c91cce1ca21080488606d2f5e3263ed3e73357812d5680f3cad91ba
 EBUILD vte-0.46.2.ebuild 1898 BLAKE2B 663e631d3d2b638b0bc1f1f5d8cd30bf9509bb8419b0293cc14b49b65a0548e2a218ccaf05ef7942210ddb69fb4b21d47e99b7dd16d6e1d6404e048b31d965dd SHA512 e966d45f6d46ca821ee4891fdfc7f03d01db9c64327b2146178407cf1adb8730d02723c205043d7bda68ec49d851d34412d4bb8d35908dcaebaf733e3ee5021d
-EBUILD vte-0.48.3.ebuild 2343 BLAKE2B dea244e7833cacf5afd7ee1e4e3f2fcf0a918b925d58e234ad7a8f5b653129284a27ba4600a191649e537e13d96123a9d9659b4f75ccf91a7938b583314ef80d SHA512 33aacf93302abd2f25d7ea7db14e57a30064ad26459077a670ec69dd0b629d37aa5574ae9c2b4b76f83583b411152dd4db6516b4274e059617afcee1dbe27deb
 EBUILD vte-0.48.4.ebuild 2328 BLAKE2B deb78534c31faf544847e371c6edfd95e6d231d188fc0f3ef233c72656c66be702cb4eb050a239d1d2fc0a416c5254f5a6b654177aecbefb9c04e55b796a6991 SHA512 ff2d5e94772513a72261c5317c527ad0f41c2c69a5d6ac41d3a0a2b6f284eebbe2eff918f33016c70f54006ebe64719fbefbcd7d4d375b6fbfa89db6319382f1
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.48.3.ebuild b/x11-libs/vte/vte-0.48.3.ebuild
deleted file mode 100644
index 69d239356618..000000000000
--- a/x11-libs/vte/vte-0.48.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
-
-LICENSE="LGPL-2+"
-SLOT="2.91"
-IUSE="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
-REQUIRED_USE="vala? ( introspection )"
-
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-${SLOT}-command-notify.patch.xz )"
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libpcre2-10.21
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	>=x11-libs/pango-1.22.0
-
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	dev-libs/libxml2
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	vala? ( $(vala_depend) )
-"
-RDEPEND="${RDEPEND}
-	!x11-libs/vte:2.90[glade]
-"
-
-src_prepare() {
-	if ! use vanilla; then
-		# First half of http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch
-		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}/${PN}-${SLOT}-command-notify.patch"
-	fi
-
-	use vala && vala_src_prepare
-
-	# build fails because of -Werror with gcc-5.x
-	sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		myconf="${myconf} --disable-Bsymbolic"
-
-		# interix stropts.h is empty...
-		export ac_cv_header_stropts_h=no
-	fi
-
-	# Python bindings are via gobject-introspection
-	# Ex: from gi.repository import Vte
-	gnome2_src_configure \
-		--disable-test-application \
-		--disable-static \
-		--with-gtk=3.0 \
-		$(use_enable debug) \
-		$(use_enable glade glade-catalogue) \
-		$(use_with crypt gnutls) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		${myconf}
-}
-
-src_install() {
-	gnome2_src_install
-	mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index d72d566265dd..2705af677b41 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -17,7 +17,6 @@ DIST wxPython-src-2.8.12.1.tar.bz2 31311482 BLAKE2B 33b3feb5f1182948badcd5695b35
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
 DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873665bc094f46a061fe1bcf8521f8a4d5613013d6ad58ce172e56118f3833ce3489ab2e919bbd5482445ce55455e696252bb747d3c SHA512 655efde42e467d1d48d8adb95e2394d90cedca8eb6a54a7d53771d3d2d4d5f72637aea6ea12a4c1f570c3905a458aebea067cd74e184c4c85ca73e49e04282cb
 DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1
-EBUILD wxGTK-2.8.12.1-r1.ebuild 4152 BLAKE2B 377a87f514995551172b0109c160bd1cf409c77a95848ee64dd3bcfc78f95bd4a1eba30fb096d3e407440560598b4309b26a520122a3326fc8d71cf7c6787df2 SHA512 2a5fb7445ab1c9ca6eb08fdf0e706eaee89adc4fb27849cd4c0b6209d91912847ad5f3e39ff0f281d86478e28ca98c37686c62842a69c212b7254e9c04aceb4e
 EBUILD wxGTK-2.8.12.1-r2.ebuild 4790 BLAKE2B 556048e9d98cf57dbbf2cf5097101e1640576a0df596e296f0e500d672b417ab530f37469e8bd5cb8c656fe902c572ee4998782bd6a7b8dfd735f87d2f85e681 SHA512 688c1121691fcfd701f6b396aff2425e8aac5eaa644cf1e8d216145b975fb7edef709eae4e9ef0e847f1c3c189685b75f86791487dd4ac71edca579a49f896ee
 EBUILD wxGTK-3.0.2.0-r3.ebuild 4539 BLAKE2B 2ec974f3cc0b2e4426030ca1a16564e2c9e215ce5f2479180fe88b4e04a91c4cbbe91c789e21ae738139554a482c4c45801ac63fa598d319bab09b549e091928 SHA512 442db7de10d3d4b069ef19485cb882966c0b20f7da41f36cf00a054b74214f81b04915fcf637190458a91e00b22acc0d33114dc40dad557ce856962e41cd5204
 EBUILD wxGTK-3.0.3-r300.ebuild 5176 BLAKE2B 80083420300535ba88704b9c25271931de3ce9da76ac40db0aae31cafccf5794fb737e10bb1ebd0f4a443d73a0cfbc510228d056ffc367ac8d9872beae59d870 SHA512 bc531ed938cc83bbd6ec1fcd30b71991f718cafdc6e6701ce9fa8b32e5f937feac8dbf1092fc87b3b41112ddb9fae5b7ba7dd95cb88b5df9f5da89588387fd80
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
deleted file mode 100644
index 87d2ddd9a443..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib versionator
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-
-BASE_PV="$(get_version_component_range 1-3)"
-BASE_P="${PN}-${BASE_PV}"
-
-# we use the wxPython tarballs because they include the full wxGTK sources and
-# docs, and are released more frequently than wxGTK.
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff"
-
-SLOT="2.8"
-
-RDEPEND="
-	dev-libs/expat
-	odbc?   ( dev-db/unixODBC )
-	sdl?    ( media-libs/libsdl )
-	X?  (
-		dev-libs/glib:2
-		media-libs/libpng:0=
-		sys-libs/zlib
-		virtual/jpeg:0=
-		x11-libs/gtk+:2
-		x11-libs/libSM
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		gnome?  ( gnome-base/libgnomeprintui:2.2 )
-		gstreamer? (
-			gnome-base/gconf:2
-			media-libs/gstreamer:0.10
-			media-libs/gst-plugins-base:0.10 )
-		opengl? ( virtual/opengl )
-		tiff?   ( media-libs/tiff:0 )
-		)
-	aqua? (
-		x11-libs/gtk+:2[aqua=]
-		virtual/jpeg:0=
-		tiff?   ( media-libs/tiff:0 )
-		)"
-
-DEPEND="${RDEPEND}
-		virtual/pkgconfig
-		opengl? ( virtual/glu )
-		X?  (
-			x11-proto/xproto
-			x11-proto/xineramaproto
-			x11-proto/xf86vidmodeproto
-			)"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-0.7"
-
-LICENSE="wxWinLL-3
-		GPL-2
-		odbc?	( LGPL-2 )
-		doc?	( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch
-	epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
-	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
-	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
-
-	# x32 https://bugs.gentoo.org/421851
-	sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die
-
-	# prefix https://bugs.gentoo.org/394123
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" \
-		-e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \
-		configure || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf
-
-	append-flags -fno-strict-aliasing
-
-	# X independent options
-	myconf="--enable-compat26
-			--enable-shared
-			--enable-unicode
-			--with-regex=builtin
-			--with-zlib=sys
-			--with-expat=sys
-			$(use_enable debug)
-			$(use_enable pch precomp-headers)
-			$(use_with odbc odbc sys)
-			$(use_with sdl)
-			$(use_with tiff libtiff sys)"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			$(use_enable gstreamer mediactrl)
-			$(use_enable opengl)
-			$(use_with opengl)
-			$(use_with gnome gnomeprint)
-			--without-gnomevfs"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	mkdir "${S}"/wxgtk_build
-	cd "${S}"/wxgtk_build
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-src_compile() {
-	cd "${S}"/wxgtk_build
-
-	emake
-
-	if [[ -d contrib/src ]]; then
-		cd contrib/src
-		emake
-	fi
-}
-
-src_install() {
-	cd "${S}"/wxgtk_build
-
-	emake DESTDIR="${D}" install
-
-	if [[ -d contrib/src ]]; then
-		cd contrib/src
-		emake DESTDIR="${D}" install
-	fi
-
-	cd "${S}"/docs
-	dodoc changes.txt readme.txt todo30.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	if use doc; then
-		dohtml -r "${S}"/docs/html/*
-	fi
-
-	# Stray windows locale file, causes collisions
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 5280628422e9..74f9d4129c7a 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 50e895d286bc..2a67adcee771 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,7 +1,4 @@
-DIST gnome-terminal-3.22.0-transparency.patch.xz 4588 BLAKE2B 7cce4166fa2a47cd4cf55e2ee64790f7ed94d4c75b326dca15d49aef0f3a81e9c6200cd84d46b1a251376b4a108e3b94bcb53b3908b9a34306df6467a34c0760 SHA512 f30a25902842345f8c1b81cbe6ea9da25f428ce8867c4e021369b25a17e8135a944fa6ef4b4cba329edc5ad8af8e53c3ca4d61d172085edde80a9ee215323990
-DIST gnome-terminal-3.22.2.tar.xz 1952372 BLAKE2B eddaa5b3900211a2823c86353c68b96aa2a5c3f4ccd51c553ab0a5c328b4dc6e922944ea62bfab7a1dd131464196e2a88c3cd365591b5deafc722b826ce18671 SHA512 3fa550c49c35d53c220d1f7a3f3d49d5130e3dd4af657e05627782abb84a449c6632a9919f5a97c78a5b9d92137e8d4bd68d8b880cd86203f866b85b9cda3db3
 DIST gnome-terminal-3.24.2.tar.xz 1960952 BLAKE2B c94303cd8b322a37c70487fbab0f6ecd27b8e831cf44cdc80c82b31d2758f7c6927704d31c229cbbe41be565748238bbfcfae72470f273f7f3a9378c218af8b5 SHA512 08cd7b1b08cf22618554b1a051dcfee4a967165bfe93b77a6bc8b0c935695101e773e8d53a482d71aadb9ba7be7ac991d82dbf53b7a6f74f1f5144e4158f8a93
 DIST gnome-terminal-notify-open-title-transparency.patch.xz 37448 BLAKE2B 159bbcf6ca387af8ae2f05c23b48afcdf11351025420ecfd10d1b8a1dd9c2c8016d1c89c6fca20dde3bf8ffe3a6091232a989cfd520fa6761f65eec29b569d84 SHA512 9af0d56df105a5bdb81b2609794669557a7f442f71b240ee10a6411fab20ad74c14489dbb9a536e208515053ea17776b3a15afb3b949a75a66f8c2ab3dbbff96
-EBUILD gnome-terminal-3.22.2.ebuild 2120 BLAKE2B 4a8700e79ada5c404385154b3a7e27eea5388fa68a41eb477b6a9fda167ee7898f3044ee4f77411398eb28a85665539a862c6f46449d017ea11d38e6860f341b SHA512 3d92988db6fa83333666f08a7b329ecc8b405dcb7acc0e2c81dfd23a84ee30db940905936de4405efb61944cda7b617b68512c0bca3b6beb67bb61191b0a13e5
 EBUILD gnome-terminal-3.24.2.ebuild 2615 BLAKE2B 3cbaecbc1543bb9fdd9f576f144dd19075056711720755d175852417a22676e04271cfdf4aa6c4c8da75d0e5971cf21414af090600db7710b42829637298c4eb SHA512 54b3962641799103003be60d238a81180eeaafb8cacee32b05c52d026988fa6e642c32f91716ba67e914863569ab4c5b2126d36e942cf3cb2163d502d9b71d38
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.22.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.22.2.ebuild
deleted file mode 100644
index 8ca6e4999c7f..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.22.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2 readme.gentoo-r1
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
-SRC_URI="${SRC_URI}
-	!vanilla? ( https://dev.gentoo.org/~mgorny/dist/gnome-terminal-3.22.0-transparency.patch.xz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus vanilla"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control
-RDEPEND="
-	>=dev-libs/glib-2.42:2[dbus]
-	>=x11-libs/gtk+-3.20:3[X]
-	>=x11-libs/vte-0.46.1:2.91
-	>=dev-libs/libpcre2-10
-	>=gnome-base/dconf-0.14
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	sys-apps/util-linux
-	gnome-shell? ( gnome-base/gnome-shell )
-	nautilus? ( >=gnome-base/nautilus-3 )
-"
-# itstool required for help/* with non-en LINGUAS, see bug #549358
-# xmllint required for glib-compile-resources, see bug #549304
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-libs/libxml2
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened
-	tab you will need to add the following line to your ~/.bashrc:\n
-	. /etc/profile.d/vte-2.91.sh"
-
-src_prepare() {
-	if ! use vanilla; then
-		# OpenSuSE patches, https://bugzilla.gnome.org/show_bug.cgi?id=695371
-		# http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/tree/gnome-terminal-transparency-notify.patch (first 3 parts)
-		eapply "${WORKDIR}"/${PN}-3.22.0-transparency.patch
-		eautoreconf
-	fi
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-migration \
-		$(use_enable debug) \
-		$(use_enable gnome-shell search-provider) \
-		$(use_with nautilus nautilus-extension) \
-		VALAC=$(type -P true)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS"
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 8f4cff0e5cea..285097cf0a8e 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/gnome-backgrounds/Manifest b/x11-themes/gnome-backgrounds/Manifest
index 975735993e99..7cb8b6f4af2a 100644
--- a/x11-themes/gnome-backgrounds/Manifest
+++ b/x11-themes/gnome-backgrounds/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-backgrounds-3.22.1.tar.xz 14847496 BLAKE2B d8f1601ae88f5fcb4efce076993618e765d542c22eb5c1214e32adeaea6555da69067d76028dc37541f4747f575be522b49130b77deaded1a6818be843bf1e99 SHA512 277d65228e2be0211f7ee15aeb3262c7e43c4788fec74ac857beacb414d527eb612f9e2999765e9ecba67ea6e3921dc94605a2934f10b0bb6377ea7f149a5a0c
 DIST gnome-backgrounds-3.24.0.tar.xz 15223020 BLAKE2B 5a4bf10bb767da9ac1b89e426a517c0ad9b76d62d764b4398e3381cb9b1bd425ab8f36835a681e1586bbd95f5f2d08307a2680d2aae45bcfc400fa0c61e3938d SHA512 ba044cd21d4c22dd6bf1a93a17579f2bc5f2b9198e40331486772f4fcb81a1c0179949a162e5a1e332f49cd833ca773cf27c1592966e94afbecd8b4d0728c24b
-EBUILD gnome-backgrounds-3.22.1.ebuild 471 BLAKE2B 29578bd5b0853df70fa7f536dc2002c50346008e78ed935d2a9110763a4961fd35f123a2521f1bca1e464a75b001e2d4d5d596b5f4752ca4a3cf31101c3c89fb SHA512 2d8e101a7b63bb9bfad93dbc2c8bd21eb0de537e9081e0c9aadb21c78e5ea020493225e6ee28366a89e04b61b4dd8292f2dfd7f96be5a79a39fb4bafc6408d47
 EBUILD gnome-backgrounds-3.24.0.ebuild 471 BLAKE2B 1663953d7c6de873193b5055fdc99ccc130ece72462c30c161ec7a89166693080337e6269c6c3787643c61b9e1099a0bb8027725d0a4441ab5301f2b46f212b4 SHA512 fb99037fea4eb191e784996e24a8484e81a770e6eb038c442017f0176fcbbabae65fe777a532c74fe73b259ef962fcaa4f408325001f526772338958421b638a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.22.1.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.22.1.ebuild
deleted file mode 100644
index 384143c84ae5..000000000000
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.22.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A set of backgrounds packaged with the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-backgrounds"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="!<x11-themes/gnome-themes-standard-3.14"
-DEPEND="
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-"
diff --git a/x11-themes/zuki-themes/Manifest b/x11-themes/zuki-themes/Manifest
index 8bfc819ebc1a..96c77afaa31e 100644
--- a/x11-themes/zuki-themes/Manifest
+++ b/x11-themes/zuki-themes/Manifest
@@ -1,7 +1,3 @@
-DIST zuki-themes-3.20.tar.gz 910945 BLAKE2B cadcadae015c4d988824942f9c2b2ce2f39025e280d1dd5f3ee4fc1cb0b578d81bbe0af3a57096aead4f0cc82aeb3f5e85203350bb1ca3430342823190f77179 SHA512 ffe7044bcb1974fc9c63dd8d6e5fa7278a58956df92a943832d6c1de282552ac69593ed5ce5376500fd48a12d80cb8c7e946cb0fe45dd07e5020734f7fa42180
-DIST zuki-themes-3.24.2.tar.gz 906520 BLAKE2B 2114d0236c9e5314d431d1a93bd06ac987cbff7f3a518b1aab8c90884c4f8c95f66830afb1ecaa5e3b60fbeebf83cd315f2014ea1409f4939330d18532bce525 SHA512 848b52fed9da6ab072f4210f70b7475a248c6b853079d13f5a600eed41f8ea3a00063fc89f08eb78a21d7c8f8725e0826294015138e152cde2b8bee375e8156f
 DIST zuki-themes-3.24.3.tar.gz 906469 BLAKE2B 443e99711fe9908fef976f0609401413f90e54f0bc0aa1bf8ddd65085ad755457402618336884be354030c6548e39a8cc0c5a5079b7b64d17760fadb0792319f SHA512 79ce43816db11dcd4be383bf4e0512aac0863214aa3fd3a545f06b922d441d3d1ddaf63ace166736b7598bf6f4ebdd1568092622eea3ef48b2ce37fbefd312ba
-EBUILD zuki-themes-3.20.ebuild 1108 BLAKE2B 1f8f05c49361e0be246efb9f4eba7c6f1a518f6d671a783ceb94fd1cac8af7c498a23926919a087b88fcce7f5bb83204417c261f4d95ce35587a6a28ac7edd4a SHA512 28b5f6074e24f745ec5453644d10b5c716b3122b1458744ecfce716f8a24949d2bf272373aa14b874db7f4bf9fb8e233b2be4db262906673c2209b4ad405160f
-EBUILD zuki-themes-3.24.2.ebuild 1164 BLAKE2B b0b1e730c782a3f7458c28cb03c024c26fb6338a07c41b0e70c7b7c05b2d4dfc7289b23f9fb02c83fba6c8f8709efa43196284fe4d2c0f0df4c6bec909fea5b9 SHA512 ce920e463426742334a8799eec0e275356f80f7a4f5194a203ffc49601174633737dc78b97618796c6b9b386d88ce9baa11faf63aa6c4e6b23e8f1b458c414a1
 EBUILD zuki-themes-3.24.3.ebuild 1144 BLAKE2B cf35fb4fe4a02f383125d2b5620a365cca7d53284ec61a558093021ee7d99d89ca788840cba439ead321b62321ddcb207be885988067423e0f8de348d12da54f SHA512 e09712f2337a0db0e217db965822e9774f9a40147a2be783cb59e86e0221bfa6fa8c97f5c9498e448d316569b887891c0ffc62ef4a263df8b70f2bdc0c706992
 MISC metadata.xml 595 BLAKE2B 8731760b856c74ba0bf4a58a6f99e9f9c369f86892aa55ec6a60b92abc13a1b29bbbb3364b83e3a2e8b191304e858cb37eaa9f633b4f4abc1d1563e6b5c614c4 SHA512 909d1681fb7e4b6557d47a629fc7153133684f54cb854109b85ba2301fd3a91f5baa0ba51c11f766364610f8923c02e79effcfc27b81edd3b4a2f7e168e7e895
diff --git a/x11-themes/zuki-themes/zuki-themes-3.20.ebuild b/x11-themes/zuki-themes/zuki-themes-3.20.ebuild
deleted file mode 100644
index 0f83b61ed091..000000000000
--- a/x11-themes/zuki-themes/zuki-themes-3.20.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV}-1"
-DESCRIPTION="Zuki themes for GTK, gnome-shell and more"
-HOMEPAGE="http://gnome-look.org/content/show.php/Zukitwo?content=140562"
-SRC_URI="https://github.com/lassekongo83/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome-shell mate xfce"
-
-RDEPEND="
-	>=x11-themes/gnome-themes-standard-3.6
-	>=x11-themes/gtk-engines-murrine-0.98.1.1
-	gnome-shell? ( media-fonts/roboto )
-	!<x11-themes/zukitwo-2016.08.08
-	!<x11-themes/zukitwo-shell-2016.08.08
-"
-DEPEND=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/themes/Zukitre
-	doins -r Zukitre/{index.theme,gtk-2.0,gtk-3.0}
-	use xfce && doins -r Zukitre/xfwm4
-
-	insinto /usr/share/themes/Zukitwo
-	doins -r Zukitwo/{index.theme,gtk-2.0,gtk-3.0}
-	use mate && doins -r Zukitwo/metacity-1
-	use xfce && doins -r Zukitwo/xfwm4
-
-	if use gnome-shell ; then
-		insinto /usr/share/themes
-		doins -r Zuki-shell
-	fi
-
-	default
-}
diff --git a/x11-themes/zuki-themes/zuki-themes-3.24.2.ebuild b/x11-themes/zuki-themes/zuki-themes-3.24.2.ebuild
deleted file mode 100644
index ddc8df1a38cc..000000000000
--- a/x11-themes/zuki-themes/zuki-themes-3.24.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_PV="$(replace_version_separator 2 '-' ${PV})"
-DESCRIPTION="Zuki themes for GTK, gnome-shell and more"
-HOMEPAGE="http://gnome-look.org/content/show.php/Zukitwo?content=140562"
-SRC_URI="https://github.com/lassekongo83/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome-shell mate xfce"
-
-RDEPEND="
-	>=x11-themes/gnome-themes-standard-3.6
-	>=x11-themes/gtk-engines-murrine-0.98.1.1
-	gnome-shell? ( media-fonts/roboto )
-	!<x11-themes/zukitwo-2016.08.08
-	!<x11-themes/zukitwo-shell-2016.08.08
-"
-DEPEND=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/themes/Zukitre
-	doins -r Zukitre/{index.theme,gtk-2.0,gtk-3.0}
-	use xfce && doins -r Zukitre/xfwm4
-
-	insinto /usr/share/themes/Zukitwo
-	doins -r Zukitwo/{index.theme,gtk-2.0,gtk-3.0}
-	use mate && doins -r Zukitwo/metacity-1
-	use xfce && doins -r Zukitwo/xfwm4
-
-	if use gnome-shell ; then
-		insinto /usr/share/themes
-		doins -r Zuki-shell
-	fi
-
-	default
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-04 12:30:23 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-04 12:30:23 +0000
commit	dc45b83b28fb83e9659492066e347b8dc60bc9e3 (patch)
tree	f09e7ed499dae58267ca976cb1880321611f921a
parent	eaab68ba6a05bc57d98ca12032440835ef905326 (diff)